summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelmaininventory.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory_add.xml11
2 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7d7a92de81..5535d64d27 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -60,6 +60,7 @@
#include "llfolderview.h"
#include "llradiogroup.h"
#include "llenvironment.h"
+#include "llweb.h"
const std::string FILTERS_FILENAME("filters.xml");
@@ -1815,7 +1816,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
LLAvatarActions::shareWithAvatars(this);
}
}
-
+ if (command_name == "shop")
+ {
+ LLWeb::loadURL(gSavedSettings.getString("MarketplaceURL"));
+ }
if (command_name == "list_view")
{
setViewMode(MODE_LIST);
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 3385a29a6c..12ba121d3c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -290,4 +290,13 @@
function="Inventory.EnvironmentEnabled" />
</menu_item_call>
</menu>
-</menu> \ No newline at end of file
+ <menu_item_separator/>
+ <menu_item_call
+ label="Shop..."
+ layout="topleft"
+ name="Shop">
+ <menu_item_call.on_click
+ function="Inventory.GearDefault.Custom.Action"
+ parameter="shop" />
+ </menu_item_call>
+</menu>