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, 2 insertions, 27 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8eea56f..0502d80 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -78,7 +78,6 @@ namespace OpenSim
 
         public string m_physicsEngine;
         public string m_meshEngineName;
-        public string m_scriptEngine;
         public bool m_sandbox;
         public bool user_accounts;
         public bool m_gridLocalAsset;
@@ -222,6 +221,8 @@ namespace OpenSim
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
                 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
+                config.Set("DefaultScriptEngine", "DotNetEngine");
+
                 config.Set("asset_database", "sqlite");
                 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
@@ -321,7 +322,6 @@ namespace OpenSim
                     = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
                 m_estateConnectionString
                     = startupConfig.GetString("estate_connection_string", m_storageConnectionString);
-                m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
                 m_assetStorage = startupConfig.GetString("asset_database", "local");
                 m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
@@ -522,31 +522,6 @@ namespace OpenSim
             // script module can pick up events exposed by a module
             m_moduleLoader.InitialiseSharedModules(scene);
 
-            //m_moduleLoader.PickupModules(scene, "ScriptEngines");
-            //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
-
-            if (string.IsNullOrEmpty(m_scriptEngine))
-            {
-                m_log.Info("[MODULES]: No script engine module specified");
-            }
-            else
-            {
-                m_log.Info("[MODULES]: Loading scripting engine modules");
-                foreach (string module in m_scriptEngine.Split(','))
-                {
-                    string mod = module.Trim(" \t".ToCharArray()); // Clean up name
-                    m_log.Info("[MODULES]: Loading scripting engine: " + mod);
-                    try
-                    {
-                        modules.AddRange(m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene));
-                    }
-                    catch (Exception ex)
-                    {
-                        m_log.Error("[MODULES]: Failed to load script engine: " + ex.ToString());
-                    }
-                }
-            }
-
             scene.SetModuleInterfaces();
             
             // Prims have to be loaded after module configuration since some modules may be invoked during the load