diff options
| author | Melanie | 2012-10-03 00:24:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-03 00:24:33 +0100 |
| commit | 23d5bafa7f5e7b23ea36300de8096c7dc84e51b0 (patch) | |
| tree | 044eb97d800f1ce82bfb0367488eb8752b3e6aa6 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.zip opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.gz opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.bz2 opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to '')
| -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. |