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.

10 files changed, 11 insertions, 11 deletions

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());
 			}
 		}