diff options
| author | Jonathan Yap <none@none> | 2013-06-06 16:34:24 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-06-06 16:34:24 -0400 |
| commit | 9b1840c1c95a1a4adad913e0c162048fb78c537d (patch) | |
| tree | 8c0af0ffcbf442fd34c835ce5379088d9c0f8219 /indra/newview/llconversationloglist.cpp | |
| parent | ec52db8d0c4099dd5e3b476f7b44a4ebda7cb676 (diff) | |
STORM-1838 Added teleport request to conversation log. Added xml to have message appear in IM window, if open. Code cleanup.
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index cf9c9b3415..44212298cf 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -311,9 +311,12 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata) } else if ("offer_teleport" == command_name) { -llwarns << "DBG " << llendl; 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)) |