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/llconversationloglist.cpp | |
| parent | de3d3cf8aac904e0afda356d14af61b44cdb5fb7 (diff) | |
| parent | 8a761f92275a853fce28cf19ea628acdce840779 (diff) | |
merge changes for storm-1838
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)) |