diff options
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5052683..df4bd0d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2062,6 +2062,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2062 | HasGroupChangedDueToDelink = false; | 2062 | HasGroupChangedDueToDelink = false; |
2063 | 2063 | ||
2064 | m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); | 2064 | m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); |
2065 | /* | ||
2065 | backup_group.ForEachPart(delegate(SceneObjectPart part) | 2066 | backup_group.ForEachPart(delegate(SceneObjectPart part) |
2066 | { | 2067 | { |
2067 | if (part.KeyframeMotion != null) | 2068 | if (part.KeyframeMotion != null) |
@@ -2070,7 +2071,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2070 | // part.KeyframeMotion.UpdateSceneObject(this); | 2071 | // part.KeyframeMotion.UpdateSceneObject(this); |
2071 | } | 2072 | } |
2072 | }); | 2073 | }); |
2073 | 2074 | */ | |
2074 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); | 2075 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); |
2075 | 2076 | ||
2076 | backup_group.ForEachPart(delegate(SceneObjectPart part) | 2077 | backup_group.ForEachPart(delegate(SceneObjectPart part) |
@@ -4416,15 +4417,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4416 | public virtual ISceneObject CloneForNewScene() | 4417 | public virtual ISceneObject CloneForNewScene() |
4417 | { | 4418 | { |
4418 | SceneObjectGroup sog = Copy(false); | 4419 | SceneObjectGroup sog = Copy(false); |
4419 | sog.ForEachPart(delegate(SceneObjectPart part) | ||
4420 | { | ||
4421 | if (part.KeyframeMotion != null) | ||
4422 | { | ||
4423 | part.KeyframeMotion = KeyframeMotion.FromData(sog, part.KeyframeMotion.Serialize()); | ||
4424 | // this is called later | ||
4425 | // part.KeyframeMotion.UpdateSceneObject(this); | ||
4426 | } | ||
4427 | }); | ||
4428 | sog.IsDeleted = false; | 4420 | sog.IsDeleted = false; |
4429 | return sog; | 4421 | return sog; |
4430 | } | 4422 | } |