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
                 config.Set("serverside_object_permissions", false);
                 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
                 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
-                config.Set("storage_prim_inventories_experimental", false);
+                config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
                 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
@@ -250,7 +250,7 @@ namespace OpenSim
                 m_storageConnectionString
                     = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
                 m_storagePersistPrimInventories
-                    = startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
+                    = startupConfig.GetBoolean("storage_prim_inventories", true);
 
                 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
                 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";
 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
 
 ; turn on experimental storage of prim inventories in the region database
-; more details of the current state of this can be found at
+
+; Prim inventory storage is now turned on by default
+; However, this option remains in case it needs to be disabled
+; More details of the current state of this can be found at
 ;
 ; http://opensimulator.org/wiki/OpenSim:Prim_Inventory_Persistence
 ;
-storage_prim_inventories_experimental = false
+storage_prim_inventories = true
 
 startup_console_commands_file = "startup_commands.txt"
 shutdown_console_commands_file = "shutdown_commands.txt"