aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-10-26 10:48:53 +0000
committerUbitUmarov2014-10-26 10:48:53 +0000
commitcfc8de096b969633775763051a7d9681b6f2ff77 (patch)
tree50fff28bceab79ea0ebb738bb4e25b53030b4fbd /OpenSim/Region
parent another try to prevent double crossing (diff)
downloadopensim-SC_OLD-cfc8de096b969633775763051a7d9681b6f2ff77.zip
opensim-SC_OLD-cfc8de096b969633775763051a7d9681b6f2ff77.tar.gz
opensim-SC_OLD-cfc8de096b969633775763051a7d9681b6f2ff77.tar.bz2
opensim-SC_OLD-cfc8de096b969633775763051a7d9681b6f2ff77.tar.xz
remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
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
537 Scene.TestBorderCross(val, Cardinals.S)) 537 Scene.TestBorderCross(val, Cardinals.S))
538 ) 538 )
539 { 539 {
540 lock (m_parts)
541 {
542 if (!inTransit) 540 if (!inTransit)
543 { 541 {
544 inTransit = true; 542 inTransit = true;
@@ -546,7 +544,6 @@ namespace OpenSim.Region.Framework.Scenes
546 d.BeginInvoke(this, val, CrossAsyncCompleted, d); 544 d.BeginInvoke(this, val, CrossAsyncCompleted, d);
547 } 545 }
548 return; 546 return;
549 }
550 } 547 }
551 548
552 if (RootPart.GetStatusSandbox()) 549 if (RootPart.GetStatusSandbox())
@@ -2191,7 +2188,9 @@ namespace OpenSim.Region.Framework.Scenes
2191 HasGroupChanged = false; 2188 HasGroupChanged = false;
2192 HasGroupChangedDueToDelink = false; 2189 HasGroupChangedDueToDelink = false;
2193 2190
2194 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); 2191
2192// DEBUG
2193// m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
2195/* 2194/*
2196 backup_group.ForEachPart(delegate(SceneObjectPart part) 2195 backup_group.ForEachPart(delegate(SceneObjectPart part)
2197 { 2196 {