From 9c428d993504afbda5d11dd644fe1694cc1aee95 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 18 Mar 2008 13:39:29 +0000
Subject: * Applied Grumly57 patch for #781; Thanks, Grumly!

---
 .../Common/ScriptEngineBase/AppDomainManager.cs            | 14 +++++++-------
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs  | 14 +++++++-------
 OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs     | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
index 49f83c1..41100c9 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
@@ -173,15 +173,15 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                         {
                             // Remove from internal list
                             appDomains.Remove(ads);
-#if DEBUG
-                            Console.WriteLine("Found empty AppDomain, unloading");
-                            long m = GC.GetTotalMemory(true);
-#endif
+//#if DEBUG
+                            //Console.WriteLine("Found empty AppDomain, unloading");
+                            //long m = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms
+//#endif
                             // Unload
                             AppDomain.Unload(ads.CurrentAppDomain);
-#if DEBUG
-                            m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain unload freed " + (m - GC.GetTotalMemory(true)) + " bytes of memory");
-#endif
+//#if DEBUG
+                            //m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain unload freed " + (m - GC.GetTotalMemory(true)) + " bytes of memory");
+//#endif
                         }
                     }
                 }
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
                 // Compile (We assume LSL)
                 ScriptSource = LSLCompiler.PerformScriptCompile(Script);
 
-#if DEBUG
-                long before;
-                before = GC.GetTotalMemory(true);
-#endif
+//#if DEBUG
+                //long before;
+                //before = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms
+//#endif
 
                 IScript CompiledScript;
                 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
 
-#if DEBUG
-                m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
-#endif
+//#if DEBUG
+                //m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
+//#endif
 
                 CompiledScript.Source = Script;
                 // Add it to our script memstruct
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index 04cb0d2..a933b08 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -70,17 +70,17 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
                 // Compile (We assume LSL)
                 //ScriptSource = LSLCompiler.CompileFromLSLText(Script);
 
-#if DEBUG
-                long before;
-                before = GC.GetTotalMemory(true);
-#endif
+//#if DEBUG
+                //long before;
+                //before = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms
+//#endif
 
                 IScript CompiledScript;
                 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
 
-#if DEBUG
-                Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
-#endif
+//#if DEBUG
+                //Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
+//#endif
 
                 CompiledScript.Source = ScriptSource;
                 // Add it to our script memstruct
-- 
cgit v1.1