diff options
| author | Melanie | 2011-12-22 16:37:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:37:25 +0000 |
| commit | b970d4f976ec7f264c33948c734a15a2dbf0ac7d (patch) | |
| tree | 93a3365e4a8a32bdfce1ef92bafc02f79f98d449 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixing a bug introduced yesterday. This put the precondition test inside Chec... (diff) | |
| download | opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.zip opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.gz opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.bz2 opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 8782e62..898436b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -417,7 +417,8 @@ public sealed class BSPrim : PhysicsActor | |||
| 417 | } | 417 | } |
| 418 | } | 418 | } |
| 419 | public override OMV.Vector3 Acceleration { | 419 | public override OMV.Vector3 Acceleration { |
| 420 | get { return _acceleration; } | 420 | get { return _acceleration; } |
| 421 | set { _acceleration = value; } | ||
| 421 | } | 422 | } |
| 422 | public override OMV.Quaternion Orientation { | 423 | public override OMV.Quaternion Orientation { |
| 423 | get { return _orientation; } | 424 | get { return _orientation; } |