diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-04-19 11:16:37 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-04-19 11:16:37 -0700 |
| commit | fbf886b7cc379bb4b9e409923b658af0b5c8fdef (patch) | |
| tree | 9e9220e8f28b1324453b1ff3fa19ec8fd6d1f918 /indra/newview/llviewerinventory.cpp | |
| parent | 64d20b8b745c184464c2a2f0795aeff0124ea3c5 (diff) | |
| parent | 99acd15974e34af82bec891a5d67b2d891ab82ea (diff) | |
Merge
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 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") { |