diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-30 11:48:47 +0200 | 
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-30 11:48:47 +0200 | 
| commit | 53583548693a03385bab14029b9d0e2a7606d2e9 (patch) | |
| tree | 3774bddd258d1a279c15d313a76c70c0ba3f581f | |
| parent | a334ae22e473b0f902a596af9aa532c060ea212b (diff) | |
Fixed Line endings to Unix format
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llchathistory.cpp | 28 | 
1 files changed, 14 insertions, 14 deletions
| diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c4c046b3c4..078c2518c6 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -267,20 +267,20 @@ 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;
 -	}
 +	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)  	{ | 
