summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-24 13:22:43 -0400
committerOz Linden <oz@lindenlab.com>2011-03-24 13:22:43 -0400
commitfb1facf13a2f7413b42802bd7293d504eb4e4174 (patch)
tree9f0e5b980fa2d2e2d4bf97902610456fa279d6cd /indra/newview/llgroupactions.cpp
parenta4f2c570dd42066f0e2738a0fd2de6c61c35b47b (diff)
parent1c375a8c880354432da2b218c321ed708497e161 (diff)
syncing up to viewer-development
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r--indra/newview/llgroupactions.cpp6
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;