merge

1 files changed, 19 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 23ad0e9528..5894abd03b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
     </panel.string>
   <panel
     height="18"
-    left="-315"
+    left="-355"
     width="95"
     top="1"
     follows="right|top" 
@@ -44,7 +44,6 @@
     background_opaque="true" 
     bg_opaque_image="bevel_background">
     <text
-     auto_resize="true"
      halign="center"
      font="SansSerifSmall"
      follows="all"
@@ -58,7 +57,6 @@
      value="L$20" 
      width="40" />
     <button
-     auto_resize="true"
      halign="center"
      font="SansSerifSmall"
      follows="right|top|bottom"
@@ -77,19 +75,27 @@
      top="0"
      width="55" />
   </panel>
-  <menu_button
-     follows="right|top"    
-    image_color="0 0 0 0"
-    hover_glow_amount="0"
+  <combo_box
+    follows="right|top"   
+    drop_down_button.pad_left="10" 
     left_pad="5"
     top="0"
-    width="55"
-    height="18"
-    label="Mode ▼"
+    width="120"
+    height="20"
+    name="mode_combo"
     tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-    menu_filename="menu_mode_change.xml"
-    />
+    >
+    <combo_box.item
+      label="Basic Mode"
+      name="Basic"
+      value="settings_minimal.xml" />
+    <combo_box.item
+      label="Advanced Mode"
+      name="Advanced"
+      value="" />
+  </combo_box>
     <text
+      left_pad="5"
      type="string"
      font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
@@ -98,10 +104,9 @@
      height="16"
      top="5"
      layout="topleft"
-     left_pad="5"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="90">
+     width="75">
         24:00 AM PST
     </text>
     <button