aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-10-28 18:03:34 +0000
committerJustin Clark-Casey (justincc)2013-10-28 18:03:34 +0000
commit39de7614ec14babe092a2dd47072fd4a5015fdbb (patch)
tree3f3dcc8e35771ec588cc52484d1680507b476f9d
parentminor: Fix commented out GridInfo service URL to be 8002 in Robust.ini.exampl... (diff)
downloadopensim-SC-39de7614ec14babe092a2dd47072fd4a5015fdbb.zip
opensim-SC-39de7614ec14babe092a2dd47072fd4a5015fdbb.tar.gz
opensim-SC-39de7614ec14babe092a2dd47072fd4a5015fdbb.tar.bz2
opensim-SC-39de7614ec14babe092a2dd47072fd4a5015fdbb.tar.xz
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".
-rw-r--r--OpenSim/Framework/ConfigSettings.cs1
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs5
3 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 002a371..108a3e4 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -31,7 +31,6 @@ namespace OpenSim.Framework
31 { 31 {
32 public string PhysicsEngine { get; set; } 32 public string PhysicsEngine { get; set; }
33 public string MeshEngineName { get; set; } 33 public string MeshEngineName { get; set; }
34 public string StorageDll { get; set; }
35 public string ClientstackDll { get; set; } 34 public string ClientstackDll { get; set; }
36 public string LibrariesXMLFile { get; set; } 35 public string LibrariesXMLFile { get; set; }
37 36
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 010ae5a..e3e0c01 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -338,8 +338,6 @@ namespace OpenSim
338 config.Set("meshing", "Meshmerizer"); 338 config.Set("meshing", "Meshmerizer");
339 config.Set("physical_prim", true); 339 config.Set("physical_prim", true);
340 config.Set("serverside_object_permissions", true); 340 config.Set("serverside_object_permissions", true);
341 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
342 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
343 config.Set("storage_prim_inventories", true); 341 config.Set("storage_prim_inventories", true);
344 config.Set("startup_console_commands_file", String.Empty); 342 config.Set("startup_console_commands_file", String.Empty);
345 config.Set("shutdown_console_commands_file", String.Empty); 343 config.Set("shutdown_console_commands_file", String.Empty);
@@ -371,7 +369,6 @@ namespace OpenSim
371 { 369 {
372 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 370 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
373 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 371 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
374 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
375 372
376 m_configSettings.ClientstackDll 373 m_configSettings.ClientstackDll
377 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 374 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 72ba185..0b6ee9c 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -240,8 +240,6 @@ namespace OpenSim.Tools.Configger
240 config.Set("meshing", "Meshmerizer"); 240 config.Set("meshing", "Meshmerizer");
241 config.Set("physical_prim", true); 241 config.Set("physical_prim", true);
242 config.Set("serverside_object_permissions", true); 242 config.Set("serverside_object_permissions", true);
243 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
244 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
245 config.Set("storage_prim_inventories", true); 243 config.Set("storage_prim_inventories", true);
246 config.Set("startup_console_commands_file", String.Empty); 244 config.Set("startup_console_commands_file", String.Empty);
247 config.Set("shutdown_console_commands_file", String.Empty); 245 config.Set("shutdown_console_commands_file", String.Empty);
@@ -253,6 +251,5 @@ namespace OpenSim.Tools.Configger
253 251
254 return defaultConfig; 252 return defaultConfig;
255 } 253 }
256
257 } 254 }
258} 255} \ No newline at end of file