summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.h
diff options
context:
space:
mode:
authorsimon <none@none>2013-10-24 16:45:38 -0700
committersimon <none@none>2013-10-24 16:45:38 -0700
commit26de32910f99e2522b8e10cf41415b1af2586d5b (patch)
tree57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/newview/llavataractions.h
parent93b3f1297ea5377257d14c5214790607e0b1af96 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Pull in viewer-release with fbc / snowstorm
Diffstat (limited to 'indra/newview/llavataractions.h')
-rwxr-xr-xindra/newview/llavataractions.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 6e1198cd09..403414558e 100755
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -111,6 +111,12 @@ public:
static void pay(const LLUUID& id);
/**
+ * 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.
*/
static void share(const LLUUID& id);