OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-06-04 21:09:42 +02:00
parent 28e5abd917 401b97788f
commit 1d75220fcc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -3252,9 +3252,9 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
private void changeAddImpulse(Vector3 impulse) private void changeAddForce(Vector3 theforce)
{ {
m_forceacc += impulse *m_invTimeStep; m_forceacc += theforce;
if (!m_isSelected) if (!m_isSelected)
{ {
lock (this) lock (this)
@ -3960,7 +3960,7 @@ namespace OpenSim.Region.Physics.OdePlugin
break; break;
case changes.AddForce: case changes.AddForce:
changeAddImpulse((Vector3)arg); changeAddForce((Vector3)arg);
break; break;
case changes.AddAngForce: case changes.AddAngForce: