1. simon_linden
  2. viewer-rabbit

Commits

prep linden  committed 062f057

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

  • Participants
  • Parent commits 3c8d0ae
  • Branches default

Comments (0)

Files changed (5)

File indra/newview/CMakeLists.txt

View file
     llsidepanelinventorysubpanel.cpp
     llsidepaneliteminfo.cpp
     llsidepaneltaskinfo.cpp
-    llsidetray.cpp
+    llsidetray.cpp 
     llsidetraypanelcontainer.cpp
     llsky.cpp
     llslurl.cpp

File indra/newview/llfloaterworldmap.cpp

View file
 			return false;
 		}
 		
-		LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id  );
+		LLFloaterWorldMap::getInstance()->avatarTrackFromSlapp( id  ); 
 		LLFloaterReg::showInstance( "world_map", "center" );
 		
 		return true;

File indra/newview/llfloaterworldmap.h

View file
 	void			teleport();
 	void			onChangeMaturity();
 	
+	
 	//Slapp instigated avatar tracking
 	void			avatarTrackFromSlapp( const LLUUID& id );
 

File indra/newview/llshareavatarhandler.cpp

View file
 /** 
  * @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
  */
 
 #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) 
 	{ 

File indra/newview/llvoicecallhandler.cpp

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