diff options
| author | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
| commit | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (patch) | |
| tree | dd967a4263907ad7de733622cff8f886da1ac7de /indra/newview/llgroupactions.cpp | |
| parent | aaaddfe08942ff15bbe0c6549dc82dda95ce3ba1 (diff) | |
| parent | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (diff) | |
merge
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; |