diff options
| author | BlueWall | 2012-10-03 19:14:40 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-03 19:14:40 -0400 |
| commit | e6c9b0900615ac41d56f1fbd3ea30a6308b22f96 (patch) | |
| tree | 7cc9f82783ef8826a13e169a9d43ef9ec5d98cfc /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Add modular configuration for Robust connectors (diff) | |
| parent | Soliciting for comments on smoothness of physics objects for this build. (diff) | |
| download | opensim-SC-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.zip opensim-SC-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.gz opensim-SC-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.bz2 opensim-SC-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index d9b738b..1ac8c59 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -81,6 +81,10 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 81 | // Tell the object to clean up. | 81 | // Tell the object to clean up. |
| 82 | public abstract void Destroy(); | 82 | public abstract void Destroy(); |
| 83 | 83 | ||
| 84 | public abstract OMV.Vector3 ForcePosition { get; set; } | ||
| 85 | |||
| 86 | public abstract OMV.Quaternion ForceOrientation { get; set; } | ||
| 87 | |||
| 84 | #region Collisions | 88 | #region Collisions |
| 85 | 89 | ||
| 86 | // Requested number of milliseconds between collision events. Zero means disabled. | 90 | // Requested number of milliseconds between collision events. Zero means disabled. |