diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
| commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
| tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/newview/llgroupactions.cpp | |
| parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
| parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) | |
merge changes for storm-1064
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 5393678a6b..7c56e610ce 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -53,6 +53,12 @@ public: bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo")) + { + LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + if (tokens.size() < 1) { return false; |