diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
| commit | e6b7a7e2f6a5175dd6c3e1d8d8c8f8c0e737a030 (patch) | |
| tree | 1fc66c532666cdd061ec12e10b99bcb3be00d64e /indra/newview/llconversationmodel.cpp | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
| parent | 2d19d78846ccbd8993c468cc27b8db7f0b93b235 (diff) | |
merge changes for DRTVWR-303
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")); |