diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
| commit | 3e3fda589b11d53fceb9bbeed9f0333d88c3816f (patch) | |
| tree | 43bfd5e88ede272242db36d9000fcdac84541725 /indra/newview/llavataractions.h | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 70722454f6650438c9b659ff08b4d7bc6dfc2e7e (diff) | |
merge up to 3.4.4-release
Diffstat (limited to 'indra/newview/llavataractions.h')
| -rw-r--r-- | indra/newview/llavataractions.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 748b7cb3d1..f3df953e98 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -109,6 +109,11 @@ public: static void pay(const LLUUID& id); /** + * Request teleport from other avatar + */ + static void teleportRequest(const LLUUID& id); + + /** * Share items with the avatar. */ static void share(const LLUUID& id); |