OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler warnings in BulletXPlugin.

0.6.0-stable
Jeff Ames 2008-03-29 04:30:19 +00:00
parent bf7ef8c41a
commit 86128ba4d4
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
View File

@ -253,13 +253,13 @@ namespace OpenSim.Region.Physics.BulletXPlugin
relatedScene._characters.TryGetValue(rb, out bxcA); relatedScene._characters.TryGetValue(rb, out bxcA);
relatedScene._prims.TryGetValue(rb, out bxpA); relatedScene._prims.TryGetValue(rb, out bxpA);
} }
String nameA; // String nameA;
if (bxcA != null) // if (bxcA != null)
nameA = bxcA._name; // nameA = bxcA._name;
else if (bxpA != null) // else if (bxpA != null)
nameA = bxpA._name; // nameA = bxpA._name;
else // else
nameA = "null"; // nameA = "null";
BulletXCharacter bxcB = null; BulletXCharacter bxcB = null;
BulletXPrim bxpB = null; BulletXPrim bxpB = null;
@ -270,13 +270,13 @@ namespace OpenSim.Region.Physics.BulletXPlugin
relatedScene._characters.TryGetValue(rb, out bxcB); relatedScene._characters.TryGetValue(rb, out bxcB);
relatedScene._prims.TryGetValue(rb, out bxpB); relatedScene._prims.TryGetValue(rb, out bxpB);
} }
String nameB; // String nameB;
if (bxcB != null) // if (bxcB != null)
nameB = bxcB._name; // nameB = bxcB._name;
else if (bxpB != null) // else if (bxpB != null)
nameB = bxpB._name; // nameB = bxpB._name;
else // else
nameB = "null"; // nameB = "null";
bool needsCollision = base.NeedsCollision(bodyA, bodyB); bool needsCollision = base.NeedsCollision(bodyA, bodyB);
@ -1478,8 +1478,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin
internal class BulletXPlanet internal class BulletXPlanet
{ {
private PhysicsVector _staticPosition; private PhysicsVector _staticPosition;
private PhysicsVector _staticVelocity; // private PhysicsVector _staticVelocity;
private AxiomQuaternion _staticOrientation; // private AxiomQuaternion _staticOrientation;
private float _mass; private float _mass;
private BulletXScene _parentscene; private BulletXScene _parentscene;
internal float[] _heightField; internal float[] _heightField;
@ -1493,8 +1493,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin
internal BulletXPlanet(BulletXScene parent_scene, float[] heightField) internal BulletXPlanet(BulletXScene parent_scene, float[] heightField)
{ {
_staticPosition = new PhysicsVector(BulletXScene.MaxXY/2, BulletXScene.MaxXY/2, 0); _staticPosition = new PhysicsVector(BulletXScene.MaxXY/2, BulletXScene.MaxXY/2, 0);
_staticVelocity = new PhysicsVector(); // _staticVelocity = new PhysicsVector();
_staticOrientation = AxiomQuaternion.Identity; // _staticOrientation = AxiomQuaternion.Identity;
_mass = 0; //No active _mass = 0; //No active
_parentscene = parent_scene; _parentscene = parent_scene;
_heightField = heightField; _heightField = heightField;