summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicecallhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvoicecallhandler.cpp')
-rw-r--r--indra/newview/llvoicecallhandler.cpp66
1 files changed, 30 insertions, 36 deletions
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
index 95e11abd82..82a8d48f30 100644
--- a/indra/newview/llvoicecallhandler.cpp
+++ b/indra/newview/llvoicecallhandler.cpp
@@ -1,68 +1,62 @@
- /**
+ /**
* @file llvoicecallhandler.cpp
* @brief slapp to handle avatar to avatar voice call.
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
-#include "llcommandhandler.h"
+#include "llcommandhandler.h"
#include "llavataractions.h"
#include "llnotificationsutil.h"
#include "llui.h"
class LLVoiceCallAvatarHandler : public LLCommandHandler
{
-public:
- // requires trusted browser to trigger
- LLVoiceCallAvatarHandler() : LLCommandHandler("voicecallavatar", UNTRUSTED_THROTTLE)
- {
- }
-
- bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
- {
- if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableVoiceCall"))
- {
- LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
- return true;
- }
+public:
+ // requires trusted browser to trigger
+ LLVoiceCallAvatarHandler() : LLCommandHandler("voicecallavatar", UNTRUSTED_THROTTLE)
+ {
+ }
+
+ bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
+ {
+ //Make sure we have some parameters
+ if (params.size() == 0)
+ {
+ return false;
+ }
+
+ //Get the ID
+ LLUUID id;
+ if (!id.set( params[0], FALSE ))
+ {
+ return false;
+ }
- //Make sure we have some parameters
- if (params.size() == 0)
- {
- return false;
- }
-
- //Get the ID
- LLUUID id;
- if (!id.set( params[0], FALSE ))
- {
- return false;
- }
-
- //instigate call with this avatar
- LLAvatarActions::startCall( id );
- return true;
- }
+ //instigate call with this avatar
+ LLAvatarActions::startCall( id );
+ return true;
+ }
};
LLVoiceCallAvatarHandler gVoiceCallAvatarHandler;