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/ScriptEngine/DotNetEngine | |
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 '')
3 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs index 31c0d4d..2ebc8b7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
314 | // Do we have any scripts in this object at all? If not, return | 314 | // Do we have any scripts in this object at all? If not, return |
315 | if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) | 315 | if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) |
316 | { | 316 | { |
317 | //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); | 317 | //m_log.Debug("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); |
318 | return false; | 318 | return false; |
319 | } | 319 | } |
320 | 320 | ||
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs index c157509..d1d9027 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
181 | if (DateTime.Now.Ticks - Last_ReReadConfigFilens > | 181 | if (DateTime.Now.Ticks - Last_ReReadConfigFilens > |
182 | m_ScriptEngine.RefreshConfigFilens) | 182 | m_ScriptEngine.RefreshConfigFilens) |
183 | { | 183 | { |
184 | //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens); | 184 | //m_log.Debug("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens); |
185 | // Its time to re-read config file | 185 | // Its time to re-read config file |
186 | m_ScriptEngine.ReadConfig(); | 186 | m_ScriptEngine.ReadConfig(); |
187 | Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time | 187 | Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index c1902ba..bdf80c6 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -45,9 +45,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
45 | [Serializable] | 45 | [Serializable] |
46 | public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule | 46 | public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule |
47 | { | 47 | { |
48 | private static readonly ILog m_log = | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | LogManager.GetLogger( | ||
50 | MethodBase.GetCurrentMethod().DeclaringType); | ||
51 | 49 | ||
52 | public static List<ScriptEngine> ScriptEngines = | 50 | public static List<ScriptEngine> ScriptEngines = |
53 | new List<ScriptEngine>(); | 51 | new List<ScriptEngine>(); |
@@ -265,7 +263,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
265 | } | 263 | } |
266 | catch (AppDomainUnloadedException) | 264 | catch (AppDomainUnloadedException) |
267 | { | 265 | { |
268 | Console.WriteLine("[SCRIPT]: state change called when "+ | 266 | m_log.Error("[SCRIPT]: state change called when "+ |
269 | "script was unloaded. Nothing to worry about, "+ | 267 | "script was unloaded. Nothing to worry about, "+ |
270 | "but noting the occurance"); | 268 | "but noting the occurance"); |
271 | } | 269 | } |
@@ -285,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
285 | } | 283 | } |
286 | catch (AppDomainUnloadedException) | 284 | catch (AppDomainUnloadedException) |
287 | { | 285 | { |
288 | Console.WriteLine("[SCRIPT]: state change called when "+ | 286 | m_log.Error("[SCRIPT]: state change called when "+ |
289 | "script was unloaded. Nothing to worry about, but "+ | 287 | "script was unloaded. Nothing to worry about, but "+ |
290 | "noting the occurance"); | 288 | "noting the occurance"); |
291 | } | 289 | } |