Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

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
         }

 

 

-        private void changeAddImpulse(Vector3 impulse)

+        private void changeAddForce(Vector3 theforce)

         {

-            m_forceacc += impulse *m_invTimeStep;

+            m_forceacc += theforce;

             if (!m_isSelected)

             {

                 lock (this)

@@ -3960,7 +3960,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     break;

 

                 case changes.AddForce:

-                    changeAddImpulse((Vector3)arg);

+                    changeAddForce((Vector3)arg);

                     break;

 

                 case changes.AddAngForce: