aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs')
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 4896359..cad66d7 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -182,6 +182,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
182 private PhysicsVector _acceleration; 182 private PhysicsVector _acceleration;
183 private NxCharacter _character; 183 private NxCharacter _character;
184 private bool flying; 184 private bool flying;
185 private bool iscolliding = false;
185 private float gravityAccel; 186 private float gravityAccel;
186 187
187 public PhysXCharacter(NxCharacter character) 188 public PhysXCharacter(NxCharacter character)
@@ -197,6 +198,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
197 get { return flying; } 198 get { return flying; }
198 set { flying = value; } 199 set { flying = value; }
199 } 200 }
201 public override bool IsColliding
202 {
203 get { return iscolliding; }
204 set { iscolliding = value; }
205 }
200 206
201 public override PhysicsVector Position 207 public override PhysicsVector Position
202 { 208 {
@@ -305,7 +311,14 @@ namespace OpenSim.Region.Physics.PhysXPlugin
305 } 311 }
306 set { } 312 set { }
307 } 313 }
308 314 public override bool IsColliding
315 {
316 get
317 {
318 return false; //no flying prims for you
319 }
320 set { }
321 }
309 public override PhysicsVector Position 322 public override PhysicsVector Position
310 { 323 {
311 get 324 get
@@ -379,4 +392,4 @@ namespace OpenSim.Region.Physics.PhysXPlugin
379 { 392 {
380 } 393 }
381 } 394 }
382} \ No newline at end of file 395}