From c4d6442ef4b6d547521d1d70ecf37bf99ad86373 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 1 Dec 2009 18:02:24 +0800
Subject:   EXT-2927 [BSI] profile text and partner text overwrite after
 selecting I button on a user

---
 indra/newview/llinspectavatar.cpp                  | 15 +++++-----
 .../skins/default/xui/en/inspect_avatar.xml        | 32 ++++++++++++----------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 866669f326..c30448cd57 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -133,7 +133,7 @@ private:
 	LLUUID				mAvatarID;
 	// Need avatar name information to spawn friend add request
 	std::string			mAvatarName;
-	LLUUID				mPartnerID;
+//	LLUUID				mPartnerID;
 	// an in-flight request for avatar properties from LLAvatarPropertiesProcessor
 	// is represented by this object
 	LLFetchAvatarData*	mPropertiesRequest;
@@ -188,7 +188,7 @@ public:
 LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
 :	LLInspect( LLSD() ),	// single_instance, doesn't really need key
 	mAvatarID(),			// set in onOpen()
-	mPartnerID(),
+//	mPartnerID(),
 	mAvatarName(),
 	mPropertiesRequest(NULL)
 {
@@ -257,7 +257,7 @@ void LLInspectAvatar::onOpen(const LLSD& data)
 
 	// Extract appropriate avatar id
 	mAvatarID = data["avatar_id"];
-	mPartnerID = LLUUID::null;
+//	mPartnerID = LLUUID::null;
 
 	BOOL self = mAvatarID == gAgent.getID();
 	
@@ -307,7 +307,7 @@ void LLInspectAvatar::requestUpdate()
 	getChild<LLUICtrl>("user_name")->setValue("");
 	getChild<LLUICtrl>("user_subtitle")->setValue("");
 	getChild<LLUICtrl>("user_details")->setValue("");
-	getChild<LLUICtrl>("user_partner")->setValue("");
+//	getChild<LLUICtrl>("user_partner")->setValue("");
 	
 	// Make a new request for properties
 	delete mPropertiesRequest;
@@ -366,14 +366,14 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data)
 	getChild<LLUICtrl>("user_details")->setValue( LLSD(details) );
 
 	// Look up partner name, if there is one
-	mPartnerID = data->partner_id;
+/*	mPartnerID = data->partner_id;
 	if (mPartnerID.notNull())
 	{
 		gCacheName->get(mPartnerID, FALSE,
 			boost::bind(&LLInspectAvatar::nameUpdatedCallback,
 			this, _1, _2, _3, _4));
 	}
-
+*/
 	// Delete the request object as it has been satisfied
 	delete mPropertiesRequest;
 	mPropertiesRequest = NULL;
@@ -456,7 +456,7 @@ void LLInspectAvatar::nameUpdatedCallback(
 		childSetValue("user_name", LLSD(mAvatarName) );
 	}
 	
-	if (id == mPartnerID)
+/*	if (id == mPartnerID)
 	{
 		LLStringUtil::format_map_t args;
 		args["[PARTNER]"] = first + " " + last;
@@ -464,6 +464,7 @@ void LLInspectAvatar::nameUpdatedCallback(
 		getChild<LLUICtrl>("user_partner")->setValue(partner);
 	}
 	// Otherwise possibly a request for an older inspector, ignore it
+ */
 }
 
 void LLInspectAvatar::onClickAddFriend()
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index dd3cf079db..e6f384dccd 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -19,7 +19,7 @@
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
-  [RW_PROFILE] (real world profile),
+    [RW_PROFILE] (real world profile),
 	[ACCTTYPE] ("Resident"),
 	[PAYMENTINFO] ("Payment Info on File"),
 	[AGE] ("1 year 2 months")
@@ -32,10 +32,11 @@
      name="Details">
 [SL_PROFILE]
     </string>
-  <string
+<!--  <string
      name="Partner">
     Partner: [PARTNER]
-  </string>
+  </string>   
+-->
   <text
      follows="all"
      font="SansSerifLarge"
@@ -52,21 +53,21 @@
      height="16"
      left="8"
      name="user_subtitle"
-   font="SansSerifSmall"
-   text_color="White"
+     font="SansSerifSmall"
+     text_color="White"
      value="11 Months, 3 days old"
      width="175"
      use_ellipses="true" />
      <text
      follows="all"
-   height="25"
-   left="8"
+     height="35"
+     left="8"
      name="user_details"
      word_wrap="true"
      top_pad="6"
      width="220">This is my second life description and I really think it is great.
     </text>
-    <text
+<!--<text
      follows="all"
      height="13"
      left="8"
@@ -76,7 +77,8 @@
      use_ellipses="true"
      word_wrap="false">
     Erica Linden
-  </text>
+    </text> 
+-->
     <slider
      follows="top|left"
      height="23"
@@ -113,8 +115,9 @@
      name="avatar_icon"
      top="10"
      width="38" />
-  <!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action -->
+<!-- Overlapping buttons for default actions
+    llinspectavatar.cpp makes visible the most likely default action 
+-->
     <button
      follows="bottom|left"
      height="20"
@@ -131,9 +134,8 @@
      top_delta="0"
      name="im_btn"
      width="80"
-     commit_callback.function="InspectAvatar.IM"
-     />
-          <button
+     commit_callback.function="InspectAvatar.IM"/>
+	<button
      follows="top|left"
      height="20"
      label="More"
@@ -153,7 +155,7 @@
      right="-5"
      top_delta="0"
      width="35" />
-         <menu_button
+	<menu_button
      follows="top|left"
      height="20"
      image_overlay="OptionsMenu_Off"
-- 
cgit v1.2.3