Backported LL's version of VWR-2681 from 1.23

1 files changed, 91 insertions, 37 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 8e3f822..49b7cb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -1,42 +1,96 @@
 <?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="380" left="400" min_height="340" min_width="200"
-     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="240">
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="true" name="instruct_search_resident_name" v_pad="0"
-             width="220">
-                Type part of the resident&apos;s name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"
-             follows="left|top|right" font="SansSerifSmall" height="16" left="12"
-             max_length="254" mouse_opaque="true" name="Edit" select_on_focus="false"
-             width="132" />
-        <button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
-             height="20" label="Find" label_selected="Find" left_delta="140"
-             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
-        <scroll_list background_visible="true" bottom_delta="-164" column_padding="5"
-             draw_border="true" draw_heading="false" draw_stripes="true"
-             follows="left|top|right" height="156" left="12" mouse_opaque="true"
-             multi_select="false" name="Names" width="220" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="true" name="Or select their calling card:" v_pad="0"
-             width="220">
-                Or select a calling card:
-        </text>
-        <inventory_panel allow_multi_select="false" border="true" bottom_delta="-100"
-             follows="left|top|right|bottom" height="100" left="12" mouse_opaque="true"
-             name="Inventory Panel" sort_order="AvatarPickerSortOrder" width="220" />
-        <button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Close" label_selected="Close" mouse_opaque="true"
-             name="Close" right="230" scale_image="TRUE" width="105" />
-        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Select" label_selected="Select" mouse_opaque="true"
-             name="Select" right="119" scale_image="TRUE" width="105" />
-        <string name="NotFound">
+     can_resize="true" height="350" left="400" min_height="200" min_width="250"
+     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="250">
+
+        <tab_container bottom="30" follows="left|right|top|bottom" height="300" left="4"
+             name="ResidentChooserTabs" tab_position="top" tab_width="65" width="240">
+                <panel name="SearchPanel" label="Search"
+                        border="true" bottom="0" height="150" left="6" width="120"
+                        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="InstructSearchResidentName" v_pad="0"
+                             width="220">
+                                Type part of the resident&apos;s name:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top|right"
+                             font="SansSerifSmall" height="16" left="10" right="-120"
+                             max_length="254" mouse_opaque="true" name="Edit"
+                             width="132" />
+                        <button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
+                             height="20" label="Find" label_selected="Find" left_delta="20" right="-10"
+                             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
+                        <scroll_list background_visible="true" bottom_delta="-95" column_padding="5"
+                             draw_border="true" draw_heading="false" draw_stripes="true"
+                             follows="left|top|right|bottom" height="90" left="10" mouse_opaque="true"
+                             multi_select="false" name="SearchResults" width="100" />
+                </panel>
+
+                <panel name="CallingCardsPanel" label="Calling Cards"
+                        border="true" bottom="0" height="150" left="0" width="120" 
+                        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="InstructSelectCallingCard" v_pad="0"
+                             width="220">
+                                Select a calling card:
+                        </text>
+                        <inventory_panel allow_multi_select="false" border="true" bottom_delta="-117"
+                             follows="left|top|right|bottom" height="110" left="10" mouse_opaque="true"
+                             name="InventoryPanel" sort_order="AvatarPickerSortOrder" width="100" />
+                </panel>
+
+    <panel name="NearMePanel" label="Near Me"
+      border="true" bottom="0" height="240" left="6" width="120" 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">
+        Select nearby resident:
+      </text>
+      <button bottom_delta="-3" left_delta="10" width="90" height="20" follows="top|right" 
+           label="Refresh List" label_selected="Refresh List" halign="center"
+           font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" />
+      <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
+           name="near_me_range" label="Range" control_name="NearMeRange" 
+           min_val="5" max_val="40" increment="1" initial_val="20" decimal_digits="0" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="15"
+           mouse_opaque="true" name="meters" v_pad="0"
+           width="40">
+        Meters
+      </text>
+      <scroll_list bottom_delta="-185" width="100" height="175" left="10" 
+           follows="left|top|right|bottom" draw_border="true" draw_heading="false" 
+           draw_stripes="true" column_padding="5" sort_column="0" mouse_opaque="true"
+           background_visible="true" multi_select="false" name="NearMe"  />
+    </panel>
+
+        </tab_container>
+
+  <button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"
+             width="75" height="20" label="Select" label_selected="Select" mouse_opaque="true"
+             name="Select" scale_image="TRUE" />
+        <button bottom_delta="0" right="230" follows="left|bottom" font="SansSerif" halign="center"
+             width="75" height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
+             name="Cancel" scale_image="TRUE" />
+
+        <string name="not_found">
                 &apos;[TEXT]&apos; not found
         </string>
+        <string name="no_one_near">
+                No-one near
+        </string>
+        <string name="no_results">
+                No results
+        </string>
+        <string name="searching">
+                Searching...
+        </string>
 </floater>