diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7363fa9..5e1ad71 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -166,6 +166,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
166 | 166 | ||
167 | private bool m_physics_enabled = true; | 167 | private bool m_physics_enabled = true; |
168 | private bool m_scripts_enabled = true; | 168 | private bool m_scripts_enabled = true; |
169 | private string m_defaultScriptEngine; | ||
169 | 170 | ||
170 | #endregion | 171 | #endregion |
171 | 172 | ||
@@ -199,6 +200,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
199 | get { return m_timePhase; } | 200 | get { return m_timePhase; } |
200 | } | 201 | } |
201 | 202 | ||
203 | public string DefaultScriptEngine | ||
204 | { | ||
205 | get { return m_defaultScriptEngine; } | ||
206 | } | ||
207 | |||
202 | // Local reference to the objects in the scene (which are held in innerScene) | 208 | // Local reference to the objects in the scene (which are held in innerScene) |
203 | // public Dictionary<UUID, SceneObjectGroup> Objects | 209 | // public Dictionary<UUID, SceneObjectGroup> Objects |
204 | // { | 210 | // { |
@@ -314,6 +320,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
314 | IConfig startupConfig = m_config.Configs["Startup"]; | 320 | IConfig startupConfig = m_config.Configs["Startup"]; |
315 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); | 321 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); |
316 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); | 322 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); |
323 | |||
324 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); | ||
317 | } | 325 | } |
318 | catch (Exception) | 326 | catch (Exception) |
319 | { | 327 | { |
@@ -574,7 +582,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
574 | { | 582 | { |
575 | if (ent is SceneObjectGroup) | 583 | if (ent is SceneObjectGroup) |
576 | { | 584 | { |
577 | ((SceneObjectGroup)ent).CreateScriptInstances(0, false); | 585 | ((SceneObjectGroup)ent).CreateScriptInstances(0, false, ""); |
578 | } | 586 | } |
579 | } | 587 | } |
580 | } | 588 | } |