Convergence is almost complete. This brings the diff between the API to < 10k

and makes it use a common set of types in both engine. Fixes the issues with
running both engines and HTTP requests / listens / timers etc..
Also fixes a couple of minor Scene issues and a CTB by nullref.

2 files changed, 19 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index 42cbdfc..87f3de1 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -192,6 +192,8 @@ namespace OpenSim.Region.Environment.Scenes
         public event ScriptTimerEvent OnScriptTimerEvent;
 
         public delegate void EstateToolsTimeUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour);
+        public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
+
         public event EstateToolsTimeUpdate OnEstateToolsTimeUpdate;
 
         public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj);
@@ -211,6 +213,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public delegate void ParcelPrimCountTainted();
         public event ParcelPrimCountTainted OnParcelPrimCountTainted;
+        public event GetScriptRunning OnGetScriptRunning;
 
         /// <summary>
         /// RegisterCapsEvent is called by Scene after the Caps object
@@ -368,9 +371,17 @@ namespace OpenSim.Region.Environment.Scenes
         private ScriptColliding handlerCollidingStart = null;
         private ScriptColliding handlerColliding = null;
         private ScriptColliding handlerCollidingEnd = null;
+        private GetScriptRunning handlerGetScriptRunning = null;
 
         private SunLindenHour handlerSunGetLindenHour = null;
 
+        public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
+        {
+            handlerGetScriptRunning = OnGetScriptRunning;
+            if (handlerGetScriptRunning != null)
+                handlerGetScriptRunning(controllingClient, objectID, itemID);
+        }
+
         public void TriggerOnScriptChangedEvent(uint localID, uint change)
         {
             handlerScriptChangedEvent = OnScriptChangedEvent;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 015b140..2a9be81 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -445,7 +445,6 @@ namespace OpenSim.Region.Environment.Scenes
                             }
                             else
                             {
-                            Console.WriteLine("Non-Prim item ==>");
                                 itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
                             }
 
@@ -896,6 +895,9 @@ namespace OpenSim.Region.Environment.Scenes
             if (group != null)
             {
                 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
+                if (item == null)
+                    return;
+
                 if (item.Type == 10)
                 {
                     EventManager.TriggerRemoveScript(localID, itemID);
@@ -2311,16 +2313,6 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
 
         }
 
-        public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
-        {
-            IScriptModule scriptModule = RequestModuleInterface<IScriptModule>();
-            if (scriptModule == null)
-                return;
-
-            controllingClient.SendScriptRunningReply(objectID, itemID,
-                    scriptModule.GetScriptRunning(objectID, itemID));
-        }
-
         public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
         {
             SceneObjectPart part = GetSceneObjectPart(objectID);
@@ -2388,5 +2380,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
             }
             m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient);
         }
+
+        public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
+        {
+            EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID);
+        }
     }
 }