diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-30 14:31:56 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-30 14:31:56 +0200 |
| commit | d5152b3ea7acfefc56d648d1581fc541fd7d2ea6 (patch) | |
| tree | 96e3f97ada379588b1ce8bf39729eeff604017ea /indra/llcommon/llstring.cpp | |
| parent | 7ea44f8addc8fc7218e7030b11f62ea5a3f99511 (diff) | |
| parent | d4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -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 |