diff options
| author | James Cook <james@lindenlab.com> | 2009-10-20 00:33:02 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-20 00:33:02 +0000 |
| commit | 5d8079a10881351123500cfc6028e01ac726995e (patch) | |
| tree | 556dac1588da5dea8eb94e58c2ef6b8fa9821ebe /indra/newview/llinspectavatar.cpp | |
| parent | b7eb9a15f106789a499dc72a5c2979c3cf15ab1e (diff) | |
EXT-1518 Show "nobody" for null UUID avatar SLURL links, "none" for null group SLURL links.
Show "Loading..." while looking up real names.
Fix group inspector "view details" button not working.
Reviewed with Ambroff.
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 081e55971d..4eb6061bea 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -44,6 +44,7 @@ #include "llinspect.h" #include "llmutelist.h" #include "llpanelblockedlist.h" +#include "llstartup.h" #include "llviewermenu.h" #include "llvoiceclient.h" @@ -277,12 +278,12 @@ void LLInspectAvatar::requestUpdate() // login screen (which is useful to work on the layout). if (mAvatarID.isNull()) { - getChild<LLUICtrl>("user_subtitle")-> - setValue("Test subtitle"); - getChild<LLUICtrl>("user_details")-> - setValue("Test details"); - getChild<LLUICtrl>("user_partner")-> - setValue("Test partner"); + if (LLStartUp::getStartupState() >= STATE_STARTED) + { + // once we're running we don't want to show the test floater + // for bogus LLUUID::null links + closeFloater(); + } return; } |