diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
| commit | ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a (patch) | |
| tree | 110869149fbc439487bb7ae0c49c24b938570b09 /indra/newview/llconversationloglist.cpp | |
| parent | 125f3f071a30f4c47feb664b21f3e380ee4e7e49 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Pull merge from lindenlab/viewer-release
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)) |