merging in latest changes

1 files changed, 2 insertions, 28 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index a1ed1e0b01..a8add9c6ab 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -60,10 +60,6 @@
 #include "llnotificationmanager.h"
 #include "llautoreplace.h"
 
-/// Helper function to resolve resident names from given uuids
-/// and form a string of names separated by "words_separator".
-static void build_names_string(const uuid_vec_t& uuids, std::string& names_string);
-
 floater_showed_signal_t LLIMFloater::sIMFloaterShowedSignal;
 
 LLIMFloater::LLIMFloater(const LLUUID& session_id)
@@ -476,7 +472,7 @@ void LLIMFloater::addP2PSessionParticipants(const LLSD& notification, const LLSD
 void LLIMFloater::sendParticipantsAddedNotification(const uuid_vec_t& uuids)
 {
 	std::string names_string;
-	build_names_string(uuids, names_string);
+	LLAvatarActions::buildResidentsString(uuids, names_string);
 	LLStringUtil::format_map_t args;
 	args["[NAME]"] = names_string;
 
@@ -581,7 +577,7 @@ void LLIMFloater::onParticipantsListChanged(LLUICtrl* ctrl)
 	if (all_names_resolved)
 	{
 		std::string ui_title;
-		build_names_string(temp_uuids, ui_title);
+		LLAvatarActions::buildResidentsString(temp_uuids, ui_title);
 		updateSessionName(ui_title, ui_title);
 	}
 }
@@ -1332,25 +1328,3 @@ boost::signals2::connection LLIMFloater::setIMFloaterShowedCallback(const floate
 {
 	return LLIMFloater::sIMFloaterShowedSignal.connect(cb);
 }
-
-// static
-void build_names_string(const uuid_vec_t& uuids, std::string& names_string)
-{
-	std::vector<LLAvatarName> avatar_names;
-	uuid_vec_t::const_iterator it = uuids.begin();
-	for (; it != uuids.end(); ++it)
-	{
-		LLAvatarName av_name;
-		if (LLAvatarNameCache::get(*it, &av_name))
-		{
-			avatar_names.push_back(av_name);
-		}
-	}
-
-	// We should check whether the vector is not empty to pass the assertion
-	// that avatar_names.size() > 0 in LLAvatarActions::buildResidentsString.
-	if (!avatar_names.empty())
-	{
-		LLAvatarActions::buildResidentsString(avatar_names, names_string);
-	}
-}