summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-11-30 09:11:04 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-11-30 09:11:04 -0800
commite2699c64a20262f6fbe6c1432294e8428e8cda5d (patch)
tree5b14a249342021b220df723a91c3e78d2c91f06e /indra/newview/lllogchat.cpp
parent6824800fa0001cd4a23a4f98b099af34435b0e06 (diff)
parentd4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff)
merge viewer-2-0 into media
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r--indra/newview/lllogchat.cpp4
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);