diff options
| author | Oren Hurvitz | 2014-03-28 13:04:19 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2014-03-28 13:04:19 +0300 |
| commit | 6557eba235db997b0c6cd3d5817bc55824b7fcff (patch) | |
| tree | a8627c5c72a73d3b58f54c7992bfddb97129e17c | |
| parent | Better skipping of "SculptData" when parsing XML (diff) | |
| download | opensim-SC-6557eba235db997b0c6cd3d5817bc55824b7fcff.zip opensim-SC-6557eba235db997b0c6cd3d5817bc55824b7fcff.tar.gz opensim-SC-6557eba235db997b0c6cd3d5817bc55824b7fcff.tar.bz2 opensim-SC-6557eba235db997b0c6cd3d5817bc55824b7fcff.tar.xz | |
Removed default timeout when starting scripts after Load OAR
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 7920748..54715a8 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 357 | // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so | 357 | // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so |
| 358 | // that users can enter the scene. If we allow the scripts to start in the loop above | 358 | // that users can enter the scene. If we allow the scripts to start in the loop above |
| 359 | // then they significantly increase the time until the OAR finishes loading. | 359 | // then they significantly increase the time until the OAR finishes loading. |
| 360 | Util.FireAndForget(delegate(object o) | 360 | Util.RunThreadNoTimeout(delegate(object o) |
| 361 | { | 361 | { |
| 362 | Thread.Sleep(15000); | 362 | Thread.Sleep(15000); |
| 363 | m_log.Info("[ARCHIVER]: Starting scripts in scene objects"); | 363 | m_log.Info("[ARCHIVER]: Starting scripts in scene objects"); |
| @@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 372 | 372 | ||
| 373 | sceneContext.SceneObjects.Clear(); | 373 | sceneContext.SceneObjects.Clear(); |
| 374 | } | 374 | } |
| 375 | }); | 375 | }, "ReadArchiveStartScripts", null); |
| 376 | 376 | ||
| 377 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); | 377 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); |
| 378 | 378 | ||