diff options
author | Melanie | 2012-06-06 14:16:19 +0100 |
---|---|---|
committer | Melanie | 2012-06-06 14:16:19 +0100 |
commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Region/Physics | |
parent | Merge branch 'master' into careminster (diff) | |
parent | fix the real cause of double velocity (diff) | |
download | opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 9a40ab5..9b3b51b 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -3252,9 +3252,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3252 | } | 3252 | } |
3253 | 3253 | ||
3254 | 3254 | ||
3255 | private void changeAddImpulse(Vector3 impulse) | 3255 | private void changeAddForce(Vector3 theforce) |
3256 | { | 3256 | { |
3257 | m_forceacc += impulse *m_invTimeStep; | 3257 | m_forceacc += theforce; |
3258 | if (!m_isSelected) | 3258 | if (!m_isSelected) |
3259 | { | 3259 | { |
3260 | lock (this) | 3260 | lock (this) |
@@ -3960,7 +3960,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3960 | break; | 3960 | break; |
3961 | 3961 | ||
3962 | case changes.AddForce: | 3962 | case changes.AddForce: |
3963 | changeAddImpulse((Vector3)arg); | 3963 | changeAddForce((Vector3)arg); |
3964 | break; | 3964 | break; |
3965 | 3965 | ||
3966 | case changes.AddAngForce: | 3966 | case changes.AddAngForce: |