merge

1 files changed, 31 insertions, 29 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 5894abd03b..422bbada7f 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,8 +35,8 @@
     </panel.string>
   <panel
     height="18"
-    left="-355"
-    width="95"
+    left="-370"
+    width="160"
     top="1"
     follows="right|top" 
     name="balance_bg" 
@@ -60,11 +60,11 @@
      halign="center"
      font="SansSerifSmall"
      follows="right|top|bottom"
-     image_hover_unselected="buy_over"
-     image_unselected="buy_off"
-     image_pressed="buy_press"
+     image_hover_unselected="PushButton_Over"
+     image_unselected="PushButton_Off"
+     image_pressed="PushButton_Press"
      height="18"
-     label="BUY L$"
+     label="Buy L$"
      label_color="White"
      left_pad="0"
      label_shadow="true"
@@ -74,39 +74,41 @@
      tool_tip="Click to buy more L$"
      top="0"
      width="55" />
+    <button
+     halign="left"
+     font="SansSerifSmall"
+     follows="right|top|bottom"
+     imgoverlay_label_space="7"
+     image_overlay="Command_MiniCart_Icon"
+     image_overlay_alignment="left"
+     image_hover_unselected="PushButton_Over"
+     image_unselected="PushButton_Off"
+     image_pressed="PushButton_Press"
+     height="18"
+     label="Shop"
+     label_color="White"
+     left_pad="0"
+     label_shadow="true"
+     name="goShop"
+     pad_right="0"
+     pad_bottom="2"
+     tool_tip="Open Second Life Marketplace"
+     top="0"
+     width="65" />
   </panel>
-  <combo_box
-    follows="right|top"   
-    drop_down_button.pad_left="10" 
-    left_pad="5"
-    top="0"
-    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."
-    >
-    <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"
      follows="right|top"
-     halign="center"
+     halign="right"
      height="16"
      top="5"
      layout="topleft"
+     left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="75">
+     width="145">
         24:00 AM PST
     </text>
     <button
@@ -117,7 +119,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="10"
+     left_pad="15"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"