GC.GetTotalMemory(true) was blocking.

We now support individual scripts on individual prims. Do the script dance... \o/ \o\ /o/ \o/ .o.

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
index 49f6712..3319783 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         /// <returns>Free AppDomain</returns>

         private AppDomainStructure GetFreeAppDomain()

         {

+            Console.WriteLine("Finding free AppDomain");

             FreeAppDomains(); // Outsite lock, has its own GetLock

             lock (GetLock)

             {

@@ -141,8 +142,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             // Find next available AppDomain to put it in

             AppDomainStructure FreeAppDomain = GetFreeAppDomain();

             

-            if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null");

-            if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain  == null");

+            //if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null");

+            //if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain  == null");

+            Console.WriteLine("Loading into AppDomain: " + FileName);

             LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");

             //Type mytype = mbrt.GetType();

             Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));