From ad61ada7c136764be940acb19c32a759e042f7dc Mon Sep 17 00:00:00 2001
From: Apelsin <appelsindrikken@gmail.com>
Date: Thu, 17 Jun 2010 11:47:39 -0700
Subject: [PATCH] Added ability to select avatar by UUID and even select groups
 by UUID (i.e. return group-owned objects per estate[s])

---
 indra/newview/llfloateravatarpicker.cpp       | 23 +++++++++++++++++--
 .../xui/en-us/floater_avatar_picker.xml       | 22 ++++++++++++++----
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index e382fefec..9579924aa 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -100,6 +100,7 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker() :
 BOOL LLFloaterAvatarPicker::postBuild()
 {
 	childSetKeystrokeCallback("Edit", editKeystroke, this);
+	childSetKeystrokeCallback("EditUUID", editKeystroke, this);
 
 	childSetAction("Find", onBtnFind, this);
 	childDisable("Find");
@@ -138,7 +139,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
 	childSetTabChangeCallback("ResidentChooserTabs", "SearchPanel",			onTabChanged, this);
 	childSetTabChangeCallback("ResidentChooserTabs", "CallingCardsPanel",	onTabChanged, this);
 	childSetTabChangeCallback("ResidentChooserTabs", "NearMePanel",			onTabChanged, this);
-	
+	childSetTabChangeCallback("ResidentChooserTabs", "KeyPanel",			onTabChanged, this);
 	setAllowMultiple(FALSE);
 
 	return TRUE;
@@ -209,6 +210,17 @@ void LLFloaterAvatarPicker::onBtnSelect(void* userdata)
 			getSelectedAvatarData(self->getChild<LLScrollListCtrl>("NearMe"), avatar_names, avatar_ids);
 			self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
 		}
+		else if(active_panel == self->getChild<LLPanel>("KeyPanel"))
+		{
+			LLUUID specified = self->getChild<LLLineEditor>("EditUUID")->getValue().asUUID();
+			if(specified.isNull())
+				return;
+			std::vector<std::string>	avatar_names;
+			std::vector<LLUUID>			avatar_ids;
+			avatar_ids.push_back(specified);
+			avatar_names.push_back(specified.asString());
+			self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
+		}
 	}
 	self->getChild<LLInventoryPanel>("InventoryPanel")->setSelection(LLUUID::null, FALSE);
 	self->getChild<LLScrollListCtrl>("SearchResults")->deselectAllItems(TRUE);
@@ -481,7 +493,14 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 void LLFloaterAvatarPicker::editKeystroke(LLLineEditor* caller, void* user_data)
 {
 	LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)user_data;
-	self->childSetEnabled("Find", caller->getText().size() >= 3);
+	LLPanel* active_panel = self->childGetVisibleTab("ResidentChooserTabs");
+	if(active_panel == self->getChild<LLPanel>("SearchPanel"))
+		self->childSetEnabled("Find", caller->getText().size() >= 3);
+	else if(active_panel == self->getChild<LLPanel>("KeyPanel"))
+	{
+		LLUUID specified = self->getChild<LLLineEditor>("EditUUID")->getValue().asUUID();
+		self->childSetEnabled("Select", specified.notNull());
+	}
 }
 
 // virtual
diff --git a/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 8cc8b9890..cf1d22f2f 100644
--- a/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-380" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="350" left="400" min_height="200" min_width="265"
-     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="265">
+     can_resize="true" height="350" left="400" min_height="200" min_width="375"
+     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="375">
 
 	<tab_container bottom="30" follows="left|right|top|bottom" height="300" left="4"
-	     name="ResidentChooserTabs" tab_position="top" tab_width="65" width="255">
+	     name="ResidentChooserTabs" tab_position="top" tab_width="65" width="365">
 		<panel name="SearchPanel" label="Search"
 			border="true" bottom="0" height="150" left="6" width="135"
 			mouse_opaque="true">
@@ -71,7 +71,21 @@
            draw_stripes="true" column_padding="5" sort_column="0" mouse_opaque="true"
            background_visible="true" multi_select="false" name="NearMe"  />
     </panel>
-
+    <panel name="KeyPanel" label="By UUID"
+      border="true" bottom="0" height="240" left="6" width="135" mouse_opaque="true">
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom="-24" drop_shadow_visible="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+           mouse_opaque="true" name="InstructSelectResident" v_pad="0"
+           width="220">
+        Avatar or Group UUID:
+      </text>
+      <line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
+			     font="SansSerifSmall" height="16" left="10"
+			     max_length="36" mouse_opaque="true" name="EditUUID"
+			     width="230" />
+    </panel>
 	</tab_container>
 
   <button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"