diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
commit | 8188a8c410807debd2d7d40d0299c36b92e56ca3 (patch) | |
tree | 68a586a4f32bfd1f395c4942701813e002047622 /indra/newview/llconversationmodel.cpp | |
parent | 2dbf6569a77c37d7c7ecc684dd417ddbbb7c6bab (diff) | |
parent | 6ed4c84a30e8f4044ccaedba114e13e07ae5c46d (diff) |
merge
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rwxr-xr-x | indra/newview/llconversationmodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 192a594c9d..affa24f78c 100755 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -132,6 +132,7 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32 items.push_back(std::string("view_profile")); items.push_back(std::string("im")); items.push_back(std::string("offer_teleport")); + items.push_back(std::string("request_teleport")); items.push_back(std::string("voice_call")); items.push_back(std::string("chat_history")); items.push_back(std::string("separator_chat_history")); |