From 667c241177b9a23c305816fafb4feb81b0a93ba0 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 14 Oct 2011 10:31:00 -0700
Subject: [PATCH] * Changed "Buy L$" and "Shop" buttons to gray per design. *
Removed "marketplace" button from toybox and default toolbar configuration
---
indra/newview/app_settings/commands.xml | 2 +-
indra/newview/app_settings/toolbars.xml | 3 +--
.../skins/default/textures/textures.xml | 1 +
.../skins/default/xui/en/panel_status_bar.xml | 18 +++++++++---------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 9d4d268075c..3d3c13f5d81 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -111,7 +111,7 @@
is_running_parameters="world_map"
/>
<command name="marketplace"
- available_in_toybox="true"
+ available_in_toybox="false"
icon="Command_Marketplace_Icon"
label_ref="Command_Marketplace_Label"
tooltip_ref="Command_Marketplace_Tooltip"
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 8eb438b857c..f2192a75ad4 100644
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -18,8 +18,7 @@
<command name="inventory"/>
<command name="search"/>
<command name="places"/>
- <command name="marketplace"/>
<command name="voice"/>
<command name="minimap"/>
</left_toolbar>
-</toolbars>
\ No newline at end of file
+</toolbars>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ab1a8f09904..53a5de0189e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -461,6 +461,7 @@ with the same filename but different name
<texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="PushButton_Over" file_name="widgets/PushButton_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
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 c983e0792a7..422bbada7ff 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -36,7 +36,7 @@
<panel
height="18"
left="-370"
- width="150"
+ width="160"
top="1"
follows="right|top"
name="balance_bg"
@@ -60,9 +60,9 @@
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_color="White"
@@ -81,9 +81,9 @@
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"
+ image_hover_unselected="PushButton_Over"
+ image_unselected="PushButton_Off"
+ image_pressed="PushButton_Press"
height="18"
label="Shop"
label_color="White"
@@ -92,9 +92,9 @@
name="goShop"
pad_right="0"
pad_bottom="2"
- tool_tip="Go shopping"
+ tool_tip="Open Second Life Marketplace"
top="0"
- width="55" />
+ width="65" />
</panel>
<text
type="string"
--
GitLab