aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC_OLD-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 'OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
index f482834..2846399 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
48 [Serializable] 48 [Serializable]
49 public class ScriptManager 49 public class ScriptManager
50 { 50 {
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
52
51 #region Declares 53 #region Declares
52 54
53 private Thread scriptLoadUnloadThread; 55 private Thread scriptLoadUnloadThread;
@@ -312,7 +314,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
312 } 314 }
313 catch (Exception e) 315 catch (Exception e)
314 { 316 {
315 //m_scriptEngine.Log.Error("ScriptEngine", "Error compiling script: " + e.ToString()); 317 //m_scriptEngine.m_log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
316 try 318 try
317 { 319 {
318 // DISPLAY ERROR INWORLD 320 // DISPLAY ERROR INWORLD
@@ -323,7 +325,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
323 } 325 }
324 catch (Exception e2) 326 catch (Exception e2)
325 { 327 {
326 m_scriptEngine.Log.Error("ScriptEngine", "Error displaying error in-world: " + e2.ToString()); 328 m_scriptEngine.m_log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString());
327 } 329 }
328 } 330 }
329 } 331 }
@@ -384,7 +386,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
384 internal void ExecuteEvent(uint localID, LLUUID itemID, string FunctionName, object[] args) 386 internal void ExecuteEvent(uint localID, LLUUID itemID, string FunctionName, object[] args)
385 { 387 {
386 // Execute a function in the script 388 // Execute a function in the script
387 //m_scriptEngine.Log.Verbose("ScriptEngine", "Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName); 389 //m_scriptEngine.m_log.Info("[ScriptEngine]: Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName);
388 LSL_BaseClass Script = m_scriptEngine.m_ScriptManager.GetScript(localID, itemID); 390 LSL_BaseClass Script = m_scriptEngine.m_ScriptManager.GetScript(localID, itemID);
389 if (Script == null) 391 if (Script == null)
390 return; 392 return;