summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
commitd3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch)
treef1265d15e702f1dd449476fd5e7b956ccd7f33f8 /indra/newview/llgroupactions.cpp
parent7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff)
parentcb47ae3264f3d9d22add17f2cbc5699c8620705f (diff)
merge changes for storm-1035
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;