Merge of viewer-2-0 changes

1 files changed, 12 insertions, 11 deletions

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 c0d3c6d7f6..2ff9ada90a 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,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<split_button 
+<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"
+     scale_image="false"
+     image_selected="SegmentedBtn_Left_Selected"
+     image_unselected="SegmentedBtn_Left_Off"
      layout="topleft"
      name="item_buttons"
     />
+    <split_button.arrow_button
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="false"
+     image_selected="SegmentedBtn_Right_Selected"
+     image_unselected="SegmentedBtn_Right_Off"
+     />
 </split_button>