Clean up logging calls using String.Format explicitly

This commit is contained in:
Jeff Ames
2008-02-10 01:57:59 +00:00
parent 523284c32a
commit e207284fef
35 changed files with 222 additions and 233 deletions

View File

@@ -67,7 +67,7 @@ namespace OpenSim.Region.Physics.Manager
}
else
{
m_log.Warn(String.Format("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName));
m_log.WarnFormat("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName);
throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName));
}

View File

@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
{
m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position));
m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
/*
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
{
m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size));
m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
*/
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
PhysicsVector size, Quaternion rotation, bool isPhysical)
{
m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size));
m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.Manager
public override void SetTerrain(float[] heightMap)
{
m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length));
m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
public override void DeleteTerrain()

View File

@@ -245,7 +245,7 @@ namespace OpenSim.Region.Physics.Meshing
// Calculated separately to avoid errors
cutHull.AddVertex(legEnd);
//m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName));
//m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
outerHull = cuttedHull;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Physics.Meshing
// Calculated separately to avoid errors
cutHull.AddVertex(legEnd);
m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName));
m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
outerHull = cuttedHull;

View File

@@ -246,8 +246,8 @@ namespace OpenSim.Region.Physics.Meshing
bool intersects = false;
//m_log.Debug("State before intersection detection");
//m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
//m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
//m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
//m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
{
int iBase, iOther;
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Physics.Meshing
}
//m_log.Debug("State after intersection detection for the base hull");
//m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
//m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
{
int iOther, iBase;
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Physics.Meshing
}
//m_log.Debug("State after intersection detection for the base hull");
//m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
//m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone);
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
done = true;
}
//m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString()));
//m_log.DebugFormat("The resulting Hull is:\n{1}", 0, result.ToString());
return result;
}