aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-10-26 11:28:24 +0000
committerUbitUmarov2014-10-26 11:28:24 +0000
commitb43ce909aa1bf8be0136b3b7325c9be84939db32 (patch)
tree8d080ff569cf6428f31c0790f6c9c1fd0e01dfe7 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave (diff)
downloadopensim-SC_OLD-b43ce909aa1bf8be0136b3b7325c9be84939db32.zip
opensim-SC_OLD-b43ce909aa1bf8be0136b3b7325c9be84939db32.tar.gz
opensim-SC_OLD-b43ce909aa1bf8be0136b3b7325c9be84939db32.tar.bz2
opensim-SC_OLD-b43ce909aa1bf8be0136b3b7325c9be84939db32.tar.xz
Debug... ( restored TriggerOnSceneObjectPreSave)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs22
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f0d5d28..25538de 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2187,20 +2187,16 @@ namespace OpenSim.Region.Framework.Scenes
2187 backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem; 2187 backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem;
2188 HasGroupChanged = false; 2188 HasGroupChanged = false;
2189 HasGroupChangedDueToDelink = false; 2189 HasGroupChangedDueToDelink = false;
2190// debug
2191 if (RootPart.KeyframeMotion != null)
2192 {
2193 m_log.DebugFormat(
2194 "[BACKUP]: test prim {0} {1}, intransit = {2}",
2195 Name, UUID, inTransit);
2196 }
2190 2197
2198 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
2191 2199
2192// DEBUG
2193// m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
2194/*
2195 backup_group.ForEachPart(delegate(SceneObjectPart part)
2196 {
2197 if (part.KeyframeMotion != null)
2198 {
2199 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
2200// part.KeyframeMotion.UpdateSceneObject(this);
2201 }
2202 });
2203*/
2204 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 2200 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
2205 2201
2206 backup_group.ForEachPart(delegate(SceneObjectPart part) 2202 backup_group.ForEachPart(delegate(SceneObjectPart part)
@@ -2262,6 +2258,8 @@ namespace OpenSim.Region.Framework.Scenes
2262 dupe.m_isBackedUp = false; 2258 dupe.m_isBackedUp = false;
2263 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 2259 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
2264 2260
2261 dupe.inTransit = inTransit; // this shouldn't be needed TEST
2262
2265 // new group as no sitting avatars 2263 // new group as no sitting avatars
2266 dupe.m_linkedAvatars = new List<ScenePresence>(); 2264 dupe.m_linkedAvatars = new List<ScenePresence>();
2267 dupe.m_sittingAvatars = new List<UUID>(); 2265 dupe.m_sittingAvatars = new List<UUID>();