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/Framework/Scenes/Scripting | |
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/Framework/Scenes/Scripting')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs index fd7ff96..93bbf32 100644 --- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs | |||
@@ -27,11 +27,15 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using log4net; | ||
31 | using System.Reflection; | ||
30 | 32 | ||
31 | namespace OpenSim.Region.Framework.Scenes.Scripting | 33 | namespace OpenSim.Region.Framework.Scenes.Scripting |
32 | { | 34 | { |
33 | public class NullScriptHost : IScriptHost | 35 | public class NullScriptHost : IScriptHost |
34 | { | 36 | { |
37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | |||
35 | private Vector3 m_pos = new Vector3(128, 128, 30); | 39 | private Vector3 m_pos = new Vector3(128, 128, 30); |
36 | 40 | ||
37 | public string Name | 41 | public string Name |
@@ -80,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes.Scripting | |||
80 | 84 | ||
81 | public void SetText(string text, Vector3 color, double alpha) | 85 | public void SetText(string text, Vector3 color, double alpha) |
82 | { | 86 | { |
83 | Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); | 87 | m_log.Warn("Tried to SetText "+text+" on NullScriptHost"); |
84 | } | 88 | } |
85 | } | 89 | } |
86 | } | 90 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs index 58228cc..79ffe44 100644 --- a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs | |||
@@ -87,10 +87,10 @@ namespace OpenSim.Region.Framework.Scenes.Scripting | |||
87 | //} | 87 | //} |
88 | 88 | ||
89 | 89 | ||
90 | //Console.WriteLine("Loading: " + FileName); | 90 | //m_log.Debug("Loading: " + FileName); |
91 | //foreach (Type _t in a.GetTypes()) | 91 | //foreach (Type _t in a.GetTypes()) |
92 | //{ | 92 | //{ |
93 | // Console.WriteLine("Type: " + _t.ToString()); | 93 | // m_log.Debug("Type: " + _t.ToString()); |
94 | //} | 94 | //} |
95 | 95 | ||
96 | Type t; | 96 | Type t; |