diff options
author | simon <none@none> | 2013-03-22 14:17:26 -0700 |
---|---|---|
committer | simon <none@none> | 2013-03-22 14:17:26 -0700 |
commit | 1d8e3997c8ced25524f146aeb6cc683e5767a5f7 (patch) | |
tree | 888cc32ac788bcb10dc5df4f0e0124514f4474ef /indra/newview/llconversationmodel.cpp | |
parent | 395f8baf03622f3a36b03b8e31679e3b594b1757 (diff) | |
parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) |
Pull and merge latest viewer-beta
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r-- | indra/newview/llconversationmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 009fce0a92..c74ce24872 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -139,6 +139,8 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32 items.push_back(std::string("remove_friend")); items.push_back(std::string("invite_to_group")); items.push_back(std::string("separator_invite_to_group")); + if (static_cast<LLConversationItem*>(mParent)->getType() == CONV_SESSION_NEARBY) + items.push_back(std::string("zoom_in")); items.push_back(std::string("map")); items.push_back(std::string("share")); items.push_back(std::string("pay")); |