shut up some pesty warnings

4 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
index 2a1ae45..5ce1515 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
         {
 //            Console.WriteLine("Simulating");
 
-            float fps = 0;
+            float fps = 1.0f / timeStep;
             for (int i = 0; i < _actors.Count; ++i)
             {
                 BasicActor actor = _actors[i];
@@ -226,7 +226,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
                 actor.Velocity = actorVelocity;
             }
 
-            return 1.0f;
+            return fps;
         }
 
         public override void GetResults()
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
index d182c34..2ca7dbc 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
@@ -92,6 +92,7 @@ public sealed class BSCharacter : BSPhysObject
         Density = BSParam.AvatarDensity;
         _isPhysical = true;
 
+        _footOffset = footOffset;
         // Adjustments for zero X and Y made in Size()
         // This also computes avatar scale, volume, and mass
         SetAvatarSize(size, footOffset, true /* initializing */);
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs
index bfa95c1..a6f587e 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS.Tests
         BSScene _physicsScene { get; set; }
         BSPrim _targetSphere { get; set; }
         Vector3 _targetSpherePosition { get; set; }
-        float _simulationTimeStep = 0.089f;
+//        float _simulationTimeStep = 0.089f;
 
         uint _targetLocalID = 123;
 
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 032d4ed..451345f 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             faces = new List<Face>();
             OSD meshOsd = null;
 
-            if (primShape.SculptData == null || primShape.SculptData.Length <= 0)
+            if (primShape.SculptData.Length <= 0)
             {
 //                m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
                 return false;
@@ -363,7 +363,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 catch (Exception e)
                 {
                     m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
-                    return false;
                 }
 
                 start = data.Position;
@@ -1383,7 +1382,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                     {
                         File.Delete(filename);
                     }
-                    catch (IOException e)
+                    catch (IOException)
                     {
                          m_log.ErrorFormat(
                         "[MESH CACHE]: Failed to delete file {0}",filename);