diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
| commit | 0656620e2d6b4b9ca1fabf4f045df77256f31a60 (patch) | |
| tree | 0480f0c03bb4fbf3fd526aaa061715ab20ac4f22 /indra/newview/llviewerinventory.cpp | |
| parent | b15dca22637b0b2c1947b758a93f51163fb48cf1 (diff) | |
| parent | 8c4555d54fc7c8686ffd139425f4c346576cac50 (diff) | |
merge changes for storm-1187
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 42750f8b3f..9e58acdcd3 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") { |