aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2007-08-30 18:51:22 +0000
committerTedd Hansen2007-08-30 18:51:22 +0000
commitd03000062a83b67fcb1137296766aaad6a0fd317 (patch)
tree53a28bd73869924bb3919e16697578bfb018e4a3
parentAdded some place holder classes for various modules. (diff)
downloadopensim-SC_OLD-d03000062a83b67fcb1137296766aaad6a0fd317.zip
opensim-SC_OLD-d03000062a83b67fcb1137296766aaad6a0fd317.tar.gz
opensim-SC_OLD-d03000062a83b67fcb1137296766aaad6a0fd317.tar.bz2
opensim-SC_OLD-d03000062a83b67fcb1137296766aaad6a0fd317.tar.xz
Config option for loading ScriptEngine (wjordan)
Removed project file for ExcensionsScriptModule
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs15
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/OpenSim.Region.ExtensionsScriptModule.csproj.user12
2 files changed, 12 insertions, 15 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 17f360f..45032fc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -57,10 +57,12 @@ namespace OpenSim
57 public class OpenSimMain : RegionApplicationBase, conscmd_callback 57 public class OpenSimMain : RegionApplicationBase, conscmd_callback
58 { 58 {
59 public string m_physicsEngine; 59 public string m_physicsEngine;
60 public string m_scriptEngine;
60 public bool m_sandbox; 61 public bool m_sandbox;
61 public bool user_accounts; 62 public bool user_accounts;
62 public bool m_gridLocalAsset; 63 public bool m_gridLocalAsset;
63 64
65
64 protected ModuleLoader m_moduleLoader; 66 protected ModuleLoader m_moduleLoader;
65 67
66 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll"; 68 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
@@ -107,6 +109,7 @@ namespace OpenSim
107 109
108 protected void ReadConfigSettings(IConfigSource configSource) 110 protected void ReadConfigSettings(IConfigSource configSource)
109 { 111 {
112
110 m_networkServersInfo = new NetworkServersInfo(); 113 m_networkServersInfo = new NetworkServersInfo();
111 m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false); 114 m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false);
112 m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics"); 115 m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics");
@@ -117,6 +120,8 @@ namespace OpenSim
117 120
118 m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); 121 m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", "");
119 122
123 m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
124
120 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); 125 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
121 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); 126 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
122 standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); 127 standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
@@ -187,8 +192,12 @@ namespace OpenSim
187 Scene scene = SetupScene(regionInfo, out udpServer); 192 Scene scene = SetupScene(regionInfo, out udpServer);
188 193
189 194
190 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); 195 // Check if we have a script engine to load
191 scene.AddScriptEngine(ScriptEngine, m_log); 196 if (m_scriptEngine != null && m_scriptEngine != "")
197 {
198 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine(m_scriptEngine);
199 scene.AddScriptEngine(ScriptEngine, m_log);
200 }
192 201
193 //Server side object editing permissions checking 202 //Server side object editing permissions checking
194 if (m_permissions) 203 if (m_permissions)
diff --git a/OpenSim/Region/ExtensionsScriptModule/OpenSim.Region.ExtensionsScriptModule.csproj.user b/OpenSim/Region/ExtensionsScriptModule/OpenSim.Region.ExtensionsScriptModule.csproj.user
deleted file mode 100644
index b3114ad..0000000
--- a/OpenSim/Region/ExtensionsScriptModule/OpenSim.Region.ExtensionsScriptModule.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>