OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Config option for loading ScriptEngine (wjordan) 

Removed project file for ExcensionsScriptModule
afrisby
Tedd Hansen 2007-08-30 18:51:22 +00:00
parent e1505be97f
commit d03000062a
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -57,10 +57,12 @@ namespace OpenSim
public class OpenSimMain : RegionApplicationBase, conscmd_callback public class OpenSimMain : RegionApplicationBase, conscmd_callback
{ {
public string m_physicsEngine; public string m_physicsEngine;
public string m_scriptEngine;
public bool m_sandbox; public bool m_sandbox;
public bool user_accounts; public bool user_accounts;
public bool m_gridLocalAsset; public bool m_gridLocalAsset;
protected ModuleLoader m_moduleLoader; protected ModuleLoader m_moduleLoader;
protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll"; protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
@ -107,6 +109,7 @@ namespace OpenSim
protected void ReadConfigSettings(IConfigSource configSource) protected void ReadConfigSettings(IConfigSource configSource)
{ {
m_networkServersInfo = new NetworkServersInfo(); m_networkServersInfo = new NetworkServersInfo();
m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false); m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false);
m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics"); m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics");
@ -117,6 +120,8 @@ namespace OpenSim
m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", "");
m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
@ -187,8 +192,12 @@ namespace OpenSim
Scene scene = SetupScene(regionInfo, out udpServer); Scene scene = SetupScene(regionInfo, out udpServer);
OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); // Check if we have a script engine to load
scene.AddScriptEngine(ScriptEngine, m_log); if (m_scriptEngine != null && m_scriptEngine != "")
{
OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine(m_scriptEngine);
scene.AddScriptEngine(ScriptEngine, m_log);
}
//Server side object editing permissions checking //Server side object editing permissions checking
if (m_permissions) if (m_permissions)

12
OpenSim/Region/ExtensionsScriptModule/OpenSim.Region.ExtensionsScriptModule.csproj.user
View File

@ -1,12 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-07\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>
<PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
</Project>