diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 3030ae2c8b8df4c15a4a8c5b2d29355c8f052c5c..c027aa7bdd5959dab532f8cbe7bc983c3b6f83ce 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
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f196ebbf933e615d531a6cb7afa0f360f641f3ba..eb08707b61320f0396143c6e1c9c56c12d39f80f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -907,6 +907,7 @@ static LLFastTimer::DeclareTimer FTM_SLEEP("Sleep");
 static LLFastTimer::DeclareTimer FTM_TEXTURE_CACHE("Texture Cache");
 static LLFastTimer::DeclareTimer FTM_DECODE("Image Decode");
 static LLFastTimer::DeclareTimer FTM_VFS("VFS Thread");
+static LLFastTimer::DeclareTimer FTM_LFS("LFS Thread");
 static LLFastTimer::DeclareTimer FTM_PAUSE_THREADS("Pause Threads");
 static LLFastTimer::DeclareTimer FTM_IDLE("Idle");
 static LLFastTimer::DeclareTimer FTM_PUMP("Pump");
@@ -1123,6 +1124,10 @@ bool LLAppViewer::mainLoop()
 						LLFastTimer ftm(FTM_VFS);
 	 					io_pending += LLVFSThread::updateClass(1);
 					}
+					{
+						LLFastTimer ftm(FTM_LFS);
+	 					io_pending += LLLFSThread::updateClass(1);
+					}
 
 					if (io_pending > 1000)
 					{