aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--bin/OpenSim.ini.example7
2 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e84e239..9da1c05 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -171,7 +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("storage_prim_inventories", true);
175 config.Set("startup_console_commands_file", String.Empty); 175 config.Set("startup_console_commands_file", String.Empty);
176 config.Set("shutdown_console_commands_file", String.Empty); 176 config.Set("shutdown_console_commands_file", String.Empty);
177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
@@ -250,7 +250,7 @@ namespace OpenSim
250 m_storageConnectionString 250 m_storageConnectionString
251 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3"); 251 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
252 m_storagePersistPrimInventories 252 m_storagePersistPrimInventories
253 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false); 253 = startupConfig.GetBoolean("storage_prim_inventories", true);
254 254
255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); 255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 987851d..784083d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -30,11 +30,14 @@ storage_connection_string="URI=file:OpenSim.db,version=3";
30; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 30; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
31 31
32; turn on experimental storage of prim inventories in the region database 32; turn on experimental storage of prim inventories in the region database
33; more details of the current state of this can be found at 33
34; Prim inventory storage is now turned on by default
35; However, this option remains in case it needs to be disabled
36; More details of the current state of this can be found at
34; 37;
35; http://opensimulator.org/wiki/OpenSim:Prim_Inventory_Persistence 38; http://opensimulator.org/wiki/OpenSim:Prim_Inventory_Persistence
36; 39;
37storage_prim_inventories_experimental = false 40storage_prim_inventories = true
38 41
39startup_console_commands_file = "startup_commands.txt" 42startup_console_commands_file = "startup_commands.txt"
40shutdown_console_commands_file = "shutdown_commands.txt" 43shutdown_console_commands_file = "shutdown_commands.txt"