From 47044de069c2c1442a33d719846cdbf1e3450124 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 4 Jun 2012 11:23:38 -0400 Subject: STORM-1838 Add "Request Teleport" option to the menu when right-clicking on avatars in the Nearby list --- indra/newview/llavataractions.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llavataractions.h') diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 748b7cb3d1..1eee9ea81f 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -108,6 +108,11 @@ public: */ static void pay(const LLUUID& id); + /** + * Request teleport from other avatar + */ + static void requestTeleport(const LLUUID& id); + /** * Share items with the avatar. */ -- cgit v1.2.3 From e386aa73b7af5ca326f66fa3fb0482e42b3af33f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 11 Jan 2013 11:13:44 -0500 Subject: STORM-1838 --- indra/newview/llavataractions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.h') diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 1eee9ea81f..f3df953e98 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -111,7 +111,7 @@ public: /** * Request teleport from other avatar */ - static void requestTeleport(const LLUUID& id); + static void teleportRequest(const LLUUID& id); /** * Share items with the avatar. -- cgit v1.2.3 From f64e11dfe1490c1a89e00cf5dc368dd1dc25b866 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 24 Jan 2013 14:27:10 -0500 Subject: STORM-1838 Add optional message processing --- indra/newview/llavataractions.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llavataractions.h') diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index f3df953e98..afd8060ee3 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -112,6 +112,7 @@ public: * Request teleport from other avatar */ static void teleportRequest(const LLUUID& id); + static void teleport_request_callback(const LLSD& notification, const LLSD& response); /** * Share items with the avatar. -- cgit v1.2.3