summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-03-14 01:28:40 +0100
committerCho <cho@lindenlab.com>2013-03-14 01:28:40 +0100
commit8b388922434e431c49b9e7f2c9d1e8d90d15ed21 (patch)
treea8498490c757ea5760b1152fa667be9d9a4608c8 /indra/newview/llconversationmodel.cpp
parentd81226f1707a93b6be52264fc00cae9c60057cc5 (diff)
CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappeared
Added "Zoom In" context menu item to Nearby Chat list in People floater and Conversation floater
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp2
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"));