diff options
| author | Melanie Thielker | 2010-08-14 14:00:12 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-14 14:00:12 +0200 |
| commit | f2d7f3e731659bbfcecf5a0846f711fcc38237f0 (patch) | |
| tree | 0959ceadcc72393da36d48fc29b785b84fc45917 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Fix a possible nullref in BestAvatarResponsiveness policy (diff) | |
| parent | clearing some debugmessages (diff) | |
| download | opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.zip opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.gz opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.bz2 opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index fbe1da9..dd780b7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1827,7 +1827,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1827 | // which stops client-side interpolation of deactivated joint proxy objects. | 1827 | // which stops client-side interpolation of deactivated joint proxy objects. |
| 1828 | } | 1828 | } |
| 1829 | 1829 | ||
| 1830 | if (!UsePhysics) | 1830 | if (!UsePhysics && !isNew) |
| 1831 | { | 1831 | { |
| 1832 | // reset velocity to 0 on physics switch-off. Without that, the client thinks the | 1832 | // reset velocity to 0 on physics switch-off. Without that, the client thinks the |
| 1833 | // prim still has velocity and continues to interpolate its position along the old | 1833 | // prim still has velocity and continues to interpolate its position along the old |