6 files changed, 10 insertions, 49 deletions

diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
index da066a1..8433c81 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -71,7 +71,7 @@
         </combo_box>
         <combo_box name="language_combobox">
                 <combo_item type="string" length="1" name="System Default Language">
-                        Systemfehler
+                        Betriebssystem-Einstellung
                 </combo_item>
                 <combo_item type="string" length="1" name="English">
                         English (Englisch)
diff --git a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
index 933baad..259cb3d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -26,6 +26,7 @@
                         draw_stripes="false"

                         multi_select="false"

                         search_column="1"

+      sort_column="2"

                 >

                         <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

                         <column name="speaker_name" label="Name" dynamicwidth="true" />

diff --git a/linden/indra/newview/skins/xui/en-us/floater_test.xml b/linden/indra/newview/skins/xui/en-us/floater_test.xml
index 71a3bd4..f6d38ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_test.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_test.xml
@@ -1,45 +1,6 @@
 <?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" hidden="false" 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" hidden="false"
-             left="12" mouse_opaque="true" name="Type part of the resident&apos;s 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" hidden="false"
-             left="12" max_length="254" mouse_opaque="true" name="Edit"
-             select_on_focus="false" width="132" />
-        <button bottom="-60" follows="top|right" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Find" label_selected="Find" left_delta="140"
-             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
-        <scroll_list background_visible="true" bottom="-224" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" follows="left|top|right"
-             height="160" hidden="false" 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" hidden="false"
-             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" hidden="false" 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" hidden="false" label="Select" label_selected="Select" left="12"
-             mouse_opaque="true" name="Select" scale_image="TRUE" width="80" />
-        <button bottom="-376" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Close" label_selected="Close"
-             left_delta="88" mouse_opaque="true" name="Close" scale_image="TRUE"
-             width="80" />
-        <text hidden="true" name="NotFound">
-                &apos;[TEXT]&apos; not found
-        </text>
+<!-- Please don't commit this with any changes! For local testing only! -->
+<floater bottom="40" left="40" height="225" width="180" 
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         name="Test" title="Test">
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 1aa8899..f36a380 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -213,7 +213,6 @@
                              width="400" />
                         <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
                              top="25">
-                                Done
                         </text>
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
index 8896cd6..93db538 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
@@ -3,9 +3,9 @@
         <panel name="status" left="0" bottom="040" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

      <layout_stack name="bar_stack" left="0" bottom="0" height="768" width="1024" 

                         follows="left|right|bottom|top" mouse_opaque="false" orientation="vertical" border_size="0" use_bounding_rect="true">

-                <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

-                <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

-                <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                  <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+                  <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                  <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

      </layout_stack>

         <panel name="hud" left="0" bottom="50" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
index 5d51eed..dd89640 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
                         <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true"

                                         draw_stripes="false" follows="left|top|bottom|right" left="0"

                                         multi_select="false" name="speakers_list" right="140" search_column="1"

-                                        top="120">

+                                        top="120" sort_column="2">

                                 <column name="icon_speaking_status" sort="speaking_status" width="20" />

                                 <column dynamicwidth="true" label="Name" name="speaker_name" />

                                 <column label="" name="speaking_status" width="0" />