diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
| commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
| tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/newview/llvoicecallhandler.cpp | |
| parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
| parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llvoicecallhandler.cpp')
| -rw-r--r-- | indra/newview/llvoicecallhandler.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 274bd75208..2050dab689 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" #include "llcommandhandler.h" #include "llavataractions.h" +#include "llnotificationsutil.h" +#include "llui.h" class LLVoiceCallAvatarHandler : public LLCommandHandler { @@ -38,6 +40,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableVoiceCall")) + { + LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { |