diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
579 | //if (id == d.GeomClassId.TriMeshClass) | 579 | //if (id == d.GeomClassId.TriMeshClass) |
580 | //{ | 580 | //{ |
581 | // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2); | 581 | // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2); |
582 | //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); | 582 | //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2); |
583 | //} | 583 | //} |
584 | 584 | ||
585 | // Figure out how many contact points we have | 585 | // Figure out how many contact points we have |
@@ -945,8 +945,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
945 | // so lets throttle them and send them again after it's somewhat sorted out. | 945 | // so lets throttle them and send them again after it's somewhat sorted out. |
946 | p2.ThrottleUpdates = true; | 946 | p2.ThrottleUpdates = true; |
947 | } | 947 | } |
948 | //System.Console.WriteLine(count.ToString()); | 948 | //m_log.Debug(count.ToString()); |
949 | //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); | 949 | //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2); |
950 | } | 950 | } |
951 | } | 951 | } |
952 | 952 | ||
@@ -2095,7 +2095,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2095 | // convenient place to do it for now... | 2095 | // convenient place to do it for now... |
2096 | 2096 | ||
2097 | // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f) | 2097 | // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f) |
2098 | // //Console.WriteLine("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString()); | 2098 | // //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString()); |
2099 | int iPropertiesNotSupportedDefault = 0; | 2099 | int iPropertiesNotSupportedDefault = 0; |
2100 | 2100 | ||
2101 | if (pbs.SculptEntry && !meshSculptedPrim) | 2101 | if (pbs.SculptEntry && !meshSculptedPrim) |