From 67f3ed1844aabdb25abe1d52e651c076fec1eb9b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 23 Feb 2010 16:34:02 -0800
Subject: Prototype search by SLID and display name

---
 .../skins/default/xui/en/floater_avatar_picker.xml | 46 +++++++++++++++-------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_avatar_picker.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index f59badfcb4..59923bec96 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -5,11 +5,11 @@
  height="350"
  layout="topleft"
  min_height="200"
- min_width="265"
+ min_width="400"
  name="avatarpicker"
  help_topic="avatarpicker"
  title="CHOOSE RESIDENT"
- width="265">
+ width="500">
     <floater.string
      name="not_found">
         &apos;[TEXT]&apos; not found
@@ -40,7 +40,7 @@
      name="ResidentChooserTabs"
      tab_position="top"
      top="20"
-     width="265">
+     width="500">
         <panel
          border="none"
          height="150"
@@ -83,14 +83,32 @@
              left_pad="5"
              name="Find"
              width="45" />
-            <scroll_list
-             follows="all"
-             height="98"
-             layout="topleft"
-             left="0"
-             name="SearchResults"
-             top="52"
-             width="132" />
+          <scroll_list
+            draw_heading="true" 
+           follows="all"
+           height="98"
+           layout="topleft"
+           left="0"
+           name="SearchResults"
+           top="52"
+           width="132">
+            <columns
+              label="Name"
+              name="name"
+              width="100" />
+            <columns
+              label="SL ID"
+              name="slid"
+              width="100" />
+            <columns
+              label="Age"
+              name="age"
+              width="100" />
+            <columns
+              label="Profile"
+              name="profile"
+              width="100" />
+          </scroll_list>
         </panel>
         <panel
          border="none"
@@ -207,16 +225,16 @@
         </panel>
     </tab_container>
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="OK"
      label_selected="OK"
      name="ok_btn"
      top_pad="3"
-     left="46"
+     left="10"
      width="100" />
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Cancel"
      label_selected="Cancel"
-- 
cgit v1.2.3


From 6d1e44b0338dd2815f605a5ba6e6528932cf3ebc Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 20 Apr 2010 14:52:09 -0700
Subject: Avatar picker requests are routed via sim capability

---
 indra/newview/skins/default/xui/en/floater_avatar_picker.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_avatar_picker.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 59923bec96..489b7c0536 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -104,10 +104,6 @@
               label="Age"
               name="age"
               width="100" />
-            <columns
-              label="Profile"
-              name="profile"
-              width="100" />
           </scroll_list>
         </panel>
         <panel
-- 
cgit v1.2.3


From 7fb941042251975919656b792fd4bfd9ebbc42d9 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 25 May 2010 14:15:26 -0700
Subject: LLFloaterAvatarPicker now uses LLAvatarNames reviewed by James

---
 indra/newview/skins/default/xui/en/floater_avatar_picker.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_avatar_picker.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 489b7c0536..7ffafe26a2 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -97,12 +97,8 @@
               name="name"
               width="100" />
             <columns
-              label="SL ID"
-              name="slid"
-              width="100" />
-            <columns
-              label="Age"
-              name="age"
+              label="Username"
+              name="username"
               width="100" />
           </scroll_list>
         </panel>
-- 
cgit v1.2.3


From f39d10dc3333ed781b8795fa7dfe3f19b53f875a Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 26 May 2010 16:23:56 -0700
Subject: LLNameBox -> LLTextBox

---
 .../skins/default/xui/en/floater_avatar_picker.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_avatar_picker.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 7ffafe26a2..a11946d352 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -95,11 +95,11 @@
             <columns
               label="Name"
               name="name"
-              width="100" />
+              width="150" />
             <columns
               label="Username"
               name="username"
-              width="100" />
+              width="150" />
           </scroll_list>
         </panel>
         <panel
@@ -138,7 +138,7 @@
             </button>
             <scroll_list
              follows="all"
-             height="100"
+             height="120"
              border="false"
              layout="topleft"
              left="0"
@@ -204,7 +204,8 @@
              width="28"
              name="Refresh"
              image_overlay="Refresh_Off" />
-            <scroll_list
+          <scroll_list
+             draw_heading="true"
              follows="all"
              height="100"
              border="false"
@@ -212,8 +213,17 @@
              left="0"
              name="NearMe"
              sort_column="0"
-             top="50"
-             width="132" />
+             top="52"
+             width="132">
+            <columns
+              label="Name"
+              name="name"
+              width="150" />
+            <columns
+              label="Username"
+              name="username"
+              width="150" />
+          </scroll_list>
         </panel>
     </tab_container>
     <button
-- 
cgit v1.2.3