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

Debug... ( restored TriggerOnSceneObjectPreSave)

avinationmerge
UbitUmarov 2014-10-26 11:28:24 +00:00
parent cfc8de096b
commit b43ce909aa
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2187,20 +2187,16 @@ namespace OpenSim.Region.Framework.Scenes
backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem; backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem;
HasGroupChanged = false; HasGroupChanged = false;
HasGroupChangedDueToDelink = false; HasGroupChangedDueToDelink = false;
// debug
if (RootPart.KeyframeMotion != null)
// DEBUG
// m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
/*
backup_group.ForEachPart(delegate(SceneObjectPart part)
{ {
if (part.KeyframeMotion != null) m_log.DebugFormat(
{ "[BACKUP]: test prim {0} {1}, intransit = {2}",
part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); Name, UUID, inTransit);
// part.KeyframeMotion.UpdateSceneObject(this); }
}
}); m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
*/
datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
backup_group.ForEachPart(delegate(SceneObjectPart part) backup_group.ForEachPart(delegate(SceneObjectPart part)
@ -2262,6 +2258,8 @@ namespace OpenSim.Region.Framework.Scenes
dupe.m_isBackedUp = false; dupe.m_isBackedUp = false;
dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
dupe.inTransit = inTransit; // this shouldn't be needed TEST
// new group as no sitting avatars // new group as no sitting avatars
dupe.m_linkedAvatars = new List<ScenePresence>(); dupe.m_linkedAvatars = new List<ScenePresence>();
dupe.m_sittingAvatars = new List<UUID>(); dupe.m_sittingAvatars = new List<UUID>();