diff options
| author | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
| commit | f3457461617119bda93f506977170cb8f15a270d (patch) | |
| tree | d4b9e45586725447ef939b6876c7d19d7ff9f573 /indra/newview/llconversationmodel.cpp | |
| parent | 33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (diff) | |
| parent | f2948cb1eb8866716a84868cccbfafcd742c0771 (diff) | |
Folded in changes from sunshine-stable
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")); |