From 5d8079a10881351123500cfc6028e01ac726995e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 20 Oct 2009 00:33:02 +0000
Subject: 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.

---
 indra/newview/llinspectavatar.cpp                           | 13 +++++++------
 indra/newview/llinspectgroup.cpp                            |  7 +++++++
 .../skins/default/xui/en/floater_test_inspectors.xml        | 12 ------------
 indra/newview/skins/default/xui/en/inspect_avatar.xml       |  1 -
 indra/newview/skins/default/xui/en/inspect_group.xml        |  3 ++-
 5 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'indra/newview')

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;
 	}
 
diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp
index e079e27e56..c78bcd6afe 100644
--- a/indra/newview/llinspectgroup.cpp
+++ b/indra/newview/llinspectgroup.cpp
@@ -37,6 +37,7 @@
 #include "llgroupactions.h"
 #include "llgroupmgr.h"
 #include "llinspect.h"
+#include "llstartup.h"
 
 // Linden libraries
 #include "llcontrol.h"	// LLCachedControl
@@ -200,6 +201,12 @@ void LLInspectGroup::requestUpdate()
 	// login screen (which is useful to work on the layout).
 	if (mGroupID.isNull())
 	{
+		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;
 	}
 
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
index 126bca2074..ce20b03919 100644
--- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -133,16 +133,4 @@
     secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect
   </text>
 
-  <text
-  follows="left|top"
-  font="SansSerif"
-  height="20"
-  left="0"
-  max_length="65536"
-  name="slurl_group_about"
-  top_pad="4"
-  width="150">
-    secondlife:///app/group/00000000-0000-0000-0000-000000000000/about
-  </text>
-
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 5bf481e9cb..181c80ebc7 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -47,7 +47,6 @@
      value="Grumpity ProductEngine"
      width="240"
      word_wrap="false" />
-    <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
     <text
      follows="all"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index d3f599cbbf..5b166e83b8 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -84,7 +84,8 @@ L$123 to join
      top="35"
      left_delta="110"
      tab_stop="false"
-     width="18" />
+     width="18"
+     commit_callback.function="InspectGroup.ViewProfile" />
   <button
    follows="bottom|left"
    height="23"
-- 
cgit v1.2.3