Converted all gCacheName->getName to getFullName for SLID compatibility

Also eliminated notification "ObjectGiveItemUnknownUser" because the
SLURL-based name lookup will always retrieve the user name.
Fixed a bug with ObjectGiveItem where the SLURL would be incorrect
for a group.

1 files changed, 2 insertions, 14 deletions

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 50aa70478b..7a5c7c835f 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -43,6 +43,7 @@
 
 // Linden libraries
 #include "llbutton.h"
+#include "llcachename.h"
 #include "lllineeditor.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
@@ -370,19 +371,6 @@ 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**)
 {
@@ -433,7 +421,7 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 		}
 		else
 		{
-			avatar_name = clean_name_from_avatar_picker(first_name, last_name);
+			avatar_name = LLCacheName::buildFullname(first_name, last_name);
 			search_results->setEnabled(TRUE);
 			found_one = TRUE;
 		}