aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/POSPlugin
diff options
context:
space:
mode:
authorMelanie2011-12-22 16:37:25 +0000
committerMelanie2011-12-22 16:37:25 +0000
commitb970d4f976ec7f264c33948c734a15a2dbf0ac7d (patch)
tree93a3365e4a8a32bdfce1ef92bafc02f79f98d449 /OpenSim/Region/Physics/POSPlugin
parentMerge branch 'master' into careminster (diff)
parentFixing a bug introduced yesterday. This put the precondition test inside Chec... (diff)
downloadopensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.zip
opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.gz
opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.bz2
opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin')
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSCharacter.cs6
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPrim.cs6
2 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index a70179b..ae534ea 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.Physics.POSPlugin
231 public override Vector3 Acceleration 231 public override Vector3 Acceleration
232 { 232 {
233 get { return _acceleration; } 233 get { return _acceleration; }
234 set { _acceleration = value; }
234 } 235 }
235 236
236 public override bool Kinematic 237 public override bool Kinematic
@@ -251,11 +252,6 @@ namespace OpenSim.Region.Physics.POSPlugin
251 { 252 {
252 } 253 }
253 254
254 public void SetAcceleration(Vector3 accel)
255 {
256 _acceleration = accel;
257 }
258
259 public override void AddForce(Vector3 force, bool pushforce) 255 public override void AddForce(Vector3 force, bool pushforce)
260 { 256 {
261 } 257 }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 9ba5ebb..2ea8bfc 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 }