summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml18
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml27
2 files changed, 27 insertions, 18 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 69029d2ab9..833e8b9f32 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -34,25 +34,13 @@
<menu_item_check
label="Inventory..."
name="Inventory"
- shortcut="control|shift|I"
- visible="false">
+ shortcut="control|I"
+ visible="true">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="inventory" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="inventory" />
- </menu_item_check>
- <menu_item_check
- label="Inventory..."
- name="ShowSidetrayInventory"
- shortcut="control|I"
- visible="true">
- <menu_item_check.on_check
- function="SidetrayPanelVisible"
parameter="my_inventory" />
<menu_item_check.on_click
- function="ShowSidetrayPanel"
+ function="Floater.Toggle"
parameter="my_inventory" />
</menu_item_check>
<menu_item_check
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 1f298cbe16..c983e0792a 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="-315"
- width="95"
+ left="-370"
+ width="150"
top="1"
follows="right|top"
name="balance_bg"
@@ -64,7 +64,7 @@
image_unselected="buy_off"
image_pressed="buy_press"
height="18"
- label="BUY L$"
+ label="Buy L$"
label_color="White"
left_pad="0"
label_shadow="true"
@@ -74,6 +74,27 @@
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="buy_over"
+ image_unselected="buy_off"
+ image_pressed="buy_press"
+ height="18"
+ label="Shop"
+ label_color="White"
+ left_pad="0"
+ label_shadow="true"
+ name="goShop"
+ pad_right="0"
+ pad_bottom="2"
+ tool_tip="Go shopping"
+ top="0"
+ width="55" />
</panel>
<text
type="string"