diff options
author | Robert Adams | 2013-06-30 19:22:43 -0700 |
---|---|---|
committer | Robert Adams | 2013-06-30 19:22:43 -0700 |
commit | 8eb86c9ec91ee41699ab455fc5e788a4bff53071 (patch) | |
tree | 4f35dd59535fd6a5abd61a7ea9142c6ca1da2a26 /OpenSim/Region/Physics | |
parent | BulletSim: fix an occasional crash with flushing log files. (diff) | |
download | opensim-SC_OLD-8eb86c9ec91ee41699ab455fc5e788a4bff53071.zip opensim-SC_OLD-8eb86c9ec91ee41699ab455fc5e788a4bff53071.tar.gz opensim-SC_OLD-8eb86c9ec91ee41699ab455fc5e788a4bff53071.tar.bz2 opensim-SC_OLD-8eb86c9ec91ee41699ab455fc5e788a4bff53071.tar.xz |
BulletSim: add the reset of the last commit for flush log file problems.
Fix small typo in one log message.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 07e87d1..aa247dd 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
@@ -1276,7 +1276,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
1276 | 1276 | ||
1277 | VehicleAddForce(appliedGravity); | 1277 | VehicleAddForce(appliedGravity); |
1278 | 1278 | ||
1279 | VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}", | 1279 | VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}", |
1280 | ControllingPrim.LocalID, m_VehicleGravity, | 1280 | ControllingPrim.LocalID, m_VehicleGravity, |
1281 | ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity); | 1281 | ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity); |
1282 | } | 1282 | } |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 155d143..1645c98 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -223,7 +223,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
223 | // can be left in and every call doesn't have to check for null. | 223 | // can be left in and every call doesn't have to check for null. |
224 | if (m_physicsLoggingEnabled) | 224 | if (m_physicsLoggingEnabled) |
225 | { | 225 | { |
226 | PhysicsLogging = new Logging.LogWriter(m_physicsLoggingDir, m_physicsLoggingPrefix, m_physicsLoggingFileMinutes, m_physicsLoggingDoFlush); | 226 | PhysicsLogging = new Logging.LogWriter(m_physicsLoggingDir, m_physicsLoggingPrefix, m_physicsLoggingFileMinutes, m_physicsLoggingDoFlush); |
227 | PhysicsLogging.ErrorLogger = m_log; // for DEBUG. Let's the logger output its own error messages. | 227 | PhysicsLogging.ErrorLogger = m_log; // for DEBUG. Let's the logger output its own error messages. |
228 | } | 228 | } |
229 | else | 229 | else |