diff options
author | Tleiades Hax | 2007-10-13 09:10:53 +0000 |
---|---|---|
committer | Tleiades Hax | 2007-10-13 09:10:53 +0000 |
commit | e8c1de8e7298e6c210a89b2449d636493f516c5e (patch) | |
tree | c22b35960503372c0a49675b82651d3a2d06c29c /OpenSim/Region/Application/OpenSimMain.cs | |
parent | Asset server implementation. Again one of these "plumbing" releases, where no... (diff) | |
download | opensim-SC-e8c1de8e7298e6c210a89b2449d636493f516c5e.zip opensim-SC-e8c1de8e7298e6c210a89b2449d636493f516c5e.tar.gz opensim-SC-e8c1de8e7298e6c210a89b2449d636493f516c5e.tar.bz2 opensim-SC-e8c1de8e7298e6c210a89b2449d636493f516c5e.tar.xz |
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 20152d8..7af8064 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -80,6 +80,7 @@ namespace OpenSim | |||
80 | private string standaloneWelcomeMessage = null; | 80 | private string standaloneWelcomeMessage = null; |
81 | private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; | 81 | private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; |
82 | private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll"; | 82 | private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll"; |
83 | private string standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll"; | ||
83 | 84 | ||
84 | private string m_assetStorage = "db4o"; | 85 | private string m_assetStorage = "db4o"; |
85 | 86 | ||
@@ -131,6 +132,7 @@ namespace OpenSim | |||
131 | standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); | 132 | standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); |
132 | standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); | 133 | standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); |
133 | standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 134 | standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); |
135 | standaloneAssetPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); | ||
134 | standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); | 136 | standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); |
135 | 137 | ||
136 | m_networkServersInfo.loadFromConfiguration(configSource); | 138 | m_networkServersInfo.loadFromConfiguration(configSource); |
@@ -283,7 +285,7 @@ namespace OpenSim | |||
283 | } | 285 | } |
284 | else | 286 | else |
285 | { | 287 | { |
286 | assetServer = new SQLAssetServer("OpenSim.Framework.Data.SQLite.dll"); | 288 | assetServer = new SQLAssetServer(standaloneAssetPlugin); |
287 | } | 289 | } |
288 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 290 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
289 | m_assetCache = new AssetCache(assetServer); | 291 | m_assetCache = new AssetCache(assetServer); |