diff options
| author | Melanie | 2012-06-04 21:09:42 +0200 |
|---|---|---|
| committer | Melanie | 2012-06-04 21:09:42 +0200 |
| commit | 1d75220fccb511fa2b3e8da118e9a91fac8e1fc3 (patch) | |
| tree | 720d92b3bdc596c55429f00ee1f932fcb97705df /OpenSim | |
| parent | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi... (diff) | |
| parent | fix addforce/impulse. (diff) | |
| download | opensim-SC_OLD-1d75220fccb511fa2b3e8da118e9a91fac8e1fc3.zip opensim-SC_OLD-1d75220fccb511fa2b3e8da118e9a91fac8e1fc3.tar.gz opensim-SC_OLD-1d75220fccb511fa2b3e8da118e9a91fac8e1fc3.tar.bz2 opensim-SC_OLD-1d75220fccb511fa2b3e8da118e9a91fac8e1fc3.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim')
| -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: |