* Hooked up build FUI toolbar button

* Added Shop button to status bar
* Changed "Inventory..." menu item to go to same window as toolbar inventory button

6 files changed, 33 insertions, 20 deletions

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index c83494df25..7c6468459c 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -35,7 +35,7 @@
            icon="Command_Build_Icon"
            label_ref="Command_Build_Label"
            tooltip_ref="Command_Build_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
+           execute_function="Build.Toggle"
            execute_parameters="build"
            is_enabled_function="Agent.IsActionAllowed"
            is_enabled_parameters="build"
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 1b8be7a5b2..75db269bde 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -169,6 +169,8 @@ BOOL LLStatusBar::postBuild()
 	getChild<LLUICtrl>("buyL")->setCommitCallback(
 		boost::bind(&LLStatusBar::onClickBuyCurrency, this));
 
+	getChild<LLUICtrl>("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURLExternal, gSavedSettings.getString("MarketplaceURL")));
+
 	mBoxBalance = getChild<LLTextBox>("balance");
 	mBoxBalance->setClickedCallback( &LLStatusBar::onClickBalance, this );
 
@@ -345,9 +347,10 @@ void LLStatusBar::setBalance(S32 balance)
 		const S32 HPAD = 24;
 		LLRect balance_rect = mBoxBalance->getTextBoundingRect();
 		LLRect buy_rect = getChildView("buyL")->getRect();
+		LLRect shop_rect = getChildView("goShop")->getRect();
 		LLView* balance_bg_view = getChildView("balance_bg");
 		LLRect balance_bg_rect = balance_bg_view->getRect();
-		balance_bg_rect.mLeft = balance_bg_rect.mRight - (buy_rect.getWidth() + balance_rect.getWidth() + HPAD);
+		balance_bg_rect.mLeft = balance_bg_rect.mRight - (buy_rect.getWidth() + shop_rect.getWidth() + balance_rect.getWidth() + HPAD);
 		balance_bg_view->setShape(balance_bg_rect);
 	}
 
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 25f1903131..ab1a8f0990 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -137,6 +137,7 @@ with the same filename but different name
   <texture name="Command_Inventory_Icon"    file_name="toolbar_icons/inventory.png"    preload="true" />
   <texture name="Command_Map_Icon"          file_name="toolbar_icons/map.png"          preload="true" />
   <texture name="Command_Marketplace_Icon"  file_name="toolbar_icons/marketplace.png"  preload="true" />
+  <texture name="Command_MiniCart_Icon"     file_name="toolbar_icons/mini_cart.png"    preload="true" />
   <texture name="Command_MiniMap_Icon"      file_name="toolbar_icons/mini_map.png"     preload="true" />
   <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
new file mode 100644
index 0000000000..9fcf46794d
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
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"