diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
| commit | a7549d6fe5b36b447f7e6f58387711576f9c2f63 (patch) | |
| tree | 63d81cf896b107cf35b3eecabefc032e021574df /indra/llcommon/llstring.cpp | |
| parent | 5bff5d28ee0cd6b2d17bf1676eecb0ae262f1f48 (diff) | |
| parent | f0426b924f543c62268ac5098c0c2c6a44e68084 (diff) | |
Merge
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 c027aa7bdd..3030ae2c8b 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"] = "%I"; // 02 + datetimeToCodes["hour12"] = "%l"; // 02 datetimeToCodes["min"] = "%M"; // 59 datetimeToCodes["ampm"] = "%p"; // AM datetimeToCodes["second"] = "%S"; // 59 |