Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.

4 files changed, 15 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 16e0efe..9991ab1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 m_pidControllerActive = false;
                 force *= 100f;
                 doForce(force);
-                //System.Console.WriteLine("Push!");
+                //m_log.Debug("Push!");
                 //_target_velocity.X += force.X;
                // _target_velocity.Y += force.Y;
                 //_target_velocity.Z += force.Z;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index bfb9b1a..6d07b92 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2507,7 +2507,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }
                     else
                     {
-                        //System.Console.WriteLine(Math.Abs(m_lastposition.X - l_position.X).ToString());
+                        //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
                         _zeroFlag = false;
                     }
 
@@ -2569,7 +2569,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             m_rotationalVelocity.setValues(rotvel.X, rotvel.Y, rotvel.Z);
                         }
 
-                        //System.Console.WriteLine("ODE: " + m_rotationalVelocity.ToString());
+                        //m_log.Debug("ODE: " + m_rotationalVelocity.ToString());
                         _orientation.X = ori.X;
                         _orientation.Y = ori.Y;
                         _orientation.Z = ori.Z;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
index c913639..6ee23db 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
@@ -31,12 +31,16 @@ using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Region.Physics.OdePlugin
 {
     [TestFixture]
     public class ODETestClass
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private OdePlugin cbt;
         private PhysicsScene ps;
         private IMeshingPlugin imp;
@@ -92,18 +96,18 @@ namespace OpenSim.Region.Physics.OdePlugin
                 Assert.That(oprim.m_targetSpace != (IntPtr)0);
 
                 //Assert.That(oprim.m_targetSpace == pscene.space);
-                Console.WriteLine("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
+                m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
 
                 Assert.That(!oprim.m_taintadd);
-                Console.WriteLine("Prim Position (" + oprim.m_localID +  "): " + prim.Position.ToString());
+                m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
 
                 // Make sure we're above the ground
                 //Assert.That(prim.Position.Z > 20f);
-                //Console.WriteLine("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
+                //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
 
                 // Make sure we've got a Body
                 Assert.That(oprim.Body != (IntPtr)0);
-                //Console.WriteLine(
+                //m_log.Info(
             }
 
             // Make sure we're not somewhere above the ground
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f30de4d..359e7b3 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             //if (id == d.GeomClassId.TriMeshClass)
             //{
                 //               m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2);
-                //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2);
+                //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
             //}
 
             // Figure out how many contact points we have
@@ -945,8 +945,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     // so lets throttle them and send them again after it's somewhat sorted out.
                     p2.ThrottleUpdates = true;
                 }
-                //System.Console.WriteLine(count.ToString());
-                //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2);
+                //m_log.Debug(count.ToString());
+                //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
             }
         }
 
@@ -2095,7 +2095,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             // convenient place to do it for now...
 
         //    //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
-        //    //Console.WriteLine("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
+        //    //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
             int iPropertiesNotSupportedDefault = 0;
 
             if (pbs.SculptEntry && !meshSculptedPrim)