diff options
author | Tedd Hansen | 2007-08-13 19:39:51 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-13 19:39:51 +0000 |
commit | 876f71cf931b887a3132ce719a4cc539b77cbca9 (patch) | |
tree | a1b31e54c85218deedcc257ad693e0ff64d56f81 /OpenSim/Region/Application | |
parent | Setting culture for startup thread to invariant. Config now read correctly on... (diff) | |
download | opensim-SC-876f71cf931b887a3132ce719a4cc539b77cbca9.zip opensim-SC-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.gz opensim-SC-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.bz2 opensim-SC-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.xz |
(DotNet) ScriptEngine is now loaded and added to Scene during startup.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index ca95a8d..4dd5fe1 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -154,14 +154,21 @@ namespace OpenSim | |||
154 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); | 154 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
155 | } | 155 | } |
156 | 156 | ||
157 | // Load all script engines found | ||
158 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(); | ||
159 | |||
157 | for (int i = 0; i < configFiles.Length; i++) | 160 | for (int i = 0; i < configFiles.Length; i++) |
158 | { | 161 | { |
159 | //Console.WriteLine("Loading region config file"); | 162 | //Console.WriteLine("Loading region config file"); |
160 | RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); | 163 | RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); |
161 | 164 | ||
165 | |||
162 | UDPServer udpServer; | 166 | UDPServer udpServer; |
163 | Scene scene = SetupScene(regionInfo, out udpServer); | 167 | Scene scene = SetupScene(regionInfo, out udpServer); |
164 | 168 | ||
169 | |||
170 | scene.AddScriptEngine(ScriptEngineLoader.LoadScriptEngine("DotNetEngine")); | ||
171 | |||
165 | m_localScenes.Add(scene); | 172 | m_localScenes.Add(scene); |
166 | 173 | ||
167 | m_udpServers.Add(udpServer); | 174 | m_udpServers.Add(udpServer); |
@@ -174,6 +181,8 @@ namespace OpenSim | |||
174 | this.m_udpServers[i].ServerListener(); | 181 | this.m_udpServers[i].ServerListener(); |
175 | } | 182 | } |
176 | 183 | ||
184 | |||
185 | |||
177 | 186 | ||
178 | } | 187 | } |
179 | 188 | ||