aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0743ce7..a9f8a85 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2364,6 +2364,12 @@ namespace OpenSim.Region.Framework.Scenes
2364 2364
2365 foreach (SceneObjectPart part in partList) 2365 foreach (SceneObjectPart part in partList)
2366 { 2366 {
2367 if (part.KeyframeMotion != null)
2368 {
2369 part.KeyframeMotion.Delete();
2370 part.KeyframeMotion = null;
2371 }
2372
2367 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) 2373 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
2368 { 2374 {
2369 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? 2375 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
@@ -2705,6 +2711,9 @@ namespace OpenSim.Region.Framework.Scenes
2705 // before we restart the scripts, or else some functions won't work. 2711 // before we restart the scripts, or else some functions won't work.
2706 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); 2712 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2707 newObject.ResumeScripts(); 2713 newObject.ResumeScripts();
2714
2715 if (newObject.RootPart.KeyframeMotion != null)
2716 newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
2708 } 2717 }
2709 2718
2710 // Do this as late as possible so that listeners have full access to the incoming object 2719 // Do this as late as possible so that listeners have full access to the incoming object