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/PhysXPlugin | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC_OLD-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/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 18935fb..5579848 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -32,6 +32,8 @@ using OpenSim.Framework; | |||
32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.Physics.Manager; |
33 | using PhysXWrapper; | 33 | using PhysXWrapper; |
34 | using Quaternion=OpenMetaverse.Quaternion; | 34 | using Quaternion=OpenMetaverse.Quaternion; |
35 | using System.Reflection; | ||
36 | using log4net; | ||
35 | 37 | ||
36 | namespace OpenSim.Region.Physics.PhysXPlugin | 38 | namespace OpenSim.Region.Physics.PhysXPlugin |
37 | { | 39 | { |
@@ -40,6 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
40 | /// </summary> | 42 | /// </summary> |
41 | public class PhysXPlugin : IPhysicsPlugin | 43 | public class PhysXPlugin : IPhysicsPlugin |
42 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | private PhysXScene _mScene; | 46 | private PhysXScene _mScene; |
44 | 47 | ||
45 | public PhysXPlugin() | 48 | public PhysXPlugin() |
@@ -72,6 +75,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
72 | 75 | ||
73 | public class PhysXScene : PhysicsScene | 76 | public class PhysXScene : PhysicsScene |
74 | { | 77 | { |
78 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
75 | private List<PhysXCharacter> _characters = new List<PhysXCharacter>(); | 79 | private List<PhysXCharacter> _characters = new List<PhysXCharacter>(); |
76 | private List<PhysXPrim> _prims = new List<PhysXPrim>(); | 80 | private List<PhysXPrim> _prims = new List<PhysXPrim>(); |
77 | private float[] _heightMap = null; | 81 | private float[] _heightMap = null; |
@@ -84,7 +88,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
84 | //sceneIdentifier = _sceneIdentifier; | 88 | //sceneIdentifier = _sceneIdentifier; |
85 | 89 | ||
86 | mySdk = NxPhysicsSDK.CreateSDK(); | 90 | mySdk = NxPhysicsSDK.CreateSDK(); |
87 | Console.WriteLine("Sdk created - now creating scene"); | 91 | m_log.Info("Sdk created - now creating scene"); |
88 | scene = mySdk.CreateScene(); | 92 | scene = mySdk.CreateScene(); |
89 | } | 93 | } |
90 | 94 | ||
@@ -174,7 +178,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
174 | } | 178 | } |
175 | catch (Exception e) | 179 | catch (Exception e) |
176 | { | 180 | { |
177 | Console.WriteLine(e.Message); | 181 | m_log.Error(e.Message); |
178 | } | 182 | } |
179 | return fps; | 183 | return fps; |
180 | } | 184 | } |
@@ -193,7 +197,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
193 | { | 197 | { |
194 | if (_heightMap != null) | 198 | if (_heightMap != null) |
195 | { | 199 | { |
196 | Console.WriteLine("PhysX - deleting old terrain"); | 200 | m_log.Debug("PhysX - deleting old terrain"); |
197 | scene.DeleteTerrain(); | 201 | scene.DeleteTerrain(); |
198 | } | 202 | } |
199 | _heightMap = heightMap; | 203 | _heightMap = heightMap; |