diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 9f1ad88..be2aafd 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -191,7 +191,7 @@ namespace OpenSim | |||
191 | config.Set("physical_prim", true); | 191 | config.Set("physical_prim", true); |
192 | config.Set("see_into_this_sim_from_neighbor", true); | 192 | config.Set("see_into_this_sim_from_neighbor", true); |
193 | config.Set("serverside_object_permissions", false); | 193 | config.Set("serverside_object_permissions", false); |
194 | config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 194 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
195 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 195 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
196 | config.Set("storage_prim_inventories", true); | 196 | config.Set("storage_prim_inventories", true); |
197 | config.Set("startup_console_commands_file", String.Empty); | 197 | config.Set("startup_console_commands_file", String.Empty); |
@@ -208,9 +208,9 @@ namespace OpenSim | |||
208 | { | 208 | { |
209 | config.Set("accounts_authenticate", false); | 209 | config.Set("accounts_authenticate", false); |
210 | config.Set("welcome_message", "Welcome to OpenSim"); | 210 | config.Set("welcome_message", "Welcome to OpenSim"); |
211 | config.Set("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 211 | config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); |
212 | config.Set("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 212 | config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); |
213 | config.Set("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 213 | config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); |
214 | config.Set("dump_assets_to_file", false); | 214 | config.Set("dump_assets_to_file", false); |
215 | } | 215 | } |
216 | 216 | ||
@@ -270,11 +270,11 @@ namespace OpenSim | |||
270 | 270 | ||
271 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); | 271 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); |
272 | 272 | ||
273 | m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 273 | m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll"); |
274 | if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") | 274 | if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") |
275 | { | 275 | { |
276 | m_storageDll = "OpenSim.Framework.Data.SQLite.dll"; | 276 | m_storageDll = "OpenSim.Data.SQLite.dll"; |
277 | Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll."); | 277 | Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); |
278 | Thread.Sleep(3000); | 278 | Thread.Sleep(3000); |
279 | } | 279 | } |
280 | m_storageConnectionString | 280 | m_storageConnectionString |
@@ -297,11 +297,11 @@ namespace OpenSim | |||
297 | m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false); | 297 | m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false); |
298 | m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); | 298 | m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); |
299 | m_standaloneInventoryPlugin = | 299 | m_standaloneInventoryPlugin = |
300 | standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 300 | standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll"); |
301 | m_standaloneUserPlugin = | 301 | m_standaloneUserPlugin = |
302 | standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 302 | standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); |
303 | m_standaloneAssetPlugin = | 303 | m_standaloneAssetPlugin = |
304 | standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 304 | standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll"); |
305 | 305 | ||
306 | m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); | 306 | m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); |
307 | } | 307 | } |