aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs6
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
58 /// <returns>Free AppDomain</returns> 58 /// <returns>Free AppDomain</returns>
59 private AppDomainStructure GetFreeAppDomain() 59 private AppDomainStructure GetFreeAppDomain()
60 { 60 {
61 Console.WriteLine("Finding free AppDomain");
61 FreeAppDomains(); // Outsite lock, has its own GetLock 62 FreeAppDomains(); // Outsite lock, has its own GetLock
62 lock (GetLock) 63 lock (GetLock)
63 { 64 {
@@ -141,8 +142,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
141 // Find next available AppDomain to put it in 142 // Find next available AppDomain to put it in
142 AppDomainStructure FreeAppDomain = GetFreeAppDomain(); 143 AppDomainStructure FreeAppDomain = GetFreeAppDomain();
143 144
144 if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null"); 145 //if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null");
145 if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain == null"); 146 //if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain == null");
147 Console.WriteLine("Loading into AppDomain: " + FileName);
146 LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); 148 LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");
147 //Type mytype = mbrt.GetType(); 149 //Type mytype = mbrt.GetType();
148 Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); 150 Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));