aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-23 21:29:09 +0100
committerJustin Clark-Casey (justincc)2010-04-23 21:29:09 +0100
commit10e18f465e0540e9d09d47462c8166cb60a38426 (patch)
treec0e9ebeb7bd9b4642cb9f98898bc464ff8ab4103
parentget region prim saving working properly in SQLiteNG (diff)
downloadopensim-SC-10e18f465e0540e9d09d47462c8166cb60a38426.zip
opensim-SC-10e18f465e0540e9d09d47462c8166cb60a38426.tar.gz
opensim-SC-10e18f465e0540e9d09d47462c8166cb60a38426.tar.bz2
opensim-SC-10e18f465e0540e9d09d47462c8166cb60a38426.tar.xz
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs6
-rw-r--r--bin/OpenSim.ini.example1
2 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4ca6595..cac5fa9 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -349,12 +349,6 @@ namespace OpenSim
349 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 349 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
350 350
351 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); 351 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
352 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
353 {
354 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
355 m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
356 Thread.Sleep(3000);
357 }
358 352
359 m_configSettings.StorageConnectionString 353 m_configSettings.StorageConnectionString
360 = startupConfig.GetString("storage_connection_string"); 354 = startupConfig.GetString("storage_connection_string");
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0630688..d49692e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1232,7 +1232,6 @@
1232 ;; default standalone, overridable in StandaloneCommon.ini 1232 ;; default standalone, overridable in StandaloneCommon.ini
1233 StorageProvider = "OpenSim.Data.SQLite.dll" 1233 StorageProvider = "OpenSim.Data.SQLite.dll"
1234 1234
1235
1236[AssetService] 1235[AssetService]
1237 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 1236 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1238 AssetLoaderArgs = "assets/AssetSets.xml" 1237 AssetLoaderArgs = "assets/AssetSets.xml"