From e9c9a74e0ade505ee8d8d8e7790141f758a65f61 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Tue, 26 Jan 2010 15:12:41 +0000
Subject: [PATCH] Some merge fixups

---
 .../InstantMessage/OfflineMessageModule.cs     |  9 +++++----
 .../Scenes/SceneObjectGroup.Inventory.cs       |  4 ++--
 .../Scenes/SceneObjectPartInventory.cs         |  2 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 18 +++---------------
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 3e86848c2f..8f289c0f9e 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -180,11 +180,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void RetrieveInstantMessages(IClientAPI client)
         {
-            if (m_RestURL != "")
-            {
-                m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
+            if (m_RestURL == String.Empty)
+                return;
 
-                List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
+            m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
+
+            List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
             if (msglist != null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index aea005e7ac..8b58b3eac6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Stop the scripts contained in all the prims in this group
         /// </summary>
-        public void RemoveScriptInstances()
+        public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
         {
             lockPartsForRead(true);
             List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             foreach (SceneObjectPart part in values)
             {
-                part.Inventory.RemoveScriptInstances();
+                part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
             }
             
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 1de0092557..9661775649 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if ((int)InventoryType.LSL == item.InvType)
                 {
-                    RemoveScriptInstance(item.ItemID);
+                    RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
                     m_part.RemoveScriptEvents(item.ItemID);
                 }
             }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 73850e1dcd..35d57d8910 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -885,12 +885,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             instance.ClearQueue();
             instance.Stop(0);
 
-            SceneObjectPart part =
-                m_Scene.GetSceneObjectPart(localID);
-
-            if (part != null)
-                part.RemoveScriptEvents(itemID);
-
 //                bool objectRemoved = false;
 
             lock (m_PrimObjects)
@@ -923,18 +917,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             instance = null;
 
-<<<<<<< HEAD:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
             ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
             if (handlerObjectRemoved != null)
+            {
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);                    
                 handlerObjectRemoved(part.UUID);
-=======
-                ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
-                if (handlerObjectRemoved != null)
-                {
-                    SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);                    
-                    handlerObjectRemoved(part.UUID);
-                }
->>>>>>> master:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+            }
 
             CleanAssemblies();