diff options
| author | Diva Canto | 2013-07-07 20:44:23 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-07 20:44:23 -0700 |
| commit | 1e72e1b25831b26dcb8b96fa33a78f0ee6465342 (patch) | |
| tree | 77cf2fe2fff33555c83122c7accff5b900120101 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Print out caller IP when unusual requests are received. (diff) | |
| parent | BulletSim: Different Implementation of Angular Deflection for vehicles, Activ... (diff) | |
| download | opensim-SC-1e72e1b25831b26dcb8b96fa33a78f0ee6465342.zip opensim-SC-1e72e1b25831b26dcb8b96fa33a78f0ee6465342.tar.gz opensim-SC-1e72e1b25831b26dcb8b96fa33a78f0ee6465342.tar.bz2 opensim-SC-1e72e1b25831b26dcb8b96fa33a78f0ee6465342.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 738e2d0..a41eaf8 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -197,10 +197,10 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 197 | // Update the physical location and motion of the object. Called with data from Bullet. | 197 | // Update the physical location and motion of the object. Called with data from Bullet. |
| 198 | public abstract void UpdateProperties(EntityProperties entprop); | 198 | public abstract void UpdateProperties(EntityProperties entprop); |
| 199 | 199 | ||
| 200 | public abstract OMV.Vector3 RawPosition { get; set; } | 200 | public virtual OMV.Vector3 RawPosition { get; set; } |
| 201 | public abstract OMV.Vector3 ForcePosition { get; set; } | 201 | public abstract OMV.Vector3 ForcePosition { get; set; } |
| 202 | 202 | ||
| 203 | public abstract OMV.Quaternion RawOrientation { get; set; } | 203 | public virtual OMV.Quaternion RawOrientation { get; set; } |
| 204 | public abstract OMV.Quaternion ForceOrientation { get; set; } | 204 | public abstract OMV.Quaternion ForceOrientation { get; set; } |
| 205 | 205 | ||
| 206 | public OMV.Vector3 RawVelocity { get; set; } | 206 | public OMV.Vector3 RawVelocity { get; set; } |