aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ScriptEngine
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/ScriptEngine
parentAllow delivery of object messages gridwide (diff)
downloadopensim-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/ScriptEngine')
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs4
-rw-r--r--OpenSim/ScriptEngine/Shared/EventParams.cs12
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
index 93f29d7..3259686 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
@@ -108,7 +108,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
108 // ilgen.Emit(OpCodes.Call, typeof(string).GetMethod 108 // ilgen.Emit(OpCodes.Call, typeof(string).GetMethod
109 //("Format", new Type[] { typeof(string), typeof(object) })); 109 //("Format", new Type[] { typeof(string), typeof(object) }));
110 110
111 // // Console.WriteLine("Hello, World!"); 111 // // m_log.Debug("Hello, World!");
112 // // 112 // //
113 // ilgen.Emit(OpCodes.Call, typeof(Console).GetMethod 113 // ilgen.Emit(OpCodes.Call, typeof(Console).GetMethod
114 // ("WriteLine", new Type[] { typeof(string) })); 114 // ("WriteLine", new Type[] { typeof(string) }));
@@ -237,4 +237,4 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
237 //string a = ""; 237 //string a = "";
238 } 238 }
239 } 239 }
240} \ No newline at end of file 240}
diff --git a/OpenSim/ScriptEngine/Shared/EventParams.cs b/OpenSim/ScriptEngine/Shared/EventParams.cs
index 0962aec..28eaa58 100644
--- a/OpenSim/ScriptEngine/Shared/EventParams.cs
+++ b/OpenSim/ScriptEngine/Shared/EventParams.cs
@@ -30,6 +30,8 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Region.ScriptEngine.Shared; 32using OpenSim.Region.ScriptEngine.Shared;
33using log4net;
34using System.Reflection;
33 35
34namespace OpenSim.ScriptEngine.Shared 36namespace OpenSim.ScriptEngine.Shared
35{ 37{
@@ -38,6 +40,7 @@ namespace OpenSim.ScriptEngine.Shared
38 /// </summary> 40 /// </summary>
39 public class EventParams 41 public class EventParams
40 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 public string EventName; 44 public string EventName;
42 public Object[] Params; 45 public Object[] Params;
43 public Region.ScriptEngine.Shared.DetectParams[] DetectParams; 46 public Region.ScriptEngine.Shared.DetectParams[] DetectParams;
@@ -66,9 +69,14 @@ namespace OpenSim.ScriptEngine.Shared
66 } 69 }
67 public void test2(string functionName, params object[] args) 70 public void test2(string functionName, params object[] args)
68 { 71 {
69 System.Console.WriteLine(functionName, args); 72 String logMessage = functionName;
73 foreach (object arg in args)
74 {
75 logMessage +=", "+arg;
76 }
77 m_log.Debug(logMessage);
70 } 78 }
71 79
72 80
73 } 81 }
74} \ No newline at end of file 82}