summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2010-10-21 16:08:13 -0400
committerprep linden <prep@lindenlab.com>2010-10-21 16:08:13 -0400
commitabd52cd3f480177a06c5e98732ded4136fcffc46 (patch)
tree5c407a1f94cbe7870e5f5e95a16f46d50424aaa0 /indra
parent03fd5c02f73467d50a10b62e982ce1dee961d315 (diff)
Added support for map tracking slapp, share slapp and a voice call slapp.
slapp urls: secondlife:///app/maptrackavatar/lluid secondlife:///app/sharewithavatar/lluid secondlife:///app/voicecallavatar/lluid
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/llfloaterworldmap.cpp2
-rw-r--r--indra/newview/llfloaterworldmap.h1
-rw-r--r--indra/newview/llshareavatarhandler.cpp5
-rw-r--r--indra/newview/llvoicecallhandler.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 26ba35e093..69bc82eb65 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -405,7 +405,7 @@ set(viewer_SOURCE_FILES
llsidepanelinventorysubpanel.cpp
llsidepaneliteminfo.cpp
llsidepaneltaskinfo.cpp
- llsidetray.cpp
+ llsidetray.cpp
llsidetraypanelcontainer.cpp
llsky.cpp
llslurl.cpp
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 7c86d38310..0c99cc1c8e 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -155,7 +155,7 @@ public:
return false;
}
- LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id );
+ LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id );
LLFloaterReg::showInstance( "world_map", "center" );
return true;
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index bbed19fc1c..5e4768d92b 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -108,6 +108,7 @@ public:
void teleport();
void onChangeMaturity();
+
//Slapp instigated avatar tracking
void avatarTrackFromSlapp( const LLUUID& id );
diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp
index 568c77d4b2..517990c06f 100644
--- a/indra/newview/llshareavatarhandler.cpp
+++ b/indra/newview/llshareavatarhandler.cpp
@@ -1,6 +1,6 @@
/**
* @file llshareavatarhandler.cpp
- * @brief slapp to handle avatar to avatar voice call.
+ * @brief slapp to handle sharing with an avatar
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
@@ -25,12 +25,11 @@
*/
#include "llviewerprecompiledheaders.h"
-#include "llcommandhandler.h"
#include "llavataractions.h"
class LLShareWithAvatarHandler : public LLCommandHandler
{
-public:
+public:
// requires trusted browser to trigger
LLShareWithAvatarHandler() : LLCommandHandler("sharewithavatar", UNTRUSTED_THROTTLE)
{
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
index 724d48b717..fe50a05f1c 100644
--- a/indra/newview/llvoicecallhandler.cpp
+++ b/indra/newview/llvoicecallhandler.cpp
@@ -30,7 +30,7 @@
class LLVoiceCallAvatarHandler : public LLCommandHandler
{
-public:
+public:
// requires trusted browser to trigger
LLVoiceCallAvatarHandler() : LLCommandHandler("voicecallavatar", UNTRUSTED_THROTTLE)
{