diff options
author | Homer Horwitz | 2008-12-20 16:42:17 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-12-20 16:42:17 +0000 |
commit | 84b43c8c2378899ad34eb86a0577b1f453afab68 (patch) | |
tree | 5f926d15e9a26e6b57be6874cd44b141f1ed7727 /OpenSim | |
parent | * A few more fixes to HttpServer. (diff) | |
download | opensim-SC-84b43c8c2378899ad34eb86a0577b1f453afab68.zip opensim-SC-84b43c8c2378899ad34eb86a0577b1f453afab68.tar.gz opensim-SC-84b43c8c2378899ad34eb86a0577b1f453afab68.tar.bz2 opensim-SC-84b43c8c2378899ad34eb86a0577b1f453afab68.tar.xz |
Fix Mantis#2878 for now by not resetting physical values on rez (only on switch).
We still might have to split the rotational velocities into a physical and a non-physical part...
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index c54f8f8..6b4d47a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1425,7 +1425,7 @@ if (m_shape != null) { | |||
1425 | PhysActor.delink(); | 1425 | PhysActor.delink(); |
1426 | } | 1426 | } |
1427 | 1427 | ||
1428 | if (!UsePhysics) | 1428 | if (!UsePhysics && !isNew) |
1429 | { | 1429 | { |
1430 | // reset velocity to 0 on physics switch-off. Without that, the client thinks the | 1430 | // reset velocity to 0 on physics switch-off. Without that, the client thinks the |
1431 | // prim still has velocity and continues to interpolate its position along the old | 1431 | // prim still has velocity and continues to interpolate its position along the old |