aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorTleiades Hax2007-10-13 12:35:37 +0000
committerTleiades Hax2007-10-13 12:35:37 +0000
commit5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210 (patch)
treee2b1b30f60fe91d5b578d39f816925fdc791bae3 /OpenSim/Region/Application/OpenSimMain.cs
parentAdded capbility to use MySQL as the database backend in stand alone mode for ... (diff)
downloadopensim-SC_OLD-5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210.zip
opensim-SC_OLD-5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210.tar.gz
opensim-SC_OLD-5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210.tar.bz2
opensim-SC_OLD-5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210.tar.xz
OpenSimMain now respects the asset_plugin paramter, and storing of assets will *not* throw an exception
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 20152d8..2187e42 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -79,6 +79,7 @@ namespace OpenSim
79 private bool standaloneAuthenticate = false; 79 private bool standaloneAuthenticate = false;
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 standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll";
82 private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll"; 83 private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll";
83 84
84 private string m_assetStorage = "db4o"; 85 private string m_assetStorage = "db4o";
@@ -132,7 +133,7 @@ namespace OpenSim
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");
134 standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); 135 standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
135 136 standaloneAssetPlugin = configSource.Configs["StandAlone"].GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll");
136 m_networkServersInfo.loadFromConfiguration(configSource); 137 m_networkServersInfo.loadFromConfiguration(configSource);
137 } 138 }
138 139
@@ -283,7 +284,7 @@ namespace OpenSim
283 } 284 }
284 else 285 else
285 { 286 {
286 assetServer = new SQLAssetServer("OpenSim.Framework.Data.SQLite.dll"); 287 assetServer = new SQLAssetServer(standaloneAssetPlugin);
287 } 288 }
288 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); 289 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
289 m_assetCache = new AssetCache(assetServer); 290 m_assetCache = new AssetCache(assetServer);