diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 93ba29e..690e9d3 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -37,6 +37,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
37 | { | 37 | { |
38 | public class OdePrim : PhysicsActor | 38 | public class OdePrim : PhysicsActor |
39 | { | 39 | { |
40 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
41 | |||
40 | public PhysicsVector _position; | 42 | public PhysicsVector _position; |
41 | private PhysicsVector _velocity; | 43 | private PhysicsVector _velocity; |
42 | private PhysicsVector m_lastVelocity = new PhysicsVector(0.0f, 0.0f, 0.0f); | 44 | private PhysicsVector m_lastVelocity = new PhysicsVector(0.0f, 0.0f, 0.0f); |
@@ -530,7 +532,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
530 | } | 532 | } |
531 | else | 533 | else |
532 | { | 534 | { |
533 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Failed to load a sphere bad size"); | 535 | m_log.Info("[PHYSICS]: Failed to load a sphere bad size"); |
534 | _parent_scene.waitForSpaceUnlock(m_targetSpace); | 536 | _parent_scene.waitForSpaceUnlock(m_targetSpace); |
535 | prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); | 537 | prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); |
536 | } | 538 | } |
@@ -683,7 +685,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
683 | { | 685 | { |
684 | lock (m_forcelist) | 686 | lock (m_forcelist) |
685 | { | 687 | { |
686 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "dequeing forcelist"); | 688 | //m_log.Info("[PHYSICS]: dequeing forcelist"); |
687 | if (IsPhysical) | 689 | if (IsPhysical) |
688 | { | 690 | { |
689 | PhysicsVector iforce = new PhysicsVector(); | 691 | PhysicsVector iforce = new PhysicsVector(); |
@@ -747,7 +749,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
747 | get { return _position; } | 749 | get { return _position; } |
748 | 750 | ||
749 | set { _position = value; | 751 | set { _position = value; |
750 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", _position.ToString()); | 752 | //m_log.Info("[PHYSICS]: " + _position.ToString()); |
751 | } | 753 | } |
752 | } | 754 | } |
753 | 755 | ||
@@ -824,7 +826,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
824 | { | 826 | { |
825 | m_forcelist.Add(force); | 827 | m_forcelist.Add(force); |
826 | m_taintforce = true; | 828 | m_taintforce = true; |
827 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Added Force:" + force.ToString() + " to prim at " + Position.ToString()); | 829 | //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() + " to prim at " + Position.ToString()); |
828 | } | 830 | } |
829 | 831 | ||
830 | public override PhysicsVector RotationalVelocity | 832 | public override PhysicsVector RotationalVelocity |