diff options
| author | Don Kjer <don@lindenlab.com> | 2013-10-29 13:20:18 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-10-29 13:20:18 +0000 |
| commit | 7866356d7719413b952787a509ebd3c4ce8d39b1 (patch) | |
| tree | a200c96afd5ab8ad6da64c14ec6211aac9d5c65f /indra/newview/llconversationloglist.cpp | |
| parent | 81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge viewer-release => sunshine-internal
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rwxr-xr-x | indra/newview/llconversationloglist.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index 5ab108b39f..44212298cf 100755 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -313,6 +313,10 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) { LLAvatarActions::offerTeleport(selected_conversation_participant_id); } + else if ("request_teleport" == command_name) + { + LLAvatarActions::teleportRequest(selected_conversation_participant_id); + } else if("add_friend" == command_name) { if (!LLAvatarActions::isFriend(selected_conversation_participant_id)) |