From 60b38ea845d208c87c8dacfffba06e5250791e99 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 5 Apr 2010 12:15:48 +0200
Subject: fix: handle bad ping more relaxed.

---
 linden/indra/newview/llstartup.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 3698ecb..e7271b8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -491,7 +491,10 @@ bool idle_startup()
 
 			// TODO parameterize 
 			const F32 circuit_heartbeat_interval = 5;
-			const F32 circuit_timeout = 100;
+			const F32 circuit_timeout = 180; //seconds until llcircuit decides
+							 //it isn't alive.
+							 //Since we are on OpenSim we need to
+							 //relax about 'bad' ping. Was for SL: 100;
 
 			const LLUseCircuitCodeResponder* responder = NULL;
 			bool failure_is_fatal = true;
-- 
cgit v1.1