diff options
author | lbsa71 | 2007-11-15 19:53:10 +0000 |
---|---|---|
committer | lbsa71 | 2007-11-15 19:53:10 +0000 |
commit | 3aed77bd2c5fecc2a077fdad501774b2b00001b1 (patch) | |
tree | 1b2273872ae95bf68999606fb8bfcedca0305638 /OpenSim/Region/Application | |
parent | make Stopped a bit sloppier which should help address any float round off issues (diff) | |
download | opensim-SC-3aed77bd2c5fecc2a077fdad501774b2b00001b1.zip opensim-SC-3aed77bd2c5fecc2a077fdad501774b2b00001b1.tar.gz opensim-SC-3aed77bd2c5fecc2a077fdad501774b2b00001b1.tar.bz2 opensim-SC-3aed77bd2c5fecc2a077fdad501774b2b00001b1.tar.xz |
*** BIG CHANGES : REGION STORAGE MOVED : UPDATE YOUR OpenSim.ini FROM OpenSim.ini.example **
* Now moved region storage from region to application, so we have one storage per application, instead of one per region.
* Changed so that the region store providers use connectionstrings, not filenames
* Removed various unfit fields and properties (call me Darwin)
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 8677b7e..8d56222 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -64,24 +64,24 @@ 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; |
68 | 68 | ||
69 | protected string m_startupCommandsFile = ""; | 69 | protected string m_startupCommandsFile; |
70 | protected string m_shutdownCommandsFile = ""; | 70 | protected string m_shutdownCommandsFile; |
71 | 71 | ||
72 | protected List<UDPServer> m_udpServers = new List<UDPServer>(); | 72 | protected List<UDPServer> m_udpServers = new List<UDPServer>(); |
73 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); | 73 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); |
74 | 74 | ||
75 | private bool m_verbose; | 75 | private bool m_verbose; |
76 | private bool m_physicalPrim; | 76 | private bool m_physicalPrim; |
77 | private readonly string m_logFilename = ("region-console.log"); | 77 | private readonly string m_logFilename = "region-console.log"; |
78 | private bool m_permissions = false; | 78 | private bool m_permissions = false; |
79 | 79 | ||
80 | private bool m_standaloneAuthenticate = false; | 80 | private bool m_standaloneAuthenticate = false; |
81 | private string m_standaloneWelcomeMessage = null; | 81 | private string m_standaloneWelcomeMessage = null; |
82 | private string m_standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; | 82 | private string m_standaloneInventoryPlugin; |
83 | private string m_standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll"; | 83 | private string m_standaloneAssetPlugin; |
84 | private string m_standaloneUserPlugin = "OpenSim.Framework.Data.SQLite.dll"; | 84 | private string m_standaloneUserPlugin; |
85 | 85 | ||
86 | private string m_assetStorage = "sqlite"; | 86 | private string m_assetStorage = "sqlite"; |
87 | 87 | ||
@@ -219,6 +219,7 @@ namespace OpenSim | |||
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 | m_storageConnectionString = startupConfig.GetString("storage_connection_string",""); | ||
222 | 223 | ||
223 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); | 224 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); |
224 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); | 225 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); |
@@ -357,9 +358,9 @@ namespace OpenSim | |||
357 | new RegionInfo("DEFAULT REGION CONFIG", fileName); | 358 | new RegionInfo("DEFAULT REGION CONFIG", fileName); |
358 | } | 359 | } |
359 | 360 | ||
360 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) | 361 | protected override StorageManager CreateStorageManager(string connectionstring) |
361 | { | 362 | { |
362 | return new StorageManager(m_storageDll, regionInfo.DataStore, regionInfo.RegionName); | 363 | return new StorageManager(m_storageDll, connectionstring); |
363 | } | 364 | } |
364 | 365 | ||
365 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 366 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |