remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b9b5621..f0d5d28 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -537,8 +537,6 @@ namespace OpenSim.Region.Framework.Scenes
                       Scene.TestBorderCross(val, Cardinals.S))
                     )
                 {
-                    lock (m_parts)
-                    {
                         if (!inTransit)
                         {
                             inTransit = true;
@@ -546,7 +544,6 @@ namespace OpenSim.Region.Framework.Scenes
                             d.BeginInvoke(this, val, CrossAsyncCompleted, d);
                         }
                         return;
-                    }
                 }
 
                 if (RootPart.GetStatusSandbox())
@@ -2191,7 +2188,9 @@ namespace OpenSim.Region.Framework.Scenes
                         HasGroupChanged = false;
                         HasGroupChangedDueToDelink = false;
 
-                        m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
+
+// DEBUG
+//                        m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
 /*
                         backup_group.ForEachPart(delegate(SceneObjectPart part) 
                         {