aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
diff options
context:
space:
mode:
authorMelanie2012-10-02 23:02:53 +0100
committerMelanie2012-10-02 23:02:53 +0100
commitca5c0814f4c6e286e24e1971620aec3c0ee1c2d3 (patch)
treef630648180aca5a498cb674bfb1f967eb9bcb260 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
parentAttempt to fix Mantis #6311. Honor a destination folder if one is given (diff)
parentcorrecting typo (diff)
downloadopensim-SC-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.zip
opensim-SC-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.gz
opensim-SC-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.bz2
opensim-SC-ca5c0814f4c6e286e24e1971620aec3c0ee1c2d3.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs4
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.