From b4f174f9188e18ab66e0246ebd0bcf68fba9f067 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 19 Aug 2009 18:13:37 +0000
Subject: EXT-591   	 Create an Object (Build tool) will crash viewer
 EXT-599   	 Time of the sent messages is '00-00' in the Group chat
 EXT-598   	 Acquired/created date for all landmarks is 01/01/1970

---
 indra/llcommon/llstring.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 65e005abfb..f6bb0e0fe2 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -736,8 +736,9 @@ S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const LLSD& substitutio
 		{
 			std::basic_string<T> param;
 			if (tokens.size() > 2) param = tokens[2];
-
-			found_replacement = formatDatetime (replacement, tokens[0], param, substitutions);
+			
+			S32 secFromEpoch = (S32) substitutions["datetime"].asInteger();
+			found_replacement = formatDatetime (replacement, tokens[0], param, secFromEpoch);
 		}
 
 		if (found_replacement)
-- 
cgit v1.2.3