aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorlbsa712008-03-18 13:39:29 +0000
committerlbsa712008-03-18 13:39:29 +0000
commit9c428d993504afbda5d11dd644fe1694cc1aee95 (patch)
tree7e4f2dd9f19cb11167e2819f463db3b016cc8654 /OpenSim/Region/ScriptEngine/DotNetEngine
parent* Remove unused (and somewhat nonsensical) method in PhysicsActor (diff)
downloadopensim-SC_OLD-9c428d993504afbda5d11dd644fe1694cc1aee95.zip
opensim-SC_OLD-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.gz
opensim-SC_OLD-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.bz2
opensim-SC_OLD-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.xz
* Applied Grumly57 patch for #781; Thanks, Grumly!
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index f8b3152..4b086d8 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -75,17 +75,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
75 // Compile (We assume LSL) 75 // Compile (We assume LSL)
76 ScriptSource = LSLCompiler.PerformScriptCompile(Script); 76 ScriptSource = LSLCompiler.PerformScriptCompile(Script);
77 77
78#if DEBUG 78//#if DEBUG
79 long before; 79 //long before;
80 before = GC.GetTotalMemory(true); 80 //before = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms
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(ScriptSource);
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);
88#endif 88//#endif
89 89
90 CompiledScript.Source = Script; 90 CompiledScript.Source = Script;
91 // Add it to our script memstruct 91 // Add it to our script memstruct