livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Leslie Linden 2011-10-14 11:47:03 -07:00
parent aa7245fa2b 667c241177
commit 42fe654359
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/commands.xml
View File

@ -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"

3
indra/newview/app_settings/toolbars.xml
View File

@ -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>
</toolbars>

1
indra/newview/skins/default/textures/textures.xml
View File

@ -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" />

18
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -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"