diff options
author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/newview/llfloateravatarinfo.cpp | |
parent | Second Life viewer sources 1.15.0.2 (diff) | |
download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz |
Second Life viewer sources 1.15.1.3
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloateravatarinfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp index c0351ee..2245d31 100644 --- a/linden/indra/newview/llfloateravatarinfo.cpp +++ b/linden/indra/newview/llfloateravatarinfo.cpp | |||
@@ -195,7 +195,6 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id) | |||
195 | { | 195 | { |
196 | // ...bring that window to front | 196 | // ...bring that window to front |
197 | floater = gAvatarInfoInstances.getData(avatar_id); | 197 | floater = gAvatarInfoInstances.getData(avatar_id); |
198 | floater->open(); /*Flawfinder: ignore*/ | ||
199 | } | 198 | } |
200 | else | 199 | else |
201 | { | 200 | { |
@@ -203,7 +202,10 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id) | |||
203 | avatar_id); | 202 | avatar_id); |
204 | floater->center(); | 203 | floater->center(); |
205 | floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO); | 204 | floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO); |
206 | floater->open(); /*Flawfinder: ignore*/ | 205 | } |
206 | if(floater) | ||
207 | { | ||
208 | floater->open(); | ||
207 | } | 209 | } |
208 | } | 210 | } |
209 | 211 | ||