aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorRobert Adams2012-10-01 08:27:26 -0700
committerRobert Adams2012-10-02 11:13:20 -0700
commit5221f2421e2a9b7dcc1a1e0e8cccaf1c9c94d2e2 (patch)
treea091808ef8bcf7262614bcdc12ed0d85d319a9b0 /OpenSim/Region/Physics
parentAdd money event routing to the script engine. (diff)
downloadopensim-SC_OLD-5221f2421e2a9b7dcc1a1e0e8cccaf1c9c94d2e2.zip
opensim-SC_OLD-5221f2421e2a9b7dcc1a1e0e8cccaf1c9c94d2e2.tar.gz
opensim-SC_OLD-5221f2421e2a9b7dcc1a1e0e8cccaf1c9c94d2e2.tar.bz2
opensim-SC_OLD-5221f2421e2a9b7dcc1a1e0e8cccaf1c9c94d2e2.tar.xz
BulletSim: remove warnings for unused variables.
Diffstat (limited to 'OpenSim/Region/Physics')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs17
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs2
3 files changed, 7 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 4f225ae..a7aaf9b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
34{ 34{
35public class BSLinkset 35public class BSLinkset
36{ 36{
37 private static string LogHeader = "[BULLETSIM LINKSET]"; 37 // private static string LogHeader = "[BULLETSIM LINKSET]";
38 38
39 public BSPhysObject LinksetRoot { get; protected set; } 39 public BSPhysObject LinksetRoot { get; protected set; }
40 40
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index a0e627e..e54bf75 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -46,19 +46,13 @@ public sealed class BSPrim : BSPhysObject
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private static readonly string LogHeader = "[BULLETS PRIM]"; 47 private static readonly string LogHeader = "[BULLETS PRIM]";
48 48
49 private IMesh _mesh;
50 private PrimitiveBaseShape _pbs; 49 private PrimitiveBaseShape _pbs;
51 private ShapeData.PhysicsShapeType _shapeType;
52 private ulong _meshKey;
53 private ulong _hullKey;
54 private List<ConvexResult> _hulls;
55 50
56 // _size is what the user passed. _scale is what we pass to the physics engine with the mesh. 51 // _size is what the user passed. _scale is what we pass to the physics engine with the mesh.
57 // Often _scale is unity because the meshmerizer will apply _size when creating the mesh. 52 // Often _scale is unity because the meshmerizer will apply _size when creating the mesh.
58 private OMV.Vector3 _size; // the multiplier for each mesh dimension as passed by the user 53 private OMV.Vector3 _size; // the multiplier for each mesh dimension as passed by the user
59 private OMV.Vector3 _scale; // the multiplier for each mesh dimension for the mesh as created by the meshmerizer 54 private OMV.Vector3 _scale; // the multiplier for each mesh dimension for the mesh as created by the meshmerizer
60 55
61 private bool _stopped;
62 private bool _grabbed; 56 private bool _grabbed;
63 private bool _isSelected; 57 private bool _isSelected;
64 private bool _isVolumeDetect; 58 private bool _isVolumeDetect;
@@ -109,8 +103,6 @@ public sealed class BSPrim : BSPhysObject
109 _buoyancy = 1f; 103 _buoyancy = 1f;
110 _velocity = OMV.Vector3.Zero; 104 _velocity = OMV.Vector3.Zero;
111 _rotationalVelocity = OMV.Vector3.Zero; 105 _rotationalVelocity = OMV.Vector3.Zero;
112 _hullKey = 0;
113 _meshKey = 0;
114 _pbs = pbs; 106 _pbs = pbs;
115 _isPhysical = pisPhysical; 107 _isPhysical = pisPhysical;
116 _isVolumeDetect = false; 108 _isVolumeDetect = false;
@@ -160,8 +152,9 @@ public sealed class BSPrim : BSPhysObject
160 }); 152 });
161 } 153 }
162 154
155 // No one uses this property.
163 public override bool Stopped { 156 public override bool Stopped {
164 get { return _stopped; } 157 get { return false; }
165 } 158 }
166 public override OMV.Vector3 Size { 159 public override OMV.Vector3 Size {
167 get { return _size; } 160 get { return _size; }
@@ -1082,15 +1075,15 @@ public sealed class BSPrim : BSPhysObject
1082 public void FillShapeInfo(out ShapeData shape) 1075 public void FillShapeInfo(out ShapeData shape)
1083 { 1076 {
1084 shape.ID = LocalID; 1077 shape.ID = LocalID;
1085 shape.Type = _shapeType; 1078 shape.Type = ShapeData.PhysicsShapeType.SHAPE_UNKNOWN;
1086 shape.Position = _position; 1079 shape.Position = _position;
1087 shape.Rotation = _orientation; 1080 shape.Rotation = _orientation;
1088 shape.Velocity = _velocity; 1081 shape.Velocity = _velocity;
1089 shape.Scale = _scale; 1082 shape.Scale = _scale;
1090 shape.Mass = _isPhysical ? _mass : 0f; 1083 shape.Mass = _isPhysical ? _mass : 0f;
1091 shape.Buoyancy = _buoyancy; 1084 shape.Buoyancy = _buoyancy;
1092 shape.HullKey = _hullKey; 1085 shape.HullKey = 0;
1093 shape.MeshKey = _meshKey; 1086 shape.MeshKey = 0;
1094 shape.Friction = _friction; 1087 shape.Friction = _friction;
1095 shape.Restitution = _restitution; 1088 shape.Restitution = _restitution;
1096 shape.Collidable = (!IsPhantom) ? ShapeData.numericTrue : ShapeData.numericFalse; 1089 shape.Collidable = (!IsPhantom) ? ShapeData.numericTrue : ShapeData.numericFalse;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index dee6243..a86bf8a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
36{ 36{
37public class BSShapeCollection : IDisposable 37public class BSShapeCollection : IDisposable
38{ 38{
39 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]"; 39 // private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
40 40
41 protected BSScene PhysicsScene { get; set; } 41 protected BSScene PhysicsScene { get; set; }
42 42