aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 297c9b2..730e53a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -171,6 +171,7 @@ namespace OpenSim
171 config.Set("serverside_object_permissions", false); 171 config.Set("serverside_object_permissions", false);
172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
174 config.Set("storage_prim_inventories_experimental", false);
174 config.Set("startup_console_commands_file", ""); 175 config.Set("startup_console_commands_file", "");
175 config.Set("shutdown_console_commands_file", ""); 176 config.Set("shutdown_console_commands_file", "");
176 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
@@ -242,6 +243,8 @@ namespace OpenSim
242 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.MonoSqlite.dll"); 243 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.MonoSqlite.dll");
243 m_storageConnectionString 244 m_storageConnectionString
244 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3"); 245 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
246 m_storagePersistPrimInventories
247 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
245 248
246 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); 249 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
247 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); 250 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
@@ -465,7 +468,7 @@ namespace OpenSim
465 468
466 protected override StorageManager CreateStorageManager(string connectionstring) 469 protected override StorageManager CreateStorageManager(string connectionstring)
467 { 470 {
468 return new StorageManager(m_storageDll, connectionstring); 471 return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories);
469 } 472 }
470 473
471 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 474 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,