aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index df23cc5..da80e4f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -455,6 +455,9 @@ namespace OpenSim.Region.Framework.Scenes
455 || Scene.TestBorderCross(val, Cardinals.S)) 455 || Scene.TestBorderCross(val, Cardinals.S))
456 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) 456 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
457 { 457 {
458 if (m_rootPart.KeyframeMotion != null)
459 m_rootPart.KeyframeMotion.StartCrossingCheck();
460
458 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 461 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
459 } 462 }
460 } 463 }
@@ -578,6 +581,8 @@ namespace OpenSim.Region.Framework.Scenes
578 childPa.Selected = value; 581 childPa.Selected = value;
579 } 582 }
580 } 583 }
584 if (RootPart.KeyframeMotion != null)
585 RootPart.KeyframeMotion.Selected = value;
581 } 586 }
582 } 587 }
583 588
@@ -1551,6 +1556,8 @@ namespace OpenSim.Region.Framework.Scenes
1551 1556
1552 newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true); 1557 newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true);
1553 } 1558 }
1559 if (part.KeyframeMotion != null)
1560 newPart.KeyframeMotion = part.KeyframeMotion.Copy(dupe);
1554 } 1561 }
1555 1562
1556 if (userExposed) 1563 if (userExposed)
@@ -1578,6 +1585,12 @@ namespace OpenSim.Region.Framework.Scenes
1578 1585
1579 public void ScriptSetPhysicsStatus(bool usePhysics) 1586 public void ScriptSetPhysicsStatus(bool usePhysics)
1580 { 1587 {
1588 if (usePhysics)
1589 {
1590 if (RootPart.KeyframeMotion != null)
1591 RootPart.KeyframeMotion.Stop();
1592 RootPart.KeyframeMotion = null;
1593 }
1581 UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect); 1594 UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
1582 } 1595 }
1583 1596