From 10c5f2f080b47561db2b1f9a2f063ad8dcc175b9 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 19 Feb 2010 13:36:47 +0200
Subject: Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd
 timestamp for messages (nearby chat/im) received today)

--HG--
branch : product-engine
---
 indra/newview/llimfloater.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 847695577a..9c0e7a158d 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -633,12 +633,14 @@ void LLIMFloater::updateMessages()
 			LLUUID from_id = msg["from_id"].asUUID();
 			std::string from = msg["from"].asString();
 			std::string message = msg["message"].asString();
+			bool is_history = msg["is_history"].asBoolean();
 
 			LLChat chat;
 			chat.mFromID = from_id;
 			chat.mSessionID = mSessionID;
 			chat.mFromName = from;
 			chat.mTimeStr = time;
+			chat.mChatStyle = is_history ? CHAT_STYLE_HISTORY : chat.mChatStyle;
 
 			// process offer notification
 			if (msg.has("notification_id"))
-- 
cgit v1.3