aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-17 23:06:41 +0000
committerJustin Clarke Casey2007-12-17 23:06:41 +0000
commit348e5b7648037f9bb9b2a7e76e42753175131325 (patch)
treea2c5a283d5d838a320233ad37fc120921dc0704d
parentRemove now redundant mysql files from share/sql and replace with mysql_README... (diff)
downloadopensim-SC-348e5b7648037f9bb9b2a7e76e42753175131325.zip
opensim-SC-348e5b7648037f9bb9b2a7e76e42753175131325.tar.gz
opensim-SC-348e5b7648037f9bb9b2a7e76e42753175131325.tar.bz2
opensim-SC-348e5b7648037f9bb9b2a7e76e42753175131325.tar.xz
Make region storage Sqlite by default rather than NullStorage
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 478de56..b3daf0c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -167,7 +167,8 @@ namespace OpenSim
167 config.Set("physical_prim", true); 167 config.Set("physical_prim", true);
168 config.Set("child_get_tasks", false); 168 config.Set("child_get_tasks", false);
169 config.Set("serverside_object_permissions", false); 169 config.Set("serverside_object_permissions", false);
170 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 170 config.Set("storage_plugin", "OpenSim.DataStore.MonoSqlite.dll");
171 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
171 config.Set("startup_console_commands_file", ""); 172 config.Set("startup_console_commands_file", "");
172 config.Set("shutdown_console_commands_file", ""); 173 config.Set("shutdown_console_commands_file", "");
173 config.Set("script_engine", "DotNetEngine"); 174 config.Set("script_engine", "DotNetEngine");
@@ -236,8 +237,9 @@ namespace OpenSim
236 237
237 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 238 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
238 239
239 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 240 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.MonoSqlite.dll");
240 m_storageConnectionString = startupConfig.GetString("storage_connection_string",""); 241 m_storageConnectionString
242 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
241 243
242 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); 244 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
243 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); 245 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
@@ -477,7 +479,9 @@ namespace OpenSim
477 { 479 {
478 m_regionData.RemoveAt(RegionHandleElement); 480 m_regionData.RemoveAt(RegionHandleElement);
479 } 481 }
480 UDPServer restartingRegion = CreateRegion(whichRegion); 482
483 CreateRegion(whichRegion);
484 //UDPServer restartingRegion = CreateRegion(whichRegion);
481 //restartingRegion.ServerListener(); 485 //restartingRegion.ServerListener();
482 //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle); 486 //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle);
483 } 487 }