summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-10-15 17:47:37 -0400
committerOz Linden <oz@lindenlab.com>2013-10-15 17:47:37 -0400
commit9c313aea13c70db145d3f2ba840fdc34ed8c8adf (patch)
tree72b76053aac0fedf411145b0427b2239971034b1 /indra/newview/llconversationmodel.cpp
parent1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff)
parent8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff)
merge changes for DRTVWR-336
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rwxr-xr-xindra/newview/llconversationmodel.cpp1
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"));