From b43ce909aa1bf8be0136b3b7325c9be84939db32 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 26 Oct 2014 11:28:24 +0000 Subject: [PATCH] Debug... ( restored TriggerOnSceneObjectPreSave) --- .../Framework/Scenes/SceneObjectGroup.cs | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index f0d5d289d9..25538defea 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2187,20 +2187,16 @@ namespace OpenSim.Region.Framework.Scenes backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem; HasGroupChanged = false; HasGroupChangedDueToDelink = false; +// debug + if (RootPart.KeyframeMotion != null) + { + m_log.DebugFormat( + "[BACKUP]: test prim {0} {1}, intransit = {2}", + Name, UUID, inTransit); + } + m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); -// DEBUG -// m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); -/* - backup_group.ForEachPart(delegate(SceneObjectPart part) - { - if (part.KeyframeMotion != null) - { - part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); -// part.KeyframeMotion.UpdateSceneObject(this); - } - }); -*/ datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); backup_group.ForEachPart(delegate(SceneObjectPart part) @@ -2262,6 +2258,8 @@ namespace OpenSim.Region.Framework.Scenes dupe.m_isBackedUp = false; dupe.m_parts = new MapAndArray(); + dupe.inTransit = inTransit; // this shouldn't be needed TEST + // new group as no sitting avatars dupe.m_linkedAvatars = new List(); dupe.m_sittingAvatars = new List();