diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
| commit | 31edad0a226a14b5b87fe364c629f8450bda567c (patch) | |
| tree | e03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/newview/llgroupactions.cpp | |
| parent | b6e6ba224620e0b122062c88f40295c10ce8db2d (diff) | |
| parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) | |
merge changes for storm-357
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; |