From 146e9d5e4d9a9a4f33d9ccd47a901980972b7ab9 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 1 Feb 2010 17:06:18 -0800
Subject: Support returning full_name (and SLID) for LLCacheName::get() calls
 Changed callback signature to full_name instead of first_name,last_name
 Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
 Change Pay dialog names to SLURL links Tweaked layout of Pay Resident and Pay
 via Object floaters to make SLURLs fit Consolidate name first + " " + last
 concatenation in LLCacheName::buildFullName() Reviewed with Kelly

---
 indra/newview/llpanelprofileview.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 7832f63e6a..1e7a259b41 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -109,8 +109,8 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	}
 
 	// Update the avatar name.
-	gCacheName->get(getAvatarId(), FALSE,
-		boost::bind(&LLPanelProfileView::onAvatarNameCached, this, _1, _2, _3, _4));
+	gCacheName->get(getAvatarId(), false,
+		boost::bind(&LLPanelProfileView::onNameCache, this, _1, _2, _3));
 /*
 // disable this part of code according to EXT-2022. See processOnlineStatus
 	// status should only show if viewer has permission to view online/offline. EXT-453 
@@ -187,10 +187,10 @@ void LLPanelProfileView::processOnlineStatus(bool online)
 	mStatusText->setVisible(online);
 }
 
-void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group)
+void LLPanelProfileView::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group)
 {
 	llassert(getAvatarId() == id);
-	getChild<LLUICtrl>("user_name", FALSE)->setValue(first_name + " " + last_name);
+	getChild<LLUICtrl>("user_name", FALSE)->setValue(full_name);
 }
 
 void LLPanelProfileView::togglePanel(LLPanel* panel, const LLSD& key)
-- 
cgit v1.3


From c1ea91fb44653749a382c89aeed6054ac547b064 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 19 Feb 2010 14:41:03 -0800
Subject: Show SLID in side panel full avatar profile

---
 indra/newview/llpanelprofileview.cpp                  | 19 ++++++++++++++++---
 .../skins/default/xui/en/panel_profile_view.xml       | 11 +++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 7c9b7aed36..5688c6960b 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -32,11 +32,12 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llpanelprofileview.h"
+
 #include "llavatarconstants.h"
+#include "llavatarnamecache.h"	// IDEVO
 #include "lluserrelations.h"
 
-#include "llpanelprofileview.h"
-
 #include "llavatarpropertiesprocessor.h"
 #include "llcallingcard.h"
 #include "llpanelavatar.h"
@@ -201,7 +202,19 @@ void LLPanelProfileView::processOnlineStatus(bool online)
 void LLPanelProfileView::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group)
 {
 	llassert(getAvatarId() == id);
-	getChild<LLUICtrl>("user_name", FALSE)->setValue(full_name);
+	// IDEVO
+	LLAvatarName av_name;
+	if (LLAvatarNameCache::useDisplayNames()
+		&& LLAvatarNameCache::get(id, &av_name))
+	{
+		getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
+		getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID );
+	}
+	else
+	{
+		getChild<LLUICtrl>("user_name")->setValue(full_name);
+		getChild<LLUICtrl>("user_slid")->setValue("");
+	}
 }
 
 // EOF
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 607de65c5c..96c7ba39ed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -45,8 +45,19 @@
      height="13"
      layout="topleft"
      left="45"
+     name="user_slid"
+     text_color="LtGray"
+     value=""
+     width="150" />
+    <text
+     follows="top|left"
+     halign="right" 
+     height="13"
+     layout="topleft"
+     left="150"
      name="status"
      text_color="LtGray_50"
+     top_delta="0" 
      value="Online"
      width="150" />
     <tab_container
-- 
cgit v1.3


From 6d239f7cfae65e6c8354d9f94061e81e82112a44 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 27 Apr 2010 11:56:13 -0700
Subject: Convert profile panel to new avatar name cache

---
 indra/newview/llpanelprofileview.cpp | 25 ++++++++-----------------
 indra/newview/llpanelprofileview.h   | 10 ++++++----
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 5688c6960b..526db2a192 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -108,8 +108,10 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	}
 
 	// Update the avatar name.
-	gCacheName->get(getAvatarId(), false,
-		boost::bind(&LLPanelProfileView::onNameCache, this, _1, _2, _3));
+//	gCacheName->get(getAvatarId(), false,
+//		boost::bind(&LLPanelProfileView::onNameCache, this, _1, _2, _3));
+	LLAvatarNameCache::get(getAvatarId(),
+		boost::bind(&LLPanelProfileView::onAvatarNameCache, this, _1, _2));
 
 	updateOnlineStatus();
 
@@ -199,22 +201,11 @@ void LLPanelProfileView::processOnlineStatus(bool online)
 	mStatusText->setValue(status);
 }
 
-void LLPanelProfileView::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group)
+void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
+										   const LLAvatarName& av_name)
 {
-	llassert(getAvatarId() == id);
-	// IDEVO
-	LLAvatarName av_name;
-	if (LLAvatarNameCache::useDisplayNames()
-		&& LLAvatarNameCache::get(id, &av_name))
-	{
-		getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
-		getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID );
-	}
-	else
-	{
-		getChild<LLUICtrl>("user_name")->setValue(full_name);
-		getChild<LLUICtrl>("user_slid")->setValue("");
-	}
+	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
+	getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID );
 }
 
 // EOF
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h
index 2b67be12e5..dedb617c27 100644
--- a/indra/newview/llpanelprofileview.h
+++ b/indra/newview/llpanelprofileview.h
@@ -39,6 +39,7 @@
 #include "llagent.h"
 #include "lltooldraganddrop.h"
 
+class LLAvatarName;
 class LLPanelProfile;
 class LLPanelProfileTab;
 class LLTextBox;
@@ -99,10 +100,11 @@ protected:
 private:
 	// LLCacheName will call this function when avatar name is loaded from server.
 	// This is required to display names that have not been cached yet.
-	void onNameCache(
-		const LLUUID& id, 
-		const std::string& full_name,
-		bool is_group);
+//	void onNameCache(
+//		const LLUUID& id, 
+//		const std::string& full_name,
+//		bool is_group);
+	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
 
 	LLTextBox* mStatusText;
 	AvatarStatusObserver* mAvatarStatusObserver;
-- 
cgit v1.3


From 357dc21c1149228d10f446f774a0549ab698b5e8 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 28 Apr 2010 10:46:53 -0700
Subject: Profile clears old data out of name field when shown

---
 indra/newview/llpanelprofileview.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 526db2a192..1afe2b9d44 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -105,11 +105,13 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	if(id.notNull() && getAvatarId() != id)
 	{
 		setAvatarId(id);
+
+		// clear name fields, which might have old data
+		getChild<LLUICtrl>("user_name")->setValue( LLSD() );
+		getChild<LLUICtrl>("user_slid")->setValue( LLSD() );
 	}
 
 	// Update the avatar name.
-//	gCacheName->get(getAvatarId(), false,
-//		boost::bind(&LLPanelProfileView::onNameCache, this, _1, _2, _3));
 	LLAvatarNameCache::get(getAvatarId(),
 		boost::bind(&LLPanelProfileView::onAvatarNameCache, this, _1, _2));
 
-- 
cgit v1.3


From f4148502e484d516b42c4a88603eee6889d45697 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 18 May 2010 16:00:45 -0700
Subject: Rename mSLID to mUsername to match the name of the field in the UI

Product made a late-breaking request to change the name of this
field.  The wire protocol for People API has not yet changed.
---
 indra/llcommon/llavatarname.cpp       | 16 +++++++++-------
 indra/llcommon/llavatarname.h         |  2 +-
 indra/llmessage/llavatarnamecache.cpp |  8 ++++----
 indra/llui/llurlentry.cpp             |  8 ++++----
 indra/newview/llavatarlistitem.cpp    |  2 +-
 indra/newview/llchathistory.cpp       |  4 ++--
 indra/newview/llimview.cpp            |  2 +-
 indra/newview/llinspectavatar.cpp     |  2 +-
 indra/newview/llinventorybridge.cpp   |  2 +-
 indra/newview/llpanelme.cpp           |  2 +-
 indra/newview/llpanelprofileview.cpp  |  2 +-
 indra/newview/lltoolpie.cpp           |  2 +-
 indra/newview/llviewerdisplayname.cpp |  2 +-
 indra/newview/llvoavatar.cpp          |  2 +-
 14 files changed, 29 insertions(+), 27 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 7415acadd4..de51a7f2aa 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -46,7 +46,7 @@ static const std::string IS_DISPLAY_NAME_DEFAULT("is_display_name_default");
 static const std::string DISPLAY_NAME_EXPIRES("display_name_expires");
 
 LLAvatarName::LLAvatarName()
-:	mSLID(),
+:	mUsername(),
 	mDisplayName(),
 	mIsDisplayNameDefault(false),
 	mIsDummy(false),
@@ -55,16 +55,18 @@ LLAvatarName::LLAvatarName()
 
 bool LLAvatarName::operator<(const LLAvatarName& rhs) const
 {
-	if (mSLID == rhs.mSLID)
+	if (mUsername == rhs.mUsername)
 		return mDisplayName < rhs.mDisplayName;
 	else
-		return mSLID < rhs.mSLID;
+		return mUsername < rhs.mUsername;
 }
 
 LLSD LLAvatarName::asLLSD() const
 {
 	LLSD sd;
-	sd[SL_ID] = mSLID;
+	// Due to a late-breaking change request from Product, we renamed
+	// "SLID" to "Username", but it was too late to change the wire format.
+	sd[SL_ID] = mUsername;
 	sd[DISPLAY_NAME] = mDisplayName;
 	sd[IS_DISPLAY_NAME_DEFAULT] = mIsDisplayNameDefault;
 	sd[DISPLAY_NAME_EXPIRES] = LLDate(mExpires);
@@ -73,7 +75,7 @@ LLSD LLAvatarName::asLLSD() const
 
 void LLAvatarName::fromLLSD(const LLSD& sd)
 {
-	mSLID = sd[SL_ID].asString();
+	mUsername = sd[SL_ID].asString(); // see asLLSD() above
 	mDisplayName = sd[DISPLAY_NAME].asString();
 	mIsDisplayNameDefault = sd[IS_DISPLAY_NAME_DEFAULT].asBoolean();
 	LLDate expires = sd[DISPLAY_NAME_EXPIRES];
@@ -83,9 +85,9 @@ void LLAvatarName::fromLLSD(const LLSD& sd)
 std::string LLAvatarName::getNameAndSLID() const
 {
 	std::string name;
-	if (!mSLID.empty())
+	if (!mUsername.empty())
 	{
-		name = mDisplayName + " (" + mSLID + ")";
+		name = mDisplayName + " (" + mUsername + ")";
 	}
 	else
 	{
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 87750210c6..39071ec4c7 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -54,7 +54,7 @@ public:
 	std::string getNameAndSLID() const;
 
 	// "bobsmith123" or "james.linden", US-ASCII only
-	std::string mSLID;
+	std::string mUsername;
 
 	// "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode
 	// Contains data whether or not user has explicitly set
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 2fc92ff36f..4b41c7e5b1 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -208,7 +208,7 @@ public:
 			// Some avatars don't have explicit display names set
 			if (av_name.mDisplayName.empty())
 			{
-				av_name.mDisplayName = av_name.mSLID;
+				av_name.mDisplayName = av_name.mUsername;
 			}
 
 			// cache it and fire signals
@@ -221,7 +221,7 @@ public:
 		{
 			const std::string DUMMY_NAME("\?\?\?");
 			LLAvatarName av_name;
-			av_name.mSLID = DUMMY_NAME;
+			av_name.mUsername = DUMMY_NAME;
 			av_name.mDisplayName = DUMMY_NAME;
 			av_name.mIsDisplayNameDefault = false;
 			av_name.mIsDummy = true;
@@ -247,7 +247,7 @@ public:
 		// *NOTE: "??" starts trigraphs in C/C++, escape the question marks.
 		const std::string DUMMY_NAME("\?\?\?");
 		LLAvatarName av_name;
-		av_name.mSLID = DUMMY_NAME;
+		av_name.mUsername = DUMMY_NAME;
 		av_name.mDisplayName = DUMMY_NAME;
 		av_name.mIsDisplayNameDefault = false;
 		av_name.mIsDummy = true;
@@ -561,7 +561,7 @@ void LLAvatarNameCache::buildLegacyName(const std::string& full_name,
 										LLAvatarName* av_name)
 {
 	llassert(av_name);
-	av_name->mSLID = "";
+	av_name->mUsername = "";
 	av_name->mDisplayName = full_name;
 	av_name->mIsDisplayNameDefault = true;
 	av_name->mIsDummy = true;
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index d3c866a854..aeb02aef1c 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -353,9 +353,9 @@ void LLUrlEntryAgent::onAvatarNameCache(const LLUUID& id,
 										const LLAvatarName& av_name)
 {
 	std::string label = av_name.mDisplayName;
-	if (!av_name.mSLID.empty())
+	if (!av_name.mUsername.empty())
 	{
-		label += " (" + av_name.mSLID + ")";
+		label += " (" + av_name.mUsername + ")";
 	}
 	// received the agent name from the server - tell our observers
 	callObservers(id.asString(), label, mIcon);
@@ -418,9 +418,9 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	if (LLAvatarNameCache::get(agent_id, &av_name))
 	{
 		std::string label = av_name.mDisplayName;
-		if (!av_name.mSLID.empty())
+		if (!av_name.mUsername.empty())
 		{
-			label += " (" + av_name.mSLID + ")";
+			label += " (" + av_name.mUsername + ")";
 		}
 		// handle suffixes like /mute or /offerteleport
 		label = localize_slapp_label(url, label);
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index c458930a62..a59ad306d7 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -340,7 +340,7 @@ void LLAvatarListItem::setNameInternal(const std::string& name, const std::strin
 void LLAvatarListItem::onAvatarNameCache(const LLAvatarName& av_name)
 {
 	setName(av_name.mDisplayName);
-	mAvatarName->setToolTip(av_name.mSLID);
+	mAvatarName->setToolTip(av_name.mUsername);
 
 	//requesting the list to resort
 	notifyParent(LLSD().with("sort", LLSD()));
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 5bf3d7b913..6d98afbc58 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -330,8 +330,8 @@ public:
 		LLTextBox* user_name = getChild<LLTextBox>("user_name");
 		user_name->setValue( LLSD(av_name.mDisplayName ) );
 
-		user_name->setToolTip( av_name.mSLID );
-		setToolTip( av_name.mSLID );
+		user_name->setToolTip( av_name.mUsername );
+		setToolTip( av_name.mUsername );
 	}
 
 protected:
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b17dca68f6..0c88b9f3a1 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2075,7 +2075,7 @@ void LLIncomingCallDialog::processCallResponse(S32 response)
 							if (LLAvatarNameCache::useDisplayNames()
 								&& LLAvatarNameCache::get(caller_id, &av_name))
 							{
-								correct_session_name = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+								correct_session_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
 							}
 							correct_session_name.append(ADHOC_NAME_SUFFIX); 
 						}
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 3cbde2bb9c..74bf6e378d 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -642,7 +642,7 @@ void LLInspectAvatar::onAvatarNameCache(
 	if (agent_id == mAvatarID)
 	{
 		getChild<LLUICtrl>("user_name")->setValue(av_name.mDisplayName);
-		getChild<LLUICtrl>("user_slid")->setValue(av_name.mSLID);
+		getChild<LLUICtrl>("user_slid")->setValue(av_name.mUsername);
 	}
 }
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 14e5c8b93c..9e3f80e464 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3634,7 +3634,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act
 			if (LLAvatarNameCache::useDisplayNames()
 				&& LLAvatarNameCache::get(item->getCreatorUUID(), &av_name))
 			{
-				callingcard_name = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+				callingcard_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
 			}
 			LLUUID session_id = gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID());
 			if (session_id != LLUUID::null)
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index f38c8859ef..c1d02fae39 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -242,7 +242,7 @@ void LLPanelMyProfileEdit::processProfileProperties(const LLAvatarData* avatar_d
 void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
 {
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
-	getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID );
+	getChild<LLUICtrl>("user_slid")->setValue( av_name.mUsername );
 }
 
 BOOL LLPanelMyProfileEdit::postBuild()
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 1afe2b9d44..d22d8d2718 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -207,7 +207,7 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 										   const LLAvatarName& av_name)
 {
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
-	getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID );
+	getChild<LLUICtrl>("user_slid")->setValue( av_name.mUsername );
 }
 
 // EOF
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 67db778bdb..ebef28fd64 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -881,7 +881,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 			if (LLAvatarNameCache::useDisplayNames()
 				&& LLAvatarNameCache::get(hover_object->getID(), &av_name))
 			{
-				final_name = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+				final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
 			}
 			else
 			{
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index ec80129f8a..a783cb03d8 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -185,7 +185,7 @@ class LLDisplayNameUpdate : public LLHTTPNode
 		{
 			LLSD args;
 			args["OLD_NAME"] = old_display_name;
-			args["SLID"] = av_name.mSLID;
+			args["SLID"] = av_name.mUsername;
 			args["NEW_NAME"] = av_name.mDisplayName;
 			LLNotificationsUtil::add("DisplayNameUpdate", args);
 		}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 5e6f294071..e7721d6068 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2880,7 +2880,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 			{
 				// JAMESDEBUG HACK
 				LLColor4 slid_color = name_tag_color * 0.83f;
-				addNameTagLine(av_name.mSLID, slid_color, LLFontGL::NORMAL,
+				addNameTagLine(av_name.mUsername, slid_color, LLFontGL::NORMAL,
 					LLFontGL::getFontSansSerifSmall());
 			}
 		}
-- 
cgit v1.3


From bc60707968bd8b2cd2941357a6ff653f6ed2d40e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 13 Aug 2010 17:33:04 -0700
Subject: DEV-52163 Long display name with wide characters not fully visible in
 viewer aside from nametag

---
 indra/newview/llinspectavatar.cpp                  | 17 +++++++++++
 indra/newview/llpanelprofileview.cpp               | 15 ++++++++++
 .../skins/default/xui/en/inspect_avatar.xml        | 35 +++++++++++++++-------
 .../skins/default/xui/en/panel_profile_view.xml    | 30 +++++++++++++------
 .../skins/default/xui/en/widgets/inspector.xml     |  1 +
 5 files changed, 78 insertions(+), 20 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 1cd1dcc7f0..77435ae214 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -58,6 +58,7 @@
 #include "llfloater.h"
 #include "llfloaterreg.h"
 #include "llmenubutton.h"
+#include "lltextbox.h"
 #include "lltooltip.h"	// positionViewNearMouse()
 #include "lltrans.h"
 #include "lluictrl.h"
@@ -333,6 +334,7 @@ void LLInspectAvatar::requestUpdate()
 
 	// Clear out old data so it doesn't flash between old and new
 	getChild<LLUICtrl>("user_name")->setValue("");
+	getChild<LLUICtrl>("user_name_small")->setValue("");
 	getChild<LLUICtrl>("user_slid")->setValue("");
 	getChild<LLUICtrl>("user_subtitle")->setValue("");
 	getChild<LLUICtrl>("user_details")->setValue("");
@@ -617,8 +619,23 @@ void LLInspectAvatar::onAvatarNameCache(
 	if (agent_id == mAvatarID)
 	{
 		getChild<LLUICtrl>("user_name")->setValue(av_name.mDisplayName);
+		getChild<LLUICtrl>("user_name_small")->setValue(av_name.mDisplayName);
 		getChild<LLUICtrl>("user_slid")->setValue(av_name.mUsername);
 		mAvatarName = av_name;
+		
+		// show smaller display name if too long to display in regular size
+		if (getChild<LLTextBox>("user_name")->getTextPixelWidth() > getChild<LLTextBox>("user_name")->getRect().getWidth())
+		{
+			getChild<LLUICtrl>("user_name_small")->setVisible( true );
+			getChild<LLUICtrl>("user_name")->setVisible( false );
+		}
+		else
+		{
+			getChild<LLUICtrl>("user_name_small")->setVisible( false );
+			getChild<LLUICtrl>("user_name")->setVisible( true );
+
+		}
+
 	}
 }
 
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index d22d8d2718..ab235f2b75 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -207,7 +207,22 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 										   const LLAvatarName& av_name)
 {
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
+	getChild<LLUICtrl>("user_name_small")->setValue( av_name.mDisplayName );
 	getChild<LLUICtrl>("user_slid")->setValue( av_name.mUsername );
+
+	// show smaller display name if too long to display in regular size
+	if (getChild<LLTextBox>("user_name")->getTextPixelWidth() > getChild<LLTextBox>("user_name")->getRect().getWidth())
+	{
+		getChild<LLUICtrl>("user_name_small")->setVisible( true );
+		getChild<LLUICtrl>("user_name")->setVisible( false );
+	}
+	else
+	{
+		getChild<LLUICtrl>("user_name_small")->setVisible( false );
+		getChild<LLUICtrl>("user_name")->setVisible( true );
+
+	}
+
 }
 
 // EOF
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index d018ea7ce1..b2efd13441 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -15,7 +15,7 @@
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="228">
+ width="245">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -34,16 +34,29 @@
     </string>
   <text
      follows="top|left"
-     font="SansSerifLarge"
-     height="16"
+     font="SansSerif"
+     height="20"
      left="8"
-     name="user_name"
-     top="10"
+     name="user_name_small"
+     top="7"
      text_color="White"
      use_ellipses="true"
-     value="Grumpity ProductEngine"
-     width="175" />
-    <text
+     word_wrap="true"
+     value="Grumpity ProductEngine with a long name"
+     width="185" />
+   <text
+    follows="top|left"
+    font="SansSerifBigLarge"
+    height="21"
+    left="8"
+    name="user_name"
+    top="10"
+    text_color="White"
+    use_ellipses="true"
+    visible="false" 
+    value="Grumpity ProductEngine"
+    width="190" />
+   <text
      follows="top|left"
      height="16"
      left="8"
@@ -71,9 +84,9 @@
      name="user_details"
      right="-10"
      word_wrap="true"
-     top_pad="6"
+     top_pad="4"
      use_ellipses="true"
-     width="220">This is my second life description and I really think it is great.
+     width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
     <slider
      follows="top|left"
@@ -87,7 +100,7 @@
      tool_tip="Voice volume"
      top_pad="0"
      value="0.5"
-     width="195" />
+     width="200" />
     <button
      follows="top|left"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 9745f89e31..5778d3cb6f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -28,17 +28,30 @@
      tab_stop="false"
      top="2"
      width="30" />
-    <text_editor
+     <text
     	h_pad="0"
     	v_pad="0"
-      allow_scroll="false"
-      bg_visible="false"
-      read_only = "true"
       follows="top|left|right"
-      font="SansSerifHugeBold"
-      height="26"
+      font="SansSerifBigBold"
+      height="29"
       layout="topleft"
       left_pad="5"
+      name="user_name_small"
+      text_color="LtGray"
+      top="0"
+      value="(Loading...)"
+      use_ellipses="true"
+      word_wrap="true" 
+      visible="false" 
+      width="275" />
+     <text
+      h_pad="0"
+      v_pad="0"
+      follows="top|left|right"
+      font="SansSerifHugeBold"
+      height="27"
+      layout="topleft"
+      left_delta="0"
       name="user_name"
       text_color="LtGray"
       top="2"
@@ -52,7 +65,6 @@
      left="45"
      name="user_slid"
      text_color="LtGray"
-     value=""
      width="150" />
     <text
      follows="top|left"
@@ -67,7 +79,7 @@
      width="150" />
     <tab_container
      follows="all"
-     height="538"
+     height="537"
      halign="center"
      layout="topleft"
      left="5"
@@ -77,7 +89,7 @@
      tab_height="30"
      tab_position="top"
      top_pad="5"
-     width="317">
+     width="317"> 
         <panel
          class="panel_profile"
          filename="panel_profile.xml"
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 428b2ce03b..8c171c387f 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inspector name="inspector"
+           max_width="300"
            bg_opaque_color="DkGray_66"
            background_visible="true"
            bg_opaque_image="Inspector_Hover"
-- 
cgit v1.3


From 9a72f91c5ed4b78f4f131a4ae80338566b863f11 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 27 Sep 2010 15:40:02 -0700
Subject: hooked up copy to clipboard button

---
 indra/newview/llpanelprofileview.cpp | 10 +++++++++-
 indra/newview/llpanelprofileview.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index dfbd355247..bff589c392 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -30,6 +30,7 @@
 
 #include "llavatarconstants.h"
 #include "llavatarnamecache.h"	// IDEVO
+#include "llclipboard.h"
 #include "lluserrelations.h"
 
 #include "llavatarpropertiesprocessor.h"
@@ -129,7 +130,8 @@ BOOL LLPanelProfileView::postBuild()
 	mStatusText->setVisible(false);
 
 	childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL);
-	
+	childSetCommitCallback("copy_to_clipboard",boost::bind(&LLPanelProfileView::onCopyToClipboard,this),NULL);
+		
 	return TRUE;
 }
 
@@ -149,6 +151,12 @@ void LLPanelProfileView::onBackBtnClick()
 	}
 }
 
+void LLPanelProfileView::onCopyToClipboard()
+{
+	std::string name = getChild<LLUICtrl>("user_name")->getValue().asString() + " (" + getChild<LLUICtrl>("user_slid")->getValue().asString() + ")";
+	gClipboard.copyFromString(utf8str_to_wstring(name));
+}
+
 bool LLPanelProfileView::isGrantedToSeeOnlineStatus()
 {
 	const LLRelationship* relationship = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h
index 153496bfd0..c6d921fdc4 100644
--- a/indra/newview/llpanelprofileview.h
+++ b/indra/newview/llpanelprofileview.h
@@ -74,6 +74,7 @@ public:
 protected:
 
 	void onBackBtnClick();
+	void onCopyToClipboard();
 	bool isGrantedToSeeOnlineStatus();
 
 	/**
-- 
cgit v1.3


From f01ba3cf29b45ed312cc7f383a60819b1a8026c6 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Mon, 11 Oct 2010 14:03:14 -0700
Subject: DN-161 Display Name and Username labels shown in profiles when View
 Display Names setting is off and when Display Names disabled on Simulator
 DN-163 Set display name error if user changes View Display Name setting to
 off in preferences with Edit profile panel open

---
 indra/newview/llpanelme.cpp                        | 41 +++++++++++++++++++---
 indra/newview/llpanelprofileview.cpp               | 16 +++++++++
 .../skins/default/xui/en/panel_edit_profile.xml    |  2 +-
 .../skins/default/xui/en/panel_profile_view.xml    |  2 +-
 4 files changed, 54 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 9a13d00685..f587923269 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -176,6 +176,8 @@ LLPanelMyProfileEdit::LLPanelMyProfileEdit()
 	buildFromFile( "panel_edit_profile.xml");
 
 	setAvatarId(gAgent.getID());
+
+	LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&LLPanelMyProfileEdit::onAvatarNameChanged, this));
 }
 
 void LLPanelMyProfileEdit::onOpen(const LLSD& key)
@@ -186,11 +188,6 @@ void LLPanelMyProfileEdit::onOpen(const LLSD& key)
 	// is loaded.
 	enableEditing(false);
 
-	// Only allow changing name if this region/grid supports it
-	bool use_display_names = LLAvatarNameCache::useDisplayNames();
-	LLUICtrl* set_name = getChild<LLUICtrl>("set_name");
-	set_name->setVisible(use_display_names);
-	set_name->setEnabled(use_display_names);
 	// force new avatar name fetch so we have latest update time
 	LLAvatarNameCache::fetch(gAgent.getID()); 
 	LLPanelMyProfile::onOpen(getAvatarId());
@@ -207,6 +204,23 @@ void LLPanelMyProfileEdit::onOpen(const LLSD& key)
 			LLFirstUse::setDisplayName(false);
 		}
 	}
+
+	if (LLAvatarNameCache::useDisplayNames())
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( true );
+		getChild<LLUICtrl>("user_slid")->setVisible( true );
+		getChild<LLUICtrl>("display_name_label")->setVisible( true );
+		getChild<LLUICtrl>("set_name")->setVisible( true );
+		getChild<LLUICtrl>("set_name")->setEnabled( true );
+	}
+	else
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( false );
+		getChild<LLUICtrl>("user_slid")->setVisible( false );
+		getChild<LLUICtrl>("display_name_label")->setVisible( false );
+		getChild<LLUICtrl>("set_name")->setVisible( false );
+		getChild<LLUICtrl>("set_name")->setEnabled( false );
+	}
 }
 
 void LLPanelMyProfileEdit::onClose(const LLSD& key)
@@ -267,10 +281,27 @@ void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarNam
 	{
 		getChild<LLUICtrl>("user_name_small")->setVisible( false );
 		getChild<LLUICtrl>("user_name")->setVisible( true );
+	}
 
+	if (LLAvatarNameCache::useDisplayNames())
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( true );
+		getChild<LLUICtrl>("user_slid")->setVisible( true );
+		getChild<LLUICtrl>("display_name_label")->setVisible( true );
+		getChild<LLUICtrl>("set_name")->setVisible( true );
+		getChild<LLUICtrl>("set_name")->setEnabled( true );
+	}
+	else
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( false );
+		getChild<LLUICtrl>("user_slid")->setVisible( false );
+		getChild<LLUICtrl>("display_name_label")->setVisible( false );
+		getChild<LLUICtrl>("set_name")->setVisible( false );
+		getChild<LLUICtrl>("set_name")->setEnabled( false );
 	}
 }
 
+
 void LLPanelMyProfileEdit::onAvatarNameChanged()
 {
 	LLAvatarNameCache::get(getAvatarId(),
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 2c4270090c..9011583a60 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -225,6 +225,22 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 
 	}
 
+	if (LLAvatarNameCache::useDisplayNames())
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( true );
+		getChild<LLUICtrl>("user_slid")->setVisible( true );
+		getChild<LLUICtrl>("display_name_label")->setVisible( true );
+		getChild<LLUICtrl>("copy_to_clipboard")->setVisible( true );
+		getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( true );
+	}
+	else
+	{
+		getChild<LLUICtrl>("user_label")->setVisible( false );
+		getChild<LLUICtrl>("user_slid")->setVisible( false );
+		getChild<LLUICtrl>("display_name_label")->setVisible( false );
+		getChild<LLUICtrl>("copy_to_clipboard")->setVisible( false );
+		getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( false );
+	}
 }
 
 // EOF
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index cf075b8aae..a863f1cc56 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -93,7 +93,7 @@
      height="13"
      layout="topleft"
      left="10"
-     name="user_label"
+     name="display_name_label"
      text_color="LtGray"
      value="Display Name:"
      width="80" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 406ec775a5..dc5173867b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -34,7 +34,7 @@
    height="13"
    layout="topleft"
    left="45"
-   name="user_label"
+   name="display_name_label"
    text_color="LtGray"
    value="Display Name:"
    width="80" />
-- 
cgit v1.3


From 330ea83c3dd8f56f4cef56481f951b705d28f027 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 13 Oct 2010 15:39:16 -0700
Subject: making profiles look nicer when display names isn't on

---
 indra/newview/llpanelme.cpp                        | 38 +++++++++++++++-------
 indra/newview/llpanelprofileview.cpp               |  3 +-
 .../skins/default/xui/en/panel_edit_profile.xml    | 36 ++++++++++++++++----
 .../skins/default/xui/en/panel_profile_view.xml    | 13 +++++++-
 4 files changed, 71 insertions(+), 19 deletions(-)

(limited to 'indra/newview/llpanelprofileview.cpp')

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index a9f7b6c62c..5ea94e0611 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -212,6 +212,8 @@ void LLPanelMyProfileEdit::onOpen(const LLSD& key)
 		getChild<LLUICtrl>("display_name_label")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setEnabled( true );
+		getChild<LLUICtrl>("solo_user_name")->setVisible( false );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( false );
 	}
 	else
 	{
@@ -220,6 +222,8 @@ void LLPanelMyProfileEdit::onOpen(const LLSD& key)
 		getChild<LLUICtrl>("display_name_label")->setVisible( false );
 		getChild<LLUICtrl>("set_name")->setVisible( false );
 		getChild<LLUICtrl>("set_name")->setEnabled( false );
+		getChild<LLUICtrl>("solo_user_name")->setVisible( true );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( true );
 	}
 }
 
@@ -270,18 +274,8 @@ void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarNam
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
 	getChild<LLUICtrl>("user_slid")->setValue( av_name.mUsername );
 	getChild<LLUICtrl>("user_name_small")->setValue( av_name.mDisplayName );
+	getChild<LLUICtrl>("solo_user_name")->setValue( av_name.mDisplayName );
 
-	// show smaller display name if too long to display in regular size
-	if (getChild<LLTextBox>("user_name")->getTextPixelWidth() > getChild<LLTextBox>("user_name")->getRect().getWidth())
-	{
-		getChild<LLUICtrl>("user_name_small")->setVisible( true );
-		getChild<LLUICtrl>("user_name")->setVisible( false );
-	}
-	else
-	{
-		getChild<LLUICtrl>("user_name_small")->setVisible( false );
-		getChild<LLUICtrl>("user_name")->setVisible( true );
-	}
 
 	if (LLAvatarNameCache::useDisplayNames())
 	{
@@ -290,6 +284,21 @@ void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarNam
 		getChild<LLUICtrl>("display_name_label")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setEnabled( true );
+
+		getChild<LLUICtrl>("solo_user_name")->setVisible( false );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( false );
+
+		// show smaller display name if too long to display in regular size
+		if (getChild<LLTextBox>("user_name")->getTextPixelWidth() > getChild<LLTextBox>("user_name")->getRect().getWidth())
+		{
+			getChild<LLUICtrl>("user_name_small")->setVisible( true );
+			getChild<LLUICtrl>("user_name")->setVisible( false );
+		}
+		else
+		{
+			getChild<LLUICtrl>("user_name_small")->setVisible( false );
+			getChild<LLUICtrl>("user_name")->setVisible( true );
+		}
 	}
 	else
 	{
@@ -298,6 +307,11 @@ void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarNam
 		getChild<LLUICtrl>("display_name_label")->setVisible( false );
 		getChild<LLUICtrl>("set_name")->setVisible( false );
 		getChild<LLUICtrl>("set_name")->setEnabled( false );
+		
+		getChild<LLUICtrl>("solo_user_name")->setVisible( true );
+		getChild<LLUICtrl>("user_name_small")->setVisible( false );
+		getChild<LLUICtrl>("user_name")->setVisible( false );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( true );
 	}
 }
 
@@ -351,6 +365,8 @@ void LLPanelMyProfileEdit::resetData()
 	//childSetTextArg("name_text", "[LAST]", LLStringUtil::null);
 	getChild<LLUICtrl>("user_name")->setValue( LLSD() );
 	getChild<LLUICtrl>("user_slid")->setValue( LLSD() );
+	getChild<LLUICtrl>("solo_user_name")->setValue( LLSD() );
+	getChild<LLUICtrl>("user_name_small")->setValue( LLSD() );
 }
 
 void LLPanelMyProfileEdit::onTexturePickerMouseEnter(LLUICtrl* ctrl)
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 9011583a60..7635aedf58 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -222,7 +222,6 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 	{
 		getChild<LLUICtrl>("user_name_small")->setVisible( false );
 		getChild<LLUICtrl>("user_name")->setVisible( true );
-
 	}
 
 	if (LLAvatarNameCache::useDisplayNames())
@@ -232,6 +231,7 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 		getChild<LLUICtrl>("display_name_label")->setVisible( true );
 		getChild<LLUICtrl>("copy_to_clipboard")->setVisible( true );
 		getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( true );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( false );
 	}
 	else
 	{
@@ -240,6 +240,7 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 		getChild<LLUICtrl>("display_name_label")->setVisible( false );
 		getChild<LLUICtrl>("copy_to_clipboard")->setVisible( false );
 		getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( false );
+		getChild<LLUICtrl>("solo_username_label")->setVisible( true );
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 70c7bae662..90dbddaff7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -96,6 +96,17 @@
      name="display_name_label"
      text_color="LtGray"
      value="Display Name:"
+     width="80" />
+      <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="solo_username_label"
+     text_color="LtGray"
+     value="Username:"
+     visible="false" 
      width="80" />
       <button
          name="set_name"
@@ -112,13 +123,26 @@
        font="SansSerifBigBold"
        height="20"
        layout="topleft"
-       left_pad="10"
-       name="user_name"
+       left="10"
+       name="solo_user_name"
        text_color="white"
        top_delta="3"
        value="Hamilton Hitchings"
-       use_ellipses="true" 
-       visible="true" 
+       use_ellipses="true"
+       visible="false"
+       width="275" />
+      <text
+       follows="top|left"
+       font="SansSerifBigBold"
+       height="20"
+       layout="topleft"
+       left="43"
+       name="user_name"
+       text_color="white"
+       top_delta="0"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="true"
        width="250" />
       <text
        follows="top|left"
@@ -131,7 +155,7 @@
        top_delta="-4"
        value="Hamilton Hitchings"
        use_ellipses="true"
-       visible="false" 
+       visible="false"
        wrap="true"
        width="245" />
       <text
@@ -141,7 +165,7 @@
     left="10"
     name="user_label"
     text_color="LtGray"
-    top_pad="8" 
+    top_pad="8"
     value="Username:"
     width="70" />
       <text
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index dc5173867b..97229c413c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -38,6 +38,17 @@
    text_color="LtGray"
    value="Display Name:"
    width="80" />
+  <text
+   top_delta="0"
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="solo_username_label"
+   text_color="LtGray"
+   value="Username:"
+   visible="false" 
+   width="80" />
   <text
    follows="top|right"
    halign="right"
@@ -108,7 +119,7 @@
    top_delta="-2"
    use_ellipses="true"
    value="jack.linden"
-   width="205" 
+   width="195" 
    wrap="true "/>
   <tab_container
    follows="all"
-- 
cgit v1.3