aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorTleiades Hax2007-10-13 09:21:08 +0000
committerTleiades Hax2007-10-13 09:21:08 +0000
commitf6aeff6cc3f6ebc58db702206d469718d19b7ba0 (patch)
tree468fb8483a2cd03e472a6988ef60f1c8ff01c07e /OpenSim/Region/Application/OpenSimMain.cs
parent(no commit message) (diff)
downloadopensim-SC_OLD-f6aeff6cc3f6ebc58db702206d469718d19b7ba0.zip
opensim-SC_OLD-f6aeff6cc3f6ebc58db702206d469718d19b7ba0.tar.gz
opensim-SC_OLD-f6aeff6cc3f6ebc58db702206d469718d19b7ba0.tar.bz2
opensim-SC_OLD-f6aeff6cc3f6ebc58db702206d469718d19b7ba0.tar.xz
Added capbility to use MySQL as the database backend in stand alone mode for assets and inventory.
Added asset_plugin key to "StandAlone" section of OpenSim.ini
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7af8064..20152d8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -80,7 +80,6 @@ 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";
84 83
85 private string m_assetStorage = "db4o"; 84 private string m_assetStorage = "db4o";
86 85
@@ -132,7 +131,6 @@ namespace OpenSim
132 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); 131 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
133 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); 132 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
134 standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); 133 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");
136 standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); 134 standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
137 135
138 m_networkServersInfo.loadFromConfiguration(configSource); 136 m_networkServersInfo.loadFromConfiguration(configSource);
@@ -285,7 +283,7 @@ namespace OpenSim
285 } 283 }
286 else 284 else
287 { 285 {
288 assetServer = new SQLAssetServer(standaloneAssetPlugin); 286 assetServer = new SQLAssetServer("OpenSim.Framework.Data.SQLite.dll");
289 } 287 }
290 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); 288 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
291 m_assetCache = new AssetCache(assetServer); 289 m_assetCache = new AssetCache(assetServer);