From 25c222e31770cb2c10e262b02ae9065521986349 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 23 Apr 2013 15:09:41 +0300
Subject: CHUI-943 FIXED "Chat history" menu item is added to context menu for
 Nearby chat.

---
 indra/newview/llconversationmodel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llconversationmodel.cpp')

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);
 }
-- 
cgit v1.2.3