summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-03 15:41:36 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-03 15:41:36 -0500
commit1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch)
treead40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/llcommon
parent202d86b15567a783bed55849a7cdc8ad8d8f874f (diff)
parenta9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff)
automated merge for avp->avp
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llstring.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index c027aa7bdd..5f3d9d6582 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -985,6 +985,15 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token,
return true;
}
replacement = datetime.toHTTPDateString(code);
+
+ // *HACK: delete leading zero from hour string in case 'hour12' (code = %I) time format
+ // to show time without leading zero, e.g. 08:16 -> 8:16 (EXT-2738).
+ // We could have used '%l' format instead, but it's not supported by Windows.
+ if(code == "%I" && token == "hour12" && replacement.at(0) == '0')
+ {
+ replacement = replacement.at(1);
+ }
+
return !code.empty();
}