OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed default timeout when starting scripts after Load OAR

0.8.0.3
Oren Hurvitz 2014-03-28 13:04:19 +03:00
parent 1fe504fee5
commit 6557eba235
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
// Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so
// that users can enter the scene. If we allow the scripts to start in the loop above // that users can enter the scene. If we allow the scripts to start in the loop above
// then they significantly increase the time until the OAR finishes loading. // then they significantly increase the time until the OAR finishes loading.
Util.FireAndForget(delegate(object o) Util.RunThreadNoTimeout(delegate(object o)
{ {
Thread.Sleep(15000); Thread.Sleep(15000);
m_log.Info("[ARCHIVER]: Starting scripts in scene objects"); m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
sceneContext.SceneObjects.Clear(); sceneContext.SceneObjects.Clear();
} }
}); }, "ReadArchiveStartScripts", null);
m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");