From 58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 16 Jan 2015 23:57:51 +0000
Subject: [PATCH] Add clearqueue code adjustment that should have been in
 previous commit faaf47a

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1a64595a2b..83751cf216 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1440,10 +1440,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_Scripts.Remove(itemID);
             }
 
-
-            instance.ClearQueue();
-
-            instance.Stop(m_WaitForEventCompletionOnScriptStop);
+            instance.Stop(m_WaitForEventCompletionOnScriptStop, true);
 
 //                bool objectRemoved = false;