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

1 files changed, 1 insertions, 36 deletions

diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index d5ebcfab4c..7c86d38310 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -72,8 +72,6 @@
 #include "llweb.h"
 #include "llslider.h"
 #include "message.h"
-#include "llviewerobjectlist.h"
-#include "llvoicechannel.h"
 #include "llwindow.h"			// copyTextToClipboard()
 
 //---------------------------------------------------------------------------
@@ -133,7 +131,6 @@ public:
 };
 LLWorldMapHandler gWorldMapHandler;
 
-//prep#
 // SocialMap handler secondlife:///app/maptrackavatar/id
 class LLMapTrackAvatarHandler : public LLCommandHandler
 {
@@ -168,38 +165,6 @@ LLMapTrackAvatarHandler gMapTrackAvatar;
 
 LLFloaterWorldMap* gFloaterWorldMap = NULL;
 
-//prep# call
-class LLSocialCallHandler : public LLCommandHandler
-{
-public:
-	// requires trusted browser to trigger
-	LLSocialCallHandler() : LLCommandHandler("socialcallhandler", UNTRUSTED_THROTTLE) 
-	{ 
-	}
-	
-	bool handle(const LLSD& params, const LLSD& query_map, 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;
-		}
-		
-		//instigate call with this avatar
-		LLVoiceClient::getInstance()->callUser( id );
-		
-		return true;
-	}
-};
-LLSocialCallHandler gSocialCallHandler;
-
 class LLMapInventoryObserver : public LLInventoryObserver
 {
 public:
@@ -1188,7 +1153,7 @@ void LLFloaterWorldMap::onAvatarComboCommit()
 		mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
 	}
 }
-//prep#
+
 void LLFloaterWorldMap::avatarTrackFromSlapp( const LLUUID& id )
 {
 	trackAvatar( id, "av" );