diff options
author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
---|---|---|
committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/newview/llconversationmodel.cpp | |
parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) |
Merged lindenlab/viewer-development into default
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")); |