diff options
author | Tedd Hansen | 2008-02-02 03:11:06 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-02 03:11:06 +0000 |
commit | e06ee9fd4bb60c95009af516d92786de2a88f859 (patch) | |
tree | 502e98629fded5adcc64ec705e566e57d930d324 /OpenSim/Region/ScriptEngine/DotNetEngine | |
parent | Added OpenSim.32BitLaunch.exe that can be used on 64-bit systems to run OpenS... (diff) | |
download | opensim-SC-e06ee9fd4bb60c95009af516d92786de2a88f859.zip opensim-SC-e06ee9fd4bb60c95009af516d92786de2a88f859.tar.gz opensim-SC-e06ee9fd4bb60c95009af516d92786de2a88f859.tar.bz2 opensim-SC-e06ee9fd4bb60c95009af516d92786de2a88f859.tar.xz |
Added load/unload queue size limit
Added option to share script load/unload thread between regions
Added event execution queue size limit
+ some bugfixes from all the changes
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index f6c9e30..821b2d4 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
86 | 86 | ||
87 | CompiledScript.Source = Script; | 87 | CompiledScript.Source = Script; |
88 | // Add it to our script memstruct | 88 | // Add it to our script memstruct |
89 | SetScript(localID, itemID, CompiledScript); | 89 | m_scriptEngine.m_ScriptManager.SetScript(localID, itemID, CompiledScript); |
90 | 90 | ||
91 | // We need to give (untrusted) assembly a private instance of BuiltIns | 91 | // We need to give (untrusted) assembly a private instance of BuiltIns |
92 | // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed. | 92 | // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed. |
@@ -144,9 +144,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
144 | // Get AppDomain | 144 | // Get AppDomain |
145 | AppDomain ad = LSLBC.Exec.GetAppDomain(); | 145 | AppDomain ad = LSLBC.Exec.GetAppDomain(); |
146 | // Tell script not to accept new requests | 146 | // Tell script not to accept new requests |
147 | GetScript(localID, itemID).Exec.StopScript(); | 147 | m_scriptEngine.m_ScriptManager.GetScript(localID, itemID).Exec.StopScript(); |
148 | // Remove from internal structure | 148 | // Remove from internal structure |
149 | RemoveScript(localID, itemID); | 149 | m_scriptEngine.m_ScriptManager.RemoveScript(localID, itemID); |
150 | // Tell AppDomain that we have stopped script | 150 | // Tell AppDomain that we have stopped script |
151 | m_scriptEngine.m_AppDomainManager.StopScript(ad); | 151 | m_scriptEngine.m_AppDomainManager.StopScript(ad); |
152 | } | 152 | } |