diff options
author | Melanie Thielker | 2008-09-26 15:01:03 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-26 15:01:03 +0000 |
commit | 24628928c3bd7148e9df6920ca8b3ed74aaafb49 (patch) | |
tree | 2dca9e3e8d06a727bb7fdbb2be28d3e76d86730a /OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |
parent | * refactor: split out AssetXferUploader (diff) | |
download | opensim-SC_OLD-24628928c3bd7148e9df6920ca8b3ed74aaafb49.zip opensim-SC_OLD-24628928c3bd7148e9df6920ca8b3ed74aaafb49.tar.gz opensim-SC_OLD-24628928c3bd7148e9df6920ca8b3ed74aaafb49.tar.bz2 opensim-SC_OLD-24628928c3bd7148e9df6920ca8b3ed74aaafb49.tar.xz |
Add per-instance date to DNE to avoid serializing stuff 10 times a second.
Clode cleanup and removal of commented stuff in ScriptManager.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index 969a05e..e32c342 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -188,7 +188,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | public IScript LoadScript(string FileName) | 191 | public IScript LoadScript(string FileName, out AppDomain ad) |
192 | { | 192 | { |
193 | // Find next available AppDomain to put it in | 193 | // Find next available AppDomain to put it in |
194 | AppDomainStructure FreeAppDomain = GetFreeAppDomain(); | 194 | AppDomainStructure FreeAppDomain = GetFreeAppDomain(); |
@@ -201,6 +201,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
201 | FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); | 201 | FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); |
202 | //Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); | 202 | //Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); |
203 | FreeAppDomain.ScriptsLoaded++; | 203 | FreeAppDomain.ScriptsLoaded++; |
204 | ad = FreeAppDomain.CurrentAppDomain; | ||
204 | 205 | ||
205 | return mbrt; | 206 | return mbrt; |
206 | } | 207 | } |