From c5cfae7bac9273d32c78409fe5080a202043b277 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 2 Jun 2010 17:39:58 +0100
Subject: Revert "After aborting a thread, wait for it to actually finish.
 EXPERIMENTAL for OSG"

This reverts commit 241ed5734ee3c5b1417484dfa22af6cf6ae60b82.
---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f5b187f..d30d2dc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -536,7 +536,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             if (!m_InSelfDelete)
                 result.Abort();
 
-            result.Wait(TimeSpan.FromSeconds(10));
             lock (m_EventQueue)
             {
                 m_CurrentResult = null;
-- 
cgit v1.1