summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-04-23 15:09:41 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-04-23 15:09:41 +0300
commit25c222e31770cb2c10e262b02ae9065521986349 (patch)
tree6df3430aaf0ef624dbe1c812214fc417d0ac84c6 /indra/newview/llconversationmodel.cpp
parent6ad4822a05fa2d0cb0a9ab616384b374dc877883 (diff)
CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby chat.
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index c74ce24872..6e95df8383 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -386,6 +386,10 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags)
addVoiceOptions(items);
items.push_back(std::string("chat_history"));
}
+ else if(this->getType() == CONV_SESSION_NEARBY)
+ {
+ items.push_back(std::string("chat_history"));
+ }
hide_context_entries(menu, items, disabled_items);
}