diff options
| author | Tedd Hansen | 2007-08-22 19:33:10 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2007-08-22 19:33:10 +0000 |
| commit | 4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f (patch) | |
| tree | 2a05a2b6191cc8e483b9a1695d87e5d9338716aa /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |
| parent | Added OnRemoveScript event handler to ScriptEngine. Fixed event queuing of em... (diff) | |
| download | opensim-SC_OLD-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.zip opensim-SC_OLD-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.gz opensim-SC_OLD-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.bz2 opensim-SC_OLD-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.xz | |
GC.GetTotalMemory(true) was blocking.
We now support individual scripts on individual prims. Do the script dance... \o/ \o\ /o/ \o/ .o.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index b7a4aca..efd5a7f 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
| @@ -169,11 +169,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 169 | //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName); | 169 | //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName); |
| 170 | 170 | ||
| 171 | //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName, localID); | 171 | //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName, localID); |
| 172 | long before; | 172 | |
| 173 | before = GC.GetTotalMemory(true); | 173 | //long before; |
| 174 | //before = GC.GetTotalMemory(true); | ||
| 174 | LSL_BaseClass CompiledScript = m_scriptEngine.myAppDomainManager.LoadScript(FileName); | 175 | LSL_BaseClass CompiledScript = m_scriptEngine.myAppDomainManager.LoadScript(FileName); |
| 175 | Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); | 176 | //Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); |
| 176 | before = GC.GetTotalMemory(true); | 177 | //before = GC.GetTotalMemory(true); |
| 178 | |||
| 179 | |||
| 177 | //Script = m_scriptEngine.myAppDomainManager.LoadScript(FileName); | 180 | //Script = m_scriptEngine.myAppDomainManager.LoadScript(FileName); |
| 178 | //Console.WriteLine("Script occupies {0} bytes", GC.GetTotalMemory(true) - before); | 181 | //Console.WriteLine("Script occupies {0} bytes", GC.GetTotalMemory(true) - before); |
| 179 | //before = GC.GetTotalMemory(true); | 182 | //before = GC.GetTotalMemory(true); |