diff options
| author | meta7 | 2010-08-11 13:39:36 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-11 13:39:36 -0700 |
| commit | fa393cb13a6008ed82c13d9f2bcec96dd8e21cae (patch) | |
| tree | 4959eeabf45de8804d1e5b19c6325db52681d35c /OpenSim | |
| parent | Fix a nullref issue in the AgentSetAppearance packet handler when removing th... (diff) | |
| download | opensim-SC_OLD-fa393cb13a6008ed82c13d9f2bcec96dd8e21cae.zip opensim-SC_OLD-fa393cb13a6008ed82c13d9f2bcec96dd8e21cae.tar.gz opensim-SC_OLD-fa393cb13a6008ed82c13d9f2bcec96dd8e21cae.tar.bz2 opensim-SC_OLD-fa393cb13a6008ed82c13d9f2bcec96dd8e21cae.tar.xz | |
Fix Omega getting overwritten on startup.
Diffstat (limited to 'OpenSim')
| -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 |