aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJeff Ames2008-02-10 01:57:59 +0000
committerJeff Ames2008-02-10 01:57:59 +0000
commite207284fefa60637e35405ebc87e5e151bd2eabd (patch)
tree6e9954502ea44fe8f6327cb65cfd0026c3322578 /OpenSim/Region/Physics
parentSet svn:ignore in OpenSim/Tests. (diff)
downloadopensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.zip
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.gz
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.bz2
opensim-SC_OLD-e207284fefa60637e35405ebc87e5e151bd2eabd.tar.xz
Clean up logging calls using String.Format explicitly
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs8
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs10
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index acaa389b..82eef35 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Physics.Manager
67 } 67 }
68 else 68 else
69 { 69 {
70 m_log.Warn(String.Format("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName)); 70 m_log.WarnFormat("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName);
71 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName)); 71 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName));
72 } 72 }
73 73
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index bd2ad99..00c0ff1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
95 95
96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
97 { 97 {
98 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position)); 98 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
99 return PhysicsActor.Null; 99 return PhysicsActor.Null;
100 } 100 }
101 101
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
110/* 110/*
111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
112 { 112 {
113 m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size)); 113 m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
114 return PhysicsActor.Null; 114 return PhysicsActor.Null;
115 } 115 }
116*/ 116*/
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
125 PhysicsVector size, Quaternion rotation, bool isPhysical) 125 PhysicsVector size, Quaternion rotation, bool isPhysical)
126 { 126 {
127 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size)); 127 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
128 return PhysicsActor.Null; 128 return PhysicsActor.Null;
129 } 129 }
130 130
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.Manager
146 146
147 public override void SetTerrain(float[] heightMap) 147 public override void SetTerrain(float[] heightMap)
148 { 148 {
149 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length)); 149 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
150 } 150 }
151 151
152 public override void DeleteTerrain() 152 public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 641e25d..a394ffb 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Physics.Meshing
245 // Calculated separately to avoid errors 245 // Calculated separately to avoid errors
246 cutHull.AddVertex(legEnd); 246 cutHull.AddVertex(legEnd);
247 247
248 //m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName)); 248 //m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
249 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull); 249 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
250 250
251 outerHull = cuttedHull; 251 outerHull = cuttedHull;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Physics.Meshing
520 // Calculated separately to avoid errors 520 // Calculated separately to avoid errors
521 cutHull.AddVertex(legEnd); 521 cutHull.AddVertex(legEnd);
522 522
523 m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName)); 523 m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
524 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull); 524 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
525 525
526 outerHull = cuttedHull; 526 outerHull = cuttedHull;
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index e9cce3b..91df98f 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -246,8 +246,8 @@ namespace OpenSim.Region.Physics.Meshing
246 bool intersects = false; 246 bool intersects = false;
247 247
248 //m_log.Debug("State before intersection detection"); 248 //m_log.Debug("State before intersection detection");
249 //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); 249 //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
250 //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); 250 //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
251 251
252 { 252 {
253 int iBase, iOther; 253 int iBase, iOther;
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Physics.Meshing
277 } 277 }
278 278
279 //m_log.Debug("State after intersection detection for the base hull"); 279 //m_log.Debug("State after intersection detection for the base hull");
280 //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); 280 //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
281 281
282 { 282 {
283 int iOther, iBase; 283 int iOther, iBase;
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Physics.Meshing
306 } 306 }
307 307
308 //m_log.Debug("State after intersection detection for the base hull"); 308 //m_log.Debug("State after intersection detection for the base hull");
309 //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); 309 //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
310 310
311 311
312 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); 312 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone);
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
389 done = true; 389 done = true;
390 } 390 }
391 391
392 //m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString())); 392 //m_log.DebugFormat("The resulting Hull is:\n{1}", 0, result.ToString());
393 393
394 return result; 394 return result;
395 } 395 }