Sync up with a number of SVN changes that snuck in via weird merges

3 files changed, 38 insertions, 38 deletions

diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index d7736832a3..a34b005448 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<filter_editor select_on_focus="true"

-               background_image_disabled="TextField_Search_Disabled"

-               background_image_focused="TextField_Search_Active">

-  <clear_filter_button label="" 

-                       image_unselected="Icon_Close_Foreground"

-                       image_selected="Icon_Close_Press" />

-</filter_editor>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<filter_editor select_on_focus="true"
+               background_image_disabled="TextField_Search_Disabled"
+               background_image_focused="TextField_Search_Active">
+  <clear_filter_button label="" 
+                       image_unselected="Icon_Close_Foreground"
+                       image_selected="Icon_Close_Press" />
+</filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
index c66aeb57a0..2e976bc755 100644
--- a/indra/newview/skins/default/xui/en/widgets/list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<list_view

-  fg_selected_color="ListViewSelectedFgColor"

-  bg_selected_color="ListViewSelectedBgColor"

-  bg_color="ListViewBgColor"

-  />

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list_view
+  fg_selected_color="ListViewSelectedFgColor"
+  bg_selected_color="ListViewSelectedBgColor"
+  bg_color="ListViewBgColor"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index b0367b599b..c0d3c6d7f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<split_button 

- font="SansSerifSmall"

- arrow_position="left"

- follows="right|top">

-    <split_button.arrow_button 

-     name="Arrow Button"

-     label=""

-     font="SansSerifSmall"

-     scale_image="true"

-     image_selected="camera_presets/camera_presets_arrow.png"

-     image_unselected="camera_presets/camera_presets_arrow.png"

-     image_disabled_selected="camera_presets/camera_presets_arrow.png" 

-     image_disabled="camera_presets/camera_presets_arrow.png"

-     width="10"/>

-    <split_button.items_panel

-     background_visible="true"

-     border="true"

-     bg_alpha_color="1 1 1 1"

-     bg_opaq_color="1 1 1 1"

-     layout="topleft"

-     name="item_buttons"

-    />

-</split_button>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<split_button 
+ font="SansSerifSmall"
+ arrow_position="left"
+ follows="right|top">
+    <split_button.arrow_button 
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="true"
+     image_selected="camera_presets/camera_presets_arrow.png"
+     image_unselected="camera_presets/camera_presets_arrow.png"
+     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
+     image_disabled="camera_presets/camera_presets_arrow.png"
+     width="10"/>
+    <split_button.items_panel
+     background_visible="true"
+     border="true"
+     bg_alpha_color="1 1 1 1"
+     bg_opaq_color="1 1 1 1"
+     layout="topleft"
+     name="item_buttons"
+    />
+</split_button>