aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorArmin Weatherwax2010-04-05 12:15:48 +0200
committerArmin Weatherwax2010-04-12 17:11:06 +0200
commit60b38ea845d208c87c8dacfffba06e5250791e99 (patch)
treeff1fe13af59b45475ace8b514026b2bf4a73f462 /linden/indra
parentfix: don't llerr-crash on some bad textures. (diff)
downloadmeta-impy-60b38ea845d208c87c8dacfffba06e5250791e99.zip
meta-impy-60b38ea845d208c87c8dacfffba06e5250791e99.tar.gz
meta-impy-60b38ea845d208c87c8dacfffba06e5250791e99.tar.bz2
meta-impy-60b38ea845d208c87c8dacfffba06e5250791e99.tar.xz
fix: handle bad ping more relaxed.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llstartup.cpp5
1 files changed, 4 insertions, 1 deletions
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()
491 491
492 // TODO parameterize 492 // TODO parameterize
493 const F32 circuit_heartbeat_interval = 5; 493 const F32 circuit_heartbeat_interval = 5;
494 const F32 circuit_timeout = 100; 494 const F32 circuit_timeout = 180; //seconds until llcircuit decides
495 //it isn't alive.
496 //Since we are on OpenSim we need to
497 //relax about 'bad' ping. Was for SL: 100;
495 498
496 const LLUseCircuitCodeResponder* responder = NULL; 499 const LLUseCircuitCodeResponder* responder = NULL;
497 bool failure_is_fatal = true; 500 bool failure_is_fatal = true;