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

sync with viewer-development

meow-7.2.2
eli 2012-03-01 14:21:57 -08:00
parent 785aa25ad4
commit 1d200c56e1
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
View File

@ -132,16 +132,16 @@
</panel>
<layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
<layout_panel />
<layout_panel height="45" auto_resize="false">
<layout_stack orientation="horizontal" left="0" height="45" top="0" width="333" follows="all">
<layout_panel height="24" auto_resize="false">
<layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
<layout_panel width="0" />
<layout_panel width="45" auto_resize="false">
<layout_panel width="24" auto_resize="false">
<loading_indicator
height="45"
height="24"
layout="topleft"
left="0"
top="0"
width="45" />
width="24" />
</layout_panel>
<layout_panel width="0" />
</layout_stack>

7
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -152,6 +152,13 @@
<menu_item_call.on_click
function="BuyCurrency" />
</menu_item_call>
<menu_item_call
label="Merchant Outbox..."
name="MerchantOutbox">
<menu_item_call.on_click
function="Floater.ToggleOrBringToFront"
parameter="outbox" />
</menu_item_call>
<menu_item_call
label="Account dashboard..."
name="Manage My Account">

2
indra/newview/skins/default/xui/en/sidepanel_inventory.xml
View File

@ -112,7 +112,7 @@
bg_opaque_color="InventoryBackgroundColor"
background_visible="true"
background_opaque="true"
tool_tip="Drag and drop items to your inventory to manage and use them"
tool_tip="Drag and drop items to your inventory to use them"
>
<text
name="inbox_inventory_placeholder"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2037,7 +2037,7 @@ Returns a string with the requested data about the region
<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
<string name="InventoryInboxNoItems">Certain items you receive, such as premium gifts, will appear here. You may then drag them into your inventory.</string>
<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>