aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-06 09:38:14 +0000
committerTeravus Ovares2008-02-06 09:38:14 +0000
commit9d6ea497e27bb2c93211fe2899e609ea9ea18623 (patch)
tree930777aa2d9cf39c8ba54dc81d89771c21b969d4 /OpenSim/Region/Communications
parentCleaned up some unreachable code warnings. (diff)
downloadopensim-SC_OLD-9d6ea497e27bb2c93211fe2899e609ea9ea18623.zip
opensim-SC_OLD-9d6ea497e27bb2c93211fe2899e609ea9ea18623.tar.gz
opensim-SC_OLD-9d6ea497e27bb2c93211fe2899e609ea9ea18623.tar.bz2
opensim-SC_OLD-9d6ea497e27bb2c93211fe2899e609ea9ea18623.tar.xz
* Added the ability to start and stop all scripts in the simulator using the debug tab on the estate tools. This along with the disable physics via the debug tab are persistant across reboots. That means that if it's disabled when you shut down the simulator, the simulator will come up again when you start it up without loading the scripts. Turning them back on is as simple as unchecking 'disable scripts' in the debug tab of the estate tools.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 24d9010..fb84466 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Communications.OGS1
137 try 137 try
138 { 138 {
139 GridReq = new XmlRpcRequest("simulator_login", SendParams); 139 GridReq = new XmlRpcRequest("simulator_login", SendParams);
140 GridResp = GridReq.Send(serversInfo.GridURL, 10000); 140 GridResp = GridReq.Send(serversInfo.GridURL, 16000);
141 } catch (Exception ex) 141 } catch (Exception ex)
142 { 142 {
143 m_log.Error("Unable to connect to grid. Grid server not running?"); 143 m_log.Error("Unable to connect to grid. Grid server not running?");