From 189599b6ff0c4e6b81e761fbc990c057189359f2 Mon Sep 17 00:00:00 2001
From: Robert Knop <prospero@lindenlab.com>
Date: Thu, 4 Dec 2008 22:36:34 +0000
Subject: Merging from server/server-1.25 back to trunk.

  svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
---
 indra/test/message_tut.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/test/message_tut.cpp')

diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
index d426511d24..0cafdcd679 100644
--- a/indra/test/message_tut.cpp
+++ b/indra/test/message_tut.cpp
@@ -70,6 +70,9 @@ namespace tut
 				//init_prehash_data();
 				init = true;
 			}
+			const F32 circuit_heartbeat_interval=5;
+			const F32 circuit_timeout=100;
+
 
 			// currently test disconnected message system
 			start_messaging_system("notafile", 13035,
@@ -79,7 +82,10 @@ namespace tut
 								   FALSE,        
 								   "notasharedsecret",
 								   NULL,
-								   false);
+								   false,
+								   circuit_heartbeat_interval,
+								   circuit_timeout
+								   );
 			// generate temp dir
 			std::ostringstream ostr;
 #if LL_WINDOWS
-- 
cgit v1.2.3