OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave

avinationmerge
UbitUmarov 2014-10-26 10:48:53 +00:00
parent 6600282fe9
commit cfc8de096b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

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