Change the scirpt engine loading mechanism. Script engines are now

ordinary region modules and are able to coexist in one instance.
See http://opensimulator.org/wiki/ScriptEngines for details. There were
changes to OpenSim.ini.example, please note DefaultScriptEngine.
Also see the User docs and FAQ on the Wiki. Default is DotNetEngine.

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
 
         private bool m_physics_enabled = true;
         private bool m_scripts_enabled = true;
+        private string m_defaultScriptEngine;
 
         #endregion
 
@@ -199,6 +200,11 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_timePhase; }
         }
 
+        public string DefaultScriptEngine
+        {
+            get { return m_defaultScriptEngine; }
+        }
+
         // Local reference to the objects in the scene (which are held in innerScene)
         //        public Dictionary<UUID, SceneObjectGroup> Objects
         //        {
@@ -314,6 +320,8 @@ namespace OpenSim.Region.Environment.Scenes
                 IConfig startupConfig = m_config.Configs["Startup"];
                 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
                 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
+
+                m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
             }
             catch (Exception)
             {
@@ -574,7 +582,7 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             if (ent is SceneObjectGroup)
                             {
-                                ((SceneObjectGroup)ent).CreateScriptInstances(0, false);
+                                ((SceneObjectGroup)ent).CreateScriptInstances(0, false, "");
                             }
                         }
                     }