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/Common/ScriptEngineBase/ScriptEngine.cs | |
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/Common/ScriptEngineBase/ScriptEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index ea8ae1f..0b58da0 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -92,23 +92,26 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
92 | m_log = logger; | 92 | m_log = logger; |
93 | ConfigSource = config; | 93 | ConfigSource = config; |
94 | Log.Verbose(ScriptEngineName, "ScriptEngine initializing"); | 94 | Log.Verbose(ScriptEngineName, "ScriptEngine initializing"); |
95 | Log.Verbose(ScriptEngineName, "Reading configuration from config section \"" + ScriptEngineName + "\""); | ||
96 | 95 | ||
97 | // Make sure we have config | 96 | // Make sure we have config |
98 | if (ConfigSource.Configs[ScriptEngineName] == null) | 97 | if (ConfigSource.Configs[ScriptEngineName] == null) |
99 | ConfigSource.AddConfig(ScriptEngineName); | 98 | ConfigSource.AddConfig(ScriptEngineName); |
100 | ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; | 99 | ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; |
101 | 100 | ||
101 | |||
102 | //m_logger.Status(ScriptEngineName, "InitializeEngine"); | 102 | //m_logger.Status(ScriptEngineName, "InitializeEngine"); |
103 | 103 | ||
104 | // Create all objects we'll be using | 104 | // Create all objects we'll be using |
105 | m_EventQueueManager = new EventQueueManager(this); | 105 | m_EventQueueManager = new EventQueueManager(this); |
106 | m_EventManager = new EventManager(this, HookUpToServer); | 106 | m_EventManager = new EventManager(this, HookUpToServer); |
107 | // We need to start it | ||
108 | newScriptManager.Start(); | ||
107 | m_ScriptManager = newScriptManager; | 109 | m_ScriptManager = newScriptManager; |
108 | m_AppDomainManager = new AppDomainManager(this); | 110 | m_AppDomainManager = new AppDomainManager(this); |
109 | m_ASYNCLSLCommandManager = new AsyncLSLCommandManager(this); | 111 | m_ASYNCLSLCommandManager = new AsyncLSLCommandManager(this); |
110 | m_MaintenanceThread = new MaintenanceThread(this); | 112 | m_MaintenanceThread = new MaintenanceThread(this); |
111 | 113 | ||
114 | Log.Verbose(ScriptEngineName, "Reading configuration from config section \"" + ScriptEngineName + "\""); | ||
112 | ReadConfig(); | 115 | ReadConfig(); |
113 | 116 | ||
114 | 117 | ||