diff options
author | John Hurliman | 2009-10-06 13:39:10 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-06 13:39:10 -0700 |
commit | 25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494 (patch) | |
tree | e74a0a0c59fcf471201d7d67a4b5ce938abd265c /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr... (diff) | |
download | opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.zip opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.gz opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.bz2 opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.xz |
* Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary
* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 3c91b29..9806218 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -129,10 +129,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
129 | 129 | ||
130 | public void AddRegion(Scene Sceneworld) | 130 | public void AddRegion(Scene Sceneworld) |
131 | { | 131 | { |
132 | m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing"); | ||
133 | |||
134 | m_Scene = Sceneworld; | ||
135 | |||
136 | // Make sure we have config | 132 | // Make sure we have config |
137 | if (ConfigSource.Configs[ScriptEngineName] == null) | 133 | if (ConfigSource.Configs[ScriptEngineName] == null) |
138 | ConfigSource.AddConfig(ScriptEngineName); | 134 | ConfigSource.AddConfig(ScriptEngineName); |
@@ -143,6 +139,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
143 | if (!m_enabled) | 139 | if (!m_enabled) |
144 | return; | 140 | return; |
145 | 141 | ||
142 | m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing"); | ||
143 | |||
144 | m_Scene = Sceneworld; | ||
145 | |||
146 | // Create all objects we'll be using | 146 | // Create all objects we'll be using |
147 | m_EventQueueManager = new EventQueueManager(this); | 147 | m_EventQueueManager = new EventQueueManager(this); |
148 | m_EventManager = new EventManager(this, true); | 148 | m_EventManager = new EventManager(this, true); |