diff options
| author | Melanie | 2012-08-29 11:18:32 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-29 11:18:32 +0200 |
| commit | f671e446bfdca5932d45cc358324a667d3239473 (patch) | |
| tree | 05c6a16e9e983a10845b2622f3c4d7091dae5765 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Add a queue with two priority levels. This is a drop in replacement for (diff) | |
| parent | A few more changes to keyframes (diff) | |
| download | opensim-SC_OLD-f671e446bfdca5932d45cc358324a667d3239473.zip opensim-SC_OLD-f671e446bfdca5932d45cc358324a667d3239473.tar.gz opensim-SC_OLD-f671e446bfdca5932d45cc358324a667d3239473.tar.bz2 opensim-SC_OLD-f671e446bfdca5932d45cc358324a667d3239473.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
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 57fcf51..0237021 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2346,6 +2346,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2346 | 2346 | ||
| 2347 | foreach (SceneObjectPart part in partList) | 2347 | foreach (SceneObjectPart part in partList) |
| 2348 | { | 2348 | { |
| 2349 | if (part.KeyframeMotion != null) | ||
| 2350 | { | ||
| 2351 | part.KeyframeMotion.Delete(); | ||
| 2352 | part.KeyframeMotion = null; | ||
| 2353 | } | ||
| 2354 | |||
| 2349 | if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) | 2355 | if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) |
| 2350 | { | 2356 | { |
| 2351 | PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? | 2357 | PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? |