summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-15 14:55:40 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-15 14:55:40 -0700
commitea5a1546913eea3c2e145828ffe76fac6bdfaee9 (patch)
tree2ec6252a0b24987980e4d55422aaf5f25fa7291c /indra
parent851912b9f8a5fc9f604adf8c43941b7fe27aae09 (diff)
DD-49 : Add FUI button for Marketplace Listings
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/commands.xml10
-rwxr-xr-xindra/newview/app_settings/toolbars.xml1
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml2
3 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 60c942094a..fd74166980 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -118,6 +118,16 @@
tooltip_ref="Command_Marketplace_Tooltip"
execute_function="Avatar.OpenMarketplace"
/>
+ <command name="marketplacelistings"
+ available_in_toybox="true"
+ icon="Command_Marketplace_Icon"
+ label_ref="Command_MarketplaceListings_Label"
+ tooltip_ref="Command_MarketplaceListings_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="marketplace_listings"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="marketplace_listings"
+ />
<command name="minimap"
available_in_toybox="true"
icon="Command_MiniMap_Icon"
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 86f9912815..69cae1b945 100755
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -22,5 +22,6 @@
<command name="voice"/>
<command name="minimap"/>
<command name="snapshot"/>
+ <command name="marketplacelistings"/>
</left_toolbar>
</toolbars>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 74c85bcd6b..21d6669eea 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3923,6 +3923,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Inventory_Label">Inventory</string>
<string name="Command_Map_Label">Map</string>
<string name="Command_Marketplace_Label">Marketplace</string>
+ <string name="Command_MarketplaceListings_Label">Sell on Marketplace</string>
<string name="Command_MiniMap_Label">Mini-map</string>
<string name="Command_Move_Label">Walk / run / fly</string>
<string name="Command_Outbox_Label">Merchant outbox</string>
@@ -3951,6 +3952,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Inventory_Tooltip">View and use your belongings</string>
<string name="Command_Map_Tooltip">Map of the world</string>
<string name="Command_Marketplace_Tooltip">Go shopping</string>
+ <string name="Command_MarketplaceListings_Tooltip">Sell your creation</string>
<string name="Command_MiniMap_Tooltip">Show nearby people</string>
<string name="Command_Move_Tooltip">Moving your avatar</string>
<string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>