From e88e1022f804bd23edff73f95e5ac3cec5effcfb Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 1 Feb 2010 11:00:14 -0800
Subject: Show SLIDs in avatar picker

---
 indra/newview/llfloateravatarpicker.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index a0b2de85f0..50aa70478b 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -370,6 +370,19 @@ void LLFloaterAvatarPicker::setAllowMultiple(BOOL allow_multiple)
 	getChild<LLScrollListCtrl>("Friends")->setAllowMultipleSelection(allow_multiple);
 }
 
+// IDEVO
+static std::string clean_name_from_avatar_picker(const std::string& first, const std::string& last)
+{
+	if (last.empty() || last == "Resident")
+	{
+		return first;
+	}
+	else
+	{
+		return first + " " + last;
+	}
+}
+
 // static 
 void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void**)
 {
@@ -420,7 +433,7 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 		}
 		else
 		{
-			avatar_name = first_name + " " + last_name;
+			avatar_name = clean_name_from_avatar_picker(first_name, last_name);
 			search_results->setEnabled(TRUE);
 			found_one = TRUE;
 		}
-- 
cgit v1.2.3