diff options
| author | Melanie | 2012-08-31 00:34:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 00:34:22 +0100 |
| commit | fd92560649cc9dd34b7b9a8dfabccf7582661a64 (patch) | |
| tree | 97cc0a6aef597f014bafe62022c2619570f134fa /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.zip opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.gz opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.bz2 opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5b529c3..8fb6c3b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2376,6 +2376,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2376 | 2376 | ||
| 2377 | foreach (SceneObjectPart part in partList) | 2377 | foreach (SceneObjectPart part in partList) |
| 2378 | { | 2378 | { |
| 2379 | if (part.KeyframeMotion != null) | ||
| 2380 | { | ||
| 2381 | part.KeyframeMotion.Delete(); | ||
| 2382 | part.KeyframeMotion = null; | ||
| 2383 | } | ||
| 2384 | |||
| 2379 | if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) | 2385 | if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) |
| 2380 | { | 2386 | { |
| 2381 | PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? | 2387 | PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? |