aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorubit2012-08-28 04:27:59 +0200
committerubit2012-08-28 04:27:59 +0200
commit2546e4c2de29f7d4c4c89c2a79d97b2d9e12a19f (patch)
tree52b3f4146ddb15eb0b593f22c1e0796676430300 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent[possible still very broken] mess around keyframes. timer events (diff)
downloadopensim-SC-2546e4c2de29f7d4c4c89c2a79d97b2d9e12a19f.zip
opensim-SC-2546e4c2de29f7d4c4c89c2a79d97b2d9e12a19f.tar.gz
opensim-SC-2546e4c2de29f7d4c4c89c2a79d97b2d9e12a19f.tar.bz2
opensim-SC-2546e4c2de29f7d4c4c89c2a79d97b2d9e12a19f.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.cs6
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?