From 4bf428c4ee17d30f16bec26404fa70db22f3b059 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Wed, 2 Dec 2009 11:58:27 +0200
Subject: fix major EXT-3003 IM messages loaded from a chat history are
displayed with current time
--HG--
branch : product-engine
---
indra/newview/llchathistory.cpp | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 078c2518c6..c7d72ec01a 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -267,30 +267,13 @@ protected:
}
private:
- std::string appendTime(const LLChat& chat)
- {
- time_t utc_time;
- utc_time = time_corrected();
- std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
- +LLTrans::getString("TimeMin")+"] ";
-
- LLSD substitution;
-
- substitution["datetime"] = (S32) utc_time;
- LLStringUtil::format (timeStr, substitution);
-
- return timeStr;
- }
-
void setTimeField(const LLChat& chat)
{
LLTextBox* time_box = getChild<LLTextBox>("time_box");
LLRect rect_before = time_box->getRect();
- std::string time_value = appendTime(chat);
-
- time_box->setValue(time_value);
+ time_box->setValue(chat.mTimeStr);
// set necessary textbox width to fit all text
time_box->reshapeToFitText();
--
cgit v1.2.3