aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs14
2 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index df28d7d..f6d2b82 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -82,9 +82,10 @@ namespace OpenSim.Region.ScriptEngine.Common
82 82
83 string EventName = m_Script.State() + "_event_" + FunctionName; 83 string EventName = m_Script.State() + "_event_" + FunctionName;
84 84
85#if DEBUG 85//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
86 Console.WriteLine("ScriptEngine: Script event function name: " + EventName); 86///#if DEBUG
87#endif 87/// Console.WriteLine("ScriptEngine: Script event function name: " + EventName);
88///#endif
88 89
89 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); 90 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args);
90 91
@@ -116,9 +117,10 @@ namespace OpenSim.Region.ScriptEngine.Common
116 return; 117 return;
117 } 118 }
118 119
119#if DEBUG 120//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
120 Console.WriteLine("ScriptEngine: Executing function name: " + EventName); 121///#if DEBUG
121#endif 122/// Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
123///#endif
122 // Found 124 // Found
123 //try 125 //try
124 //{ 126 //{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 12d26fc..641453e 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -295,18 +295,20 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
295 /// <param name="args">Arguments to pass to function</param> 295 /// <param name="args">Arguments to pass to function</param>
296 internal void ExecuteEvent(uint localID, LLUUID itemID, string FunctionName, EventQueueManager.Queue_llDetectParams_Struct qParams, object[] args) 296 internal void ExecuteEvent(uint localID, LLUUID itemID, string FunctionName, EventQueueManager.Queue_llDetectParams_Struct qParams, object[] args)
297 { 297 {
298#if DEBUG 298//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
299 Console.WriteLine("ScriptEngine: Inside ExecuteEvent for event " + FunctionName); 299///#if DEBUG
300#endif 300/// Console.WriteLine("ScriptEngine: Inside ExecuteEvent for event " + FunctionName);
301///#endif
301 // Execute a function in the script 302 // Execute a function in the script
302 //m_scriptEngine.Log.Info("[" + ScriptEngineName + "]: Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName); 303 //m_scriptEngine.Log.Info("[" + ScriptEngineName + "]: Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName);
303 //ScriptBaseInterface Script = (ScriptBaseInterface)GetScript(localID, itemID); 304 //ScriptBaseInterface Script = (ScriptBaseInterface)GetScript(localID, itemID);
304 IScript Script = GetScript(localID, itemID); 305 IScript Script = GetScript(localID, itemID);
305 if (Script == null) 306 if (Script == null)
306 return; 307 return;
307#if DEBUG 308//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
308 Console.WriteLine("ScriptEngine: Executing event: " + FunctionName); 309///#if DEBUG
309#endif 310/// Console.WriteLine("ScriptEngine: Executing event: " + FunctionName);
311///#endif
310 // Must be done in correct AppDomain, so leaving it up to the script itself 312 // Must be done in correct AppDomain, so leaving it up to the script itself
311 Script.llDetectParams = qParams; 313 Script.llDetectParams = qParams;
312 Script.Exec.ExecuteEvent(FunctionName, args); 314 Script.Exec.ExecuteEvent(FunctionName, args);