diff options
author | Diva Canto | 2011-12-21 15:17:44 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-21 15:17:44 -0800 |
commit | bb0c6a498bfbd5fe42b287e5b79b15a887b88600 (patch) | |
tree | cc97171a5264a64dad3ece91e0f090ea4cf45d9d /OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |
parent | Moved an external test into the method that uses those preconditions. (diff) | |
parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
download | opensim-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/POSPlugin/POSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index 91ec3df..e4fd7eb 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
@@ -193,6 +193,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
193 | public override Vector3 Acceleration | 193 | public override Vector3 Acceleration |
194 | { | 194 | { |
195 | get { return _acceleration; } | 195 | get { return _acceleration; } |
196 | set { _acceleration = value; } | ||
196 | } | 197 | } |
197 | 198 | ||
198 | public override bool Kinematic | 199 | public override bool Kinematic |
@@ -201,11 +202,6 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
201 | set { } | 202 | set { } |
202 | } | 203 | } |
203 | 204 | ||
204 | public void SetAcceleration(Vector3 accel) | ||
205 | { | ||
206 | _acceleration = accel; | ||
207 | } | ||
208 | |||
209 | public override void AddForce(Vector3 force, bool pushforce) | 205 | public override void AddForce(Vector3 force, bool pushforce) |
210 | { | 206 | { |
211 | } | 207 | } |