summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-04-18 14:22:23 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-04-18 14:22:23 -0700
commit2411a107e717816629817a9f2fe85d3c7cb254ab (patch)
tree29a1f573db9646386642a6c589fa9600105568c1 /indra/newview/llviewerinventory.cpp
parentbe8e3640226333d22304887b9c2682d30f5d945c (diff)
EXP-628 Inventory floater may be opened by SLApp
EXP-630 My appearance floater may be opened by SLApp EXP-633 Search floater can be opened by SLApps
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 519514d99c..68011ebf07 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -183,6 +183,12 @@ public:
return false;
}
+ if (!LLUI::sSettingGroups["config"]->getBOOL("EnableInventory"))
+ {
+ LLNotificationsUtil::add("NoInventory", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
+ return true;
+ }
+
// support secondlife:///app/inventory/show
if (params[0].asString() == "show")
{