From 521f7558d4fbdb3e3c7327a984c984d892f8f056 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 24 Jul 2010 13:50:05 -0700
Subject: Changed the connecting to region timer to 45 seconds and made it a
 debug setting: ConnectingToRegionTimeout

---
 linden/indra/newview/app_settings/settings.xml | 15 +++++++++++++--
 linden/indra/newview/llstartup.cpp             |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0225218..fa2a400 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -59,6 +59,17 @@
     <key>Value</key>
     <real>20</real>
   </map>
+  <key>ConnectingToRegionTimeout</key>
+  <map>
+    <key>Comment</key>
+    <string>Time (in seconds) until the viewer times out while connecting to region at login</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>45.0</real>
+  </map>
   <key>CmdLineCacheLocation</key>
   <map>
     <key>Comment</key>
@@ -548,7 +559,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://webi.metaverseink.com/opensim/results.jsp?</string>
+    <string>http://gridops.3dhosting.de/websearch/index.php?</string>
   </map>
   <key>SearchURLQuery</key>
   <map>
@@ -574,7 +585,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://webi.metaverseink.com/opensim/results.jsp?query=[QUERY]&amp;vw=os</string>
+    <string>http://gridops.3dhosting.de/websearch/index.php?q=[QUERY]</string>
   </map>
   <key>SearchURLSuffix2</key>
   <map>
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 3161980..cec2c4b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -328,6 +328,7 @@ bool idle_startup()
 	LLMemType mt1(LLMemType::MTYPE_STARTUP);
 	
 	const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
+	const F32 CONNECTING_REGION_TIMEOUT_SECONDS = gSavedSettings.getF32("ConnectingToRegionTimeout");
 	const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
 	const S32 MAX_TIMEOUT_COUNT = 3;
 	static LLTimer timeout;
@@ -2105,7 +2106,7 @@ bool idle_startup()
 
 		// Drop out if we can't connect -- MC
 		connecting_region_timer.start();
-		connecting_region_timer.setTimerExpirySec(10.0f);
+		connecting_region_timer.setTimerExpirySec(CONNECTING_REGION_TIMEOUT_SECONDS);
 		LLStartUp::setStartupState( STATE_AGENT_WAIT );		// Go to STATE_AGENT_WAIT
 
 		timeout.reset();
-- 
cgit v1.1