diff options
author | Justin Clark-Casey (justincc) | 2012-10-11 23:56:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-11 23:56:03 +0100 |
commit | f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4 (patch) | |
tree | 73b56a7b8294cc55c5f33c30b52bcefbf7d24e60 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | Extend "show stats" command to "show stats [list|all|<category name>]" (diff) | |
parent | BulletSim: update the DLLs and SOs (diff) | |
download | opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.zip opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.gz opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.bz2 opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 1ac8c59..cae599c 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -85,6 +85,10 @@ public abstract class BSPhysObject : PhysicsActor | |||
85 | 85 | ||
86 | public abstract OMV.Quaternion ForceOrientation { get; set; } | 86 | public abstract OMV.Quaternion ForceOrientation { get; set; } |
87 | 87 | ||
88 | public abstract OMV.Vector3 ForceVelocity { get; set; } | ||
89 | |||
90 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } | ||
91 | |||
88 | #region Collisions | 92 | #region Collisions |
89 | 93 | ||
90 | // Requested number of milliseconds between collision events. Zero means disabled. | 94 | // Requested number of milliseconds between collision events. Zero means disabled. |
@@ -207,7 +211,8 @@ public abstract class BSPhysObject : PhysicsActor | |||
207 | // High performance detailed logging routine used by the physical objects. | 211 | // High performance detailed logging routine used by the physical objects. |
208 | protected void DetailLog(string msg, params Object[] args) | 212 | protected void DetailLog(string msg, params Object[] args) |
209 | { | 213 | { |
210 | PhysicsScene.PhysicsLogging.Write(msg, args); | 214 | if (PhysicsScene.PhysicsLogging.Enabled) |
215 | PhysicsScene.DetailLog(msg, args); | ||
211 | } | 216 | } |
212 | } | 217 | } |
213 | } | 218 | } |