diff options
author | Teravus Ovares | 2008-06-28 03:45:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-06-28 03:45:52 +0000 |
commit | ec7110f2cf92b39b93e24d0bd498c27ba0af9c0e (patch) | |
tree | 5201a3b3469f0cfcddc2255f4b89fcd68ca633b0 /OpenSim | |
parent | * Various documentation to some black magic parts of LLClientView (diff) | |
download | opensim-SC-ec7110f2cf92b39b93e24d0bd498c27ba0af9c0e.zip opensim-SC-ec7110f2cf92b39b93e24d0bd498c27ba0af9c0e.tar.gz opensim-SC-ec7110f2cf92b39b93e24d0bd498c27ba0af9c0e.tar.bz2 opensim-SC-ec7110f2cf92b39b93e24d0bd498c27ba0af9c0e.tar.xz |
* Melanie adds the event manager back to the XEngine so all yr events are hers, I mean, fire.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 3c1acb4..f025090 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -58,7 +58,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
58 | private Scene m_Scene; | 58 | private Scene m_Scene; |
59 | private IConfig m_ScriptConfig; | 59 | private IConfig m_ScriptConfig; |
60 | private Compiler m_Compiler; | 60 | private Compiler m_Compiler; |
61 | // private EventManager m_EventManager; | 61 | #pragma warning disable 414 |
62 | private EventManager m_EventManager; | ||
63 | #pragma warning restore 414 | ||
62 | private int m_EventLimit; | 64 | private int m_EventLimit; |
63 | private bool m_KillTimedOutScripts; | 65 | private bool m_KillTimedOutScripts; |
64 | public AsyncCommandManager m_AsyncCommands; | 66 | public AsyncCommandManager m_AsyncCommands; |
@@ -190,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
190 | m_ScriptEngines.Add(this); | 192 | m_ScriptEngines.Add(this); |
191 | } | 193 | } |
192 | 194 | ||
193 | // m_EventManager = new EventManager(this); | 195 | m_EventManager = new EventManager(this); |
194 | 196 | ||
195 | StartEngine(minThreads, maxThreads, idleTimeout, prio, | 197 | StartEngine(minThreads, maxThreads, idleTimeout, prio, |
196 | maxScriptQueue, stackSize); | 198 | maxScriptQueue, stackSize); |