From b8949024bc55c62b9268b35d4f2a568760b9d7d3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 16 Jan 2013 01:45:09 +0000
Subject: Revert "Implement co-operative script termination if termination
 comes during a script wait event (llSleep(), etc.)"

Doing this as a favour to Melanie.  This will be back with passing the wait handles directly to the api.

This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 26 +++-------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 92bf85a..5c8b097 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1738,21 +1738,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>The part where the script was rezzed if successful.  False otherwise.</returns>
         public SceneObjectPart RezNewScript(UUID agentID, InventoryItemBase itemBase)
         {
-            return RezNewScript(
-                agentID,
-                itemBase,
-                "default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n}");
-        }
-
-        /// <summary>
-        /// Rez a new script from nothing with given script text.
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="itemBase">Template item.</param>
-        /// <param name="scriptText"></param>
-        /// <returns>The part where the script was rezzed if successful.  False otherwise.</returns>
-        public SceneObjectPart RezNewScript(UUID agentID, InventoryItemBase itemBase, string scriptText)
-        {
             // The part ID is the folder ID!
             SceneObjectPart part = GetSceneObjectPart(itemBase.Folder);
             if (part == null)
@@ -1772,14 +1757,9 @@ namespace OpenSim.Region.Framework.Scenes
                 return null;
             }
 
-            AssetBase asset 
-                = CreateAsset(
-                    itemBase.Name, 
-                    itemBase.Description, 
-                    (sbyte)itemBase.AssetType,
-                    Encoding.ASCII.GetBytes(scriptText), 
-                    agentID);
-
+            AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
+                Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n}"),
+                agentID);
             AssetService.Store(asset);
 
             TaskInventoryItem taskItem = new TaskInventoryItem();
-- 
cgit v1.1