merge -r62831:64079 branches/maintenance to release

2 files changed, 3 insertions, 3 deletions

diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp
index 9350645d2a..30165cb769 100644
--- a/indra/test/llhttpnode_tut.cpp
+++ b/indra/test/llhttpnode_tut.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file lliohttpserver_tut.cpp
+ * @file lliohttpnode_tut.cpp
  * @date   May 2006
  * @brief HTTP server unit tests
  *
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
index c9a62e5230..f7eede73a3 100644
--- a/indra/test/llmessageconfig_tut.cpp
+++ b/indra/test/llmessageconfig_tut.cpp
@@ -19,7 +19,7 @@ namespace tut
 {
 	///var/tmp/babbage/dev/message-liberation/etc
 	static const char file_name[] = "/tmp/message.xml";
-	static const F32 refreshRate = 6.0*1000.0; // milliseconds
+	static const long refreshRateMillis = 6000;
 	
 	struct LLMessageConfigTestData {
 
@@ -45,7 +45,7 @@ namespace tut
 				LLSDSerialize::toPrettyXML(config, file);
 			}
 			file.close();
-			ms_sleep(refreshRate);
+			ms_sleep(refreshRateMillis);
 			LLFrameTimer::updateFrameTime();
 		}
 	};