aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-05-07 12:07:42 +0100
committerMelanie2012-05-07 12:07:42 +0100
commit1120a2cf362e266b646e162c9f3b60fb8161128f (patch)
tree9b353ecc615fa072c60db0790da0d4f0d7a36f91 /OpenSim/Region/Framework
parentMerge branch 'avination' into careminster (diff)
parentUbitODE: reduced the diference btw dinamic and static friction, making dinami... (diff)
downloadopensim-SC_OLD-1120a2cf362e266b646e162c9f3b60fb8161128f.zip
opensim-SC_OLD-1120a2cf362e266b646e162c9f3b60fb8161128f.tar.gz
opensim-SC_OLD-1120a2cf362e266b646e162c9f3b60fb8161128f.tar.bz2
opensim-SC_OLD-1120a2cf362e266b646e162c9f3b60fb8161128f.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a6ce0e2..468c7ea 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2276,7 +2276,8 @@ namespace OpenSim.Region.Framework.Scenes
2276 2276
2277 if (pa != null) 2277 if (pa != null)
2278 { 2278 {
2279 pa.AddForce(impulse, true); 2279 // false to be applied as a impulse
2280 pa.AddForce(impulse, false);
2280 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 2281 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
2281 } 2282 }
2282 } 2283 }
@@ -2290,7 +2291,8 @@ namespace OpenSim.Region.Framework.Scenes
2290 { 2291 {
2291 if (!IsAttachment) 2292 if (!IsAttachment)
2292 { 2293 {
2293 pa.AddAngularForce(impulse, true); 2294 // false to be applied as a impulse
2295 pa.AddAngularForce(impulse, false);
2294 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 2296 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
2295 } 2297 }
2296 } 2298 }