diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-01 20:29:26 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-01 20:29:26 +0200 |
| commit | 57fca8d6e8c3c925fc3a3fff8833c4e43db8f24c (patch) | |
| tree | b5ac1efe546cedbf337d98a3d2ffbbb5b23e36d1 /indra/llcommon | |
| parent | 56504054d8e0cba815c25035ed7dd71015cf3222 (diff) | |
| parent | 3385ce87f14f71d739a3834fbf3436a962fbdd9d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 3030ae2c8b..c027aa7bdd 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -717,7 +717,7 @@ void LLStringOps::setupDatetimeInfo (bool daylight) datetimeToCodes["day"] = "%d"; // 31 datetimeToCodes["hour24"] = "%H"; // 14 datetimeToCodes["hour"] = "%H"; // 14 - datetimeToCodes["hour12"] = "%l"; // 02 + datetimeToCodes["hour12"] = "%I"; // 02 datetimeToCodes["min"] = "%M"; // 59 datetimeToCodes["ampm"] = "%p"; // AM datetimeToCodes["second"] = "%S"; // 59 |