aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorDiva Canto2011-12-21 15:17:44 -0800
committerDiva Canto2011-12-21 15:17:44 -0800
commitbb0c6a498bfbd5fe42b287e5b79b15a887b88600 (patch)
treecc97171a5264a64dad3ece91e0f090ea4cf45d9d /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentMoved an external test into the method that uses those preconditions. (diff)
parentRemove unused SetAcceleration and add set on Acceleration parameter (diff)
downloadopensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.zip
opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.gz
opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.bz2
opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs3
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; }