diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 11:58:27 +0200 | 
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 11:58:27 +0200 | 
| commit | 4bf428c4ee17d30f16bec26404fa70db22f3b059 (patch) | |
| tree | 261f30ecfe8dd541648676ff98566b27a72f1e99 /indra/newview | |
| parent | 09d6eeceb8367879c0ce158e20eae9732909596c (diff) | |
fix major EXT-3003 IM messages loaded from a chat history are displayed with current time
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 19 | 
1 files changed, 1 insertions, 18 deletions
| 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(); | 
