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

Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section. 

These are long unused but confusingly will be seen in the [Startup] section on a "config save".
link-sitting
Justin Clark-Casey (justincc) 2013-10-28 18:03:34 +00:00
parent 5be8f6632b
commit 39de7614ec
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ConfigSettings.cs
View File

@ -31,7 +31,6 @@ namespace OpenSim.Framework
{ {
public string PhysicsEngine { get; set; } public string PhysicsEngine { get; set; }
public string MeshEngineName { get; set; } public string MeshEngineName { get; set; }
public string StorageDll { get; set; }
public string ClientstackDll { get; set; } public string ClientstackDll { get; set; }
public string LibrariesXMLFile { get; set; } public string LibrariesXMLFile { get; set; }

3
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -338,8 +338,6 @@ namespace OpenSim
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("serverside_object_permissions", true); config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);
config.Set("startup_console_commands_file", String.Empty); config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty); config.Set("shutdown_console_commands_file", String.Empty);
@ -371,7 +369,6 @@ namespace OpenSim
{ {
m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
m_configSettings.ClientstackDll m_configSettings.ClientstackDll
= startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");

3
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@ -240,8 +240,6 @@ namespace OpenSim.Tools.Configger
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("serverside_object_permissions", true); config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);
config.Set("startup_console_commands_file", String.Empty); config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty); config.Set("shutdown_console_commands_file", String.Empty);
@ -253,6 +251,5 @@ namespace OpenSim.Tools.Configger
return defaultConfig; return defaultConfig;
} }
} }
} }