diff options
author | lbsa71 | 2007-11-15 15:32:28 +0000 |
---|---|---|
committer | lbsa71 | 2007-11-15 15:32:28 +0000 |
commit | 57ff76850d1d50d31efe7c20998c57a162ac819d (patch) | |
tree | f97fb9cbd320fe1a509e921003cf9713330f3925 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * Implemented the little friendly pop tooltip messages that appear when you h... (diff) | |
download | opensim-SC-57ff76850d1d50d31efe7c20998c57a162ac819d.zip opensim-SC-57ff76850d1d50d31efe7c20998c57a162ac819d.tar.gz opensim-SC-57ff76850d1d50d31efe7c20998c57a162ac819d.tar.bz2 opensim-SC-57ff76850d1d50d31efe7c20998c57a162ac819d.tar.xz |
* Added MySQLDataStore (adapted from MonoSqlite
* Made startup a little bit more forgiving on dll load
* Minor renamings and musings
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 501f14e..8677b7e 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim | |||
64 | 64 | ||
65 | protected LocalLoginService m_loginService; | 65 | protected LocalLoginService m_loginService; |
66 | 66 | ||
67 | protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll"; | 67 | protected string m_storageDll = "OpenSim.DataStore.NullStorage.dll"; |
68 | 68 | ||
69 | protected string m_startupCommandsFile = ""; | 69 | protected string m_startupCommandsFile = ""; |
70 | protected string m_shutdownCommandsFile = ""; | 70 | protected string m_shutdownCommandsFile = ""; |
@@ -218,7 +218,7 @@ namespace OpenSim | |||
218 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 218 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
219 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); | 219 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); |
220 | 220 | ||
221 | m_storageDLL = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); | 221 | m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); |
222 | 222 | ||
223 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); | 223 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); |
224 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); | 224 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); |
@@ -359,7 +359,7 @@ namespace OpenSim | |||
359 | 359 | ||
360 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) | 360 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) |
361 | { | 361 | { |
362 | return new StorageManager(m_storageDLL, regionInfo.DataStore, regionInfo.RegionName); | 362 | return new StorageManager(m_storageDll, regionInfo.DataStore, regionInfo.RegionName); |
363 | } | 363 | } |
364 | 364 | ||
365 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 365 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |