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
master
prep linden 2010-10-21 16:08:13 -04:00
parent 03fd5c02f7
commit abd52cd3f4
5 changed files with 6 additions and 6 deletions

View File

@ -405,7 +405,7 @@ set(viewer_SOURCE_FILES
llsidepanelinventorysubpanel.cpp
llsidepaneliteminfo.cpp
llsidepaneltaskinfo.cpp
llsidetray.cpp
llsidetray.cpp
llsidetraypanelcontainer.cpp
llsky.cpp
llslurl.cpp

View File

@ -155,7 +155,7 @@ public:
return false;
}
LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id );
LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id );
LLFloaterReg::showInstance( "world_map", "center" );
return true;

View File

@ -108,6 +108,7 @@ public:
void teleport();
void onChangeMaturity();
//Slapp instigated avatar tracking
void avatarTrackFromSlapp( const LLUUID& id );

View File

@ -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)
{

View File

@ -30,7 +30,7 @@
class LLVoiceCallAvatarHandler : public LLCommandHandler
{
public:
public:
// requires trusted browser to trigger
LLVoiceCallAvatarHandler() : LLCommandHandler("voicecallavatar", UNTRUSTED_THROTTLE)
{