diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
| commit | 4386bb173b17ca499e0c63809b8c7227da3f0e1c (patch) | |
| tree | 7893d4c6d3eccfaf0839d48618b32de5628cd218 /indra/newview/llvoicecallhandler.cpp | |
| parent | eef9b265b951337d0633d18186dad2b734b30d5a (diff) | |
| parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) | |
merge changes for storm-1018
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) { |