diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
| commit | 91f7d0d1540ae448b45d8eceacff8aad2b88462a (patch) | |
| tree | 2f7b7505be398189252a7d2148869c81268ebc6d /indra/newview/llavataractions.h | |
| parent | de3d3cf8aac904e0afda356d14af61b44cdb5fb7 (diff) | |
| parent | 8a761f92275a853fce28cf19ea628acdce840779 (diff) | |
merge changes for storm-1838
Diffstat (limited to 'indra/newview/llavataractions.h')
| -rwxr-xr-x | indra/newview/llavataractions.h | 6 |
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); |