aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorubit2012-07-07 04:20:39 +0200
committerubit2012-07-07 04:20:39 +0200
commit6a1ccbfef3ec34ba3db180225365de1ea704acfe (patch)
tree12f62c914e23750f9e4c5ae6651048d6ef5d71ce /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentODE turn off material dependent friction while vehicle linear motor is Effect... (diff)
downloadopensim-SC_OLD-6a1ccbfef3ec34ba3db180225365de1ea704acfe.zip
opensim-SC_OLD-6a1ccbfef3ec34ba3db180225365de1ea704acfe.tar.gz
opensim-SC_OLD-6a1ccbfef3ec34ba3db180225365de1ea704acfe.tar.bz2
opensim-SC_OLD-6a1ccbfef3ec34ba3db180225365de1ea704acfe.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 9b3b51b..3d8e680 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -275,6 +275,7 @@ namespace OpenSim.Region.Physics.OdePlugin
275 275
276 if (veh != null && veh.Type != Vehicle.TYPE_NONE) 276 if (veh != null && veh.Type != Vehicle.TYPE_NONE)
277 cdata.mu *= veh.FrictionFactor; 277 cdata.mu *= veh.FrictionFactor;
278// cdata.mu *= 0;
278 } 279 }
279 } 280 }
280 281