aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-05 13:48:43 +0000
committerJustin Clarke Casey2009-06-05 13:48:43 +0000
commitbfea07750835ab7b14f56e94bff869505a88ebb4 (patch)
treeda8dd21507a1e322d100ec05dd1803df9c6da0d3 /OpenSim/Region/Application
parentThank you, thomax, for a patch to provide finer-grained access control to (diff)
downloadopensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.zip
opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.gz
opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.bz2
opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.xz
* Add oar saving timeout
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds * Timeout executes abort, since missing assets in an OAR seems bad * This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service * This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8f3f3e8..a1d4b31 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -193,7 +193,6 @@ namespace OpenSim
193 CreatePIDFile(pidFile); 193 CreatePIDFile(pidFile);
194 194
195 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty); 195 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
196
197 } 196 }
198 197
199 base.StartupSpecific(); 198 base.StartupSpecific();