aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs6
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index f2ec62e..45f7355 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Common
80 80
81//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined 81//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
82#if DEBUG 82#if DEBUG
83 Console.WriteLine("ScriptEngine: Executing function name: " + EventName); 83 //Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
84#endif 84#endif
85 // Found 85 // Found
86 ev.Invoke(m_Script, args); 86 ev.Invoke(m_Script, args);
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 77ab3cd..cd03699 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
231 { 231 {
232 EventQueueThreadClass eqtc = new EventQueueThreadClass(); 232 EventQueueThreadClass eqtc = new EventQueueThreadClass();
233 eventQueueThreads.Add(eqtc); 233 eventQueueThreads.Add(eqtc);
234 m_ScriptEngine.Log.Debug("[" + m_ScriptEngine.ScriptEngineName + "]: Started new script execution thread. Current thread count: " + eventQueueThreads.Count); 234 //m_ScriptEngine.Log.Debug("[" + m_ScriptEngine.ScriptEngineName + "]: Started new script execution thread. Current thread count: " + eventQueueThreads.Count);
235 } 235 }
236 236
237 private void AbortThreadClass(EventQueueThreadClass threadClass) 237 private void AbortThreadClass(EventQueueThreadClass threadClass)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index fada7aa..e3013c9 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
130 else 130 else
131 { 131 {
132#if DEBUG 132#if DEBUG
133 m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recognized language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); 133 //m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recognized language type \"" + strlan + "\" specified in \"AllowedCompilers\".");
134#endif 134#endif
135 } 135 }
136 AllowedCompilers.Add(strlan, true); 136 AllowedCompilers.Add(strlan, true);
@@ -158,8 +158,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
158 else 158 else
159 { 159 {
160#if DEBUG 160#if DEBUG
161 m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: " + 161// m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: " +
162 "Config OK. Default language \"" + defaultCompileLanguage + "\" specified in \"DefaultCompileLanguage\" is recognized as a valid language."); 162// "Config OK. Default language \"" + defaultCompileLanguage + "\" specified in \"DefaultCompileLanguage\" is recognized as a valid language.");
163#endif 163#endif
164 // LANGUAGE IS IN ALLOW-LIST 164 // LANGUAGE IS IN ALLOW-LIST
165 DefaultCompileLanguage = LanguageMapping[defaultCompileLanguage]; 165 DefaultCompileLanguage = LanguageMapping[defaultCompileLanguage];
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 4b086d8..05a2d06 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -66,14 +66,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
66 66
67 // We will initialize and start the script. 67 // We will initialize and start the script.
68 // It will be up to the script itself to hook up the correct events. 68 // It will be up to the script itself to hook up the correct events.
69 string ScriptSource = String.Empty; 69 string CompiledScriptFile = String.Empty;
70 70
71 SceneObjectPart m_host = World.GetSceneObjectPart(localID); 71 SceneObjectPart m_host = World.GetSceneObjectPart(localID);
72 72
73 try 73 try
74 { 74 {
75 // Compile (We assume LSL) 75 // Compile (We assume LSL)
76 ScriptSource = LSLCompiler.PerformScriptCompile(Script); 76 CompiledScriptFile = LSLCompiler.PerformScriptCompile(Script);
77 77
78//#if DEBUG 78//#if DEBUG
79 //long before; 79 //long before;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
81//#endif 81//#endif
82 82
83 IScript CompiledScript; 83 IScript CompiledScript;
84 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); 84 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(CompiledScriptFile);
85 85
86//#if DEBUG 86//#if DEBUG
87 //m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); 87 //m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);