Some merge fixups

1 files changed, 3 insertions, 15 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 73850e1..35d57d8 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();