diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 13:46:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 13:46:19 +0000 |
| commit | 555100899a2141cdeba6248fa766f895310f82fc (patch) | |
| tree | a5dd9ac537114d01b4119bde503f6dd745f8ecc1 /indra/newview/lllogchat.cpp | |
| parent | 140b9520d40e311a8990007bd60b48c6109d47c6 (diff) | |
| parent | d4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff) | |
merge from trunk.
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 941ccc227c..9caa863bd8 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -77,12 +77,12 @@ std::string LLLogChat::timestamp(bool withdate) +LLTrans::getString ("TimeMonth")+"]/[" +LLTrans::getString ("TimeDay")+"] [" +LLTrans::getString ("TimeHour")+"]:[" - +LLTrans::getString ("TimeMin")+"] "; + +LLTrans::getString ("TimeMin")+"]"; } else { timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" - + LLTrans::getString ("TimeMin")+"] "; + + LLTrans::getString ("TimeMin")+"]"; } LLStringUtil::format (timeStr, substitution); |