ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

shut up some pesty warnings

Browse Source
This commit is contained in:
UbitUmarov
2018-01-15 16:23:19 +00:00
parent 7a09a10f58
commit c92ba1cc04
15 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
View File

@@ -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()

1
OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
View File

@@ -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 */);

2
OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs
View File

@@ -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;

5
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -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);