aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-03-29 04:30:19 +0000
committerJeff Ames2008-03-29 04:30:19 +0000
commit86128ba4d40578e3d721a82639b36f76aa55a792 (patch)
tree8f725781d443d934e80beb64f330fa63e497a06f /OpenSim/Region
parentSet svn:eol-style. (diff)
downloadopensim-SC_OLD-86128ba4d40578e3d721a82639b36f76aa55a792.zip
opensim-SC_OLD-86128ba4d40578e3d721a82639b36f76aa55a792.tar.gz
opensim-SC_OLD-86128ba4d40578e3d721a82639b36f76aa55a792.tar.bz2
opensim-SC_OLD-86128ba4d40578e3d721a82639b36f76aa55a792.tar.xz
Fix compiler warnings in BulletXPlugin.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs36
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index abbcd7c..6cc7ff4 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -253,13 +253,13 @@ namespace OpenSim.Region.Physics.BulletXPlugin
253 relatedScene._characters.TryGetValue(rb, out bxcA); 253 relatedScene._characters.TryGetValue(rb, out bxcA);
254 relatedScene._prims.TryGetValue(rb, out bxpA); 254 relatedScene._prims.TryGetValue(rb, out bxpA);
255 } 255 }
256 String nameA; 256// String nameA;
257 if (bxcA != null) 257// if (bxcA != null)
258 nameA = bxcA._name; 258// nameA = bxcA._name;
259 else if (bxpA != null) 259// else if (bxpA != null)
260 nameA = bxpA._name; 260// nameA = bxpA._name;
261 else 261// else
262 nameA = "null"; 262// nameA = "null";
263 263
264 BulletXCharacter bxcB = null; 264 BulletXCharacter bxcB = null;
265 BulletXPrim bxpB = null; 265 BulletXPrim bxpB = null;
@@ -270,13 +270,13 @@ namespace OpenSim.Region.Physics.BulletXPlugin
270 relatedScene._characters.TryGetValue(rb, out bxcB); 270 relatedScene._characters.TryGetValue(rb, out bxcB);
271 relatedScene._prims.TryGetValue(rb, out bxpB); 271 relatedScene._prims.TryGetValue(rb, out bxpB);
272 } 272 }
273 String nameB; 273// String nameB;
274 if (bxcB != null) 274// if (bxcB != null)
275 nameB = bxcB._name; 275// nameB = bxcB._name;
276 else if (bxpB != null) 276// else if (bxpB != null)
277 nameB = bxpB._name; 277// nameB = bxpB._name;
278 else 278// else
279 nameB = "null"; 279// nameB = "null";
280 280
281 bool needsCollision = base.NeedsCollision(bodyA, bodyB); 281 bool needsCollision = base.NeedsCollision(bodyA, bodyB);
282 282
@@ -1478,8 +1478,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin
1478 internal class BulletXPlanet 1478 internal class BulletXPlanet
1479 { 1479 {
1480 private PhysicsVector _staticPosition; 1480 private PhysicsVector _staticPosition;
1481 private PhysicsVector _staticVelocity; 1481// private PhysicsVector _staticVelocity;
1482 private AxiomQuaternion _staticOrientation; 1482// private AxiomQuaternion _staticOrientation;
1483 private float _mass; 1483 private float _mass;
1484 private BulletXScene _parentscene; 1484 private BulletXScene _parentscene;
1485 internal float[] _heightField; 1485 internal float[] _heightField;
@@ -1493,8 +1493,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin
1493 internal BulletXPlanet(BulletXScene parent_scene, float[] heightField) 1493 internal BulletXPlanet(BulletXScene parent_scene, float[] heightField)
1494 { 1494 {
1495 _staticPosition = new PhysicsVector(BulletXScene.MaxXY/2, BulletXScene.MaxXY/2, 0); 1495 _staticPosition = new PhysicsVector(BulletXScene.MaxXY/2, BulletXScene.MaxXY/2, 0);
1496 _staticVelocity = new PhysicsVector(); 1496// _staticVelocity = new PhysicsVector();
1497 _staticOrientation = AxiomQuaternion.Identity; 1497// _staticOrientation = AxiomQuaternion.Identity;
1498 _mass = 0; //No active 1498 _mass = 0; //No active
1499 _parentscene = parent_scene; 1499 _parentscene = parent_scene;
1500 _heightField = heightField; 1500 _heightField = heightField;