diff options
| author | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
| commit | 0671b6abc5acee0e7df879f9a10506aa42c2169c (patch) | |
| tree | baf736cc9a5f9de8fb1fa9f9bf95be0dacc7b72f /indra/newview/llgroupactions.cpp | |
| parent | 1dffa1c78cd623fe8c930e128312260647bf91e7 (diff) | |
| parent | 752b3fdbe044069635a2c6cd000c481561985954 (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; |