summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrew Polunin <apolunin@productengine.com>2010-05-20 21:16:16 +0300
committerAndrew Polunin <apolunin@productengine.com>2010-05-20 21:16:16 +0300
commit53505bd225608d1f048ca80e0bc475d2c125db3a (patch)
tree8984e9ff94a6b057af331f4802253d33b9fe511e /indra/newview/skins
parentae6c2de1e33e15f7a3766007a2b20b16f99c1114 (diff)
EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace. - Added member mShopBtn in the class LLSidepanelInventory. - Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button - Added corresponding widget in the sidepanel_inventory.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 812d94c55f..4c42d1f750 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -58,6 +58,16 @@
top="0"
width="102" />
<button
+ enabled="true"
+ follows="bottom|left"
+ height="23"
+ label="Shop"
+ layout="topleft"
+ left="210"
+ name="shop_btn"
+ top="0"
+ width="102" />
+ <button
enabled="false"
follows="bottom|left"
height="23"