9 files changed, 11 insertions, 11 deletions
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 5a20aff4e6..13b6ad705b 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -99,7 +99,7 @@ void LLAvatarName::fromLLSD(const LLSD& sd)
 	mExpires = expires.secondsSinceEpoch();
 }
 
-std::string LLAvatarName::getNameAndSLID() const
+std::string LLAvatarName::getCompleteName() const
 {
 	std::string name;
 	if (!mUsername.empty())
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index fb5cb277a2..8b74e006c3 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -51,7 +51,7 @@ public:
 
 	// For normal names, returns "James Linden (james.linden)"
 	// When display names are disabled returns just "James Linden"
-	std::string getNameAndSLID() const;
+	std::string getCompleteName() const;
 
 	// Returns "James Linden" or "bobsmith123 Resident" for backwards
 	// compatibility with systems like voice and muting
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 708ef1895e..1d1a127dae 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -190,7 +190,7 @@ void LLAvatarActions::offerTeleport(const uuid_vec_t& ids)
 static void on_avatar_name_cache_start_im(const LLUUID& agent_id,
 										  const LLAvatarName& av_name)
 {
-	std::string name = av_name.getNameAndSLID();
+	std::string name = av_name.getCompleteName();
 	LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id);
 	if (session_id != LLUUID::null)
 	{
@@ -225,7 +225,7 @@ void LLAvatarActions::endIM(const LLUUID& id)
 static void on_avatar_name_cache_start_call(const LLUUID& agent_id,
 											const LLAvatarName& av_name)
 {
-	std::string name = av_name.getNameAndSLID();
+	std::string name = av_name.getCompleteName();
 	LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, true);
 	if (session_id != LLUUID::null)
 	{
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 78dea87bfd..d0a15450a0 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1609,7 +1609,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 		// Placeholder for name.
 		LLAvatarName av_name;
 		LLAvatarNameCache::get(owner_id, &av_name);
-		item_params.columns.add().value(av_name.getNameAndSLID()).font(FONT).column("name");
+		item_params.columns.add().value(av_name.getCompleteName()).font(FONT).column("name");
 
 		object_count_str = llformat("%d", object_count);
 		item_params.columns.add().value(object_count_str).font(FONT).column("count");
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index ebb73baffb..e214b58a9a 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -242,7 +242,7 @@ void LLFloaterSellLandUI::updateParcelInfo()
 
 void LLFloaterSellLandUI::onBuyerNameCache(const LLAvatarName& av_name)
 {
-	childSetText("sell_to_agent", av_name.getNameAndSLID());
+	childSetText("sell_to_agent", av_name.getCompleteName());
 	childSetToolTip("sell_to_agent", av_name.mUsername);
 }
 
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index b5b923dcad..1c1d9343aa 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -331,7 +331,7 @@ void LLIMFloater::onAvatarNameCache(const LLUUID& agent_id,
 {
 	// Use display name only for labels, as the extended name will be in the
 	// floater title
-	std::string ui_title = av_name.getNameAndSLID();
+	std::string ui_title = av_name.getCompleteName();
 	updateSessionName(ui_title, av_name.mDisplayName);
 }
 
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index f615402f9c..e915d3ad70 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1968,7 +1968,7 @@ void LLIncomingCallDialog::onAvatarNameCache(const LLUUID& agent_id,
 											 const LLAvatarName& av_name,
 											 const std::string& call_type)
 {
-	std::string title = av_name.getNameAndSLID();
+	std::string title = av_name.getCompleteName();
 	setCallerName(title, av_name.mDisplayName, call_type);
 }
 
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 2a7e84256e..a2450fcdd2 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -306,7 +306,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 				if (mShortNames)
 					fullname = av_name.mDisplayName;
 				else
-					fullname = av_name.getNameAndSLID();
+					fullname = av_name.getCompleteName();
 			}
 			else
 			{
@@ -375,7 +375,7 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 	if (mShortNames)
 		name = av_name.mDisplayName;
 	else
-		name = av_name.getNameAndSLID();
+		name = av_name.getCompleteName();
 
 	item_list::iterator iter;
 	for (iter = getItemList().begin(); iter != getItemList().end(); iter++)
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 33d03bd890..67b238ad58 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -562,7 +562,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, MASK mask )
 	if(mClosestAgentToCursor.notNull()
 	   && LLAvatarNameCache::get(mClosestAgentToCursor, &av_name))
 	{
-		args["[AGENT]"] = av_name.getNameAndSLID() + "\n";
+		args["[AGENT]"] = av_name.getCompleteName() + "\n";
 		have_agent = true;
 	}
 	else