diff options
author | UbitUmarov | 2015-09-08 18:45:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 18:45:53 +0100 |
commit | 339f60e99064b23fdd4ae2608bc3bd7dbdaa8466 (patch) | |
tree | 4c9fadba337ad3379573dd07bc3be6222183336b /OpenSim/Region/PhysicsModules | |
parent | more on compile.. (diff) | |
download | opensim-SC-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.zip opensim-SC-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.gz opensim-SC-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.bz2 opensim-SC-339f60e99064b23fdd4ae2608bc3bd7dbdaa8466.tar.xz |
more on compile..
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
-rw-r--r-- | OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs index fe8f5d8..4031f0d 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs | |||
@@ -170,6 +170,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
170 | public class ODEScene : PhysicsScene, INonSharedRegionModule | 170 | public class ODEScene : PhysicsScene, INonSharedRegionModule |
171 | { | 171 | { |
172 | private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString()); | 172 | private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString()); |
173 | public string LogHeader = "[UbitODE]"; | ||
173 | private bool m_Enabled = false; | 174 | private bool m_Enabled = false; |
174 | 175 | ||
175 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); | 176 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); |
@@ -574,7 +575,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
574 | d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); | 575 | d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); |
575 | d.WorldSetContactMaxCorrectingVel(world, 60.0f); | 576 | d.WorldSetContactMaxCorrectingVel(world, 60.0f); |
576 | 577 | ||
577 | m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig); | 578 | m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig); |
578 | 579 | ||
579 | HalfOdeStep = ODE_STEPSIZE * 0.5f; | 580 | HalfOdeStep = ODE_STEPSIZE * 0.5f; |
580 | odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); | 581 | odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); |