From 6557eba235db997b0c6cd3d5817bc55824b7fcff Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Fri, 28 Mar 2014 13:04:19 +0300
Subject: Removed default timeout when starting scripts after Load OAR

---
 OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Archiver')

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
             // 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
             // then they significantly increase the time until the OAR finishes loading.
-            Util.FireAndForget(delegate(object o)
+            Util.RunThreadNoTimeout(delegate(object o)
             {
                 Thread.Sleep(15000);
                 m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                     sceneContext.SceneObjects.Clear();
                 }
-            });
+            }, "ReadArchiveStartScripts", null);
 
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
 
-- 
cgit v1.1