From 5a1e896edcb3e5e8341e9d3fb5b3e323c7ec3210 Mon Sep 17 00:00:00 2001
From: Tleiades Hax
Date: Sat, 13 Oct 2007 12:35:37 +0000
Subject: OpenSimMain now respects the asset_plugin paramter, and storing of
 assets will *not* throw an exception

---
 OpenSim/Region/Application/OpenSimMain.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Application')

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
         private bool standaloneAuthenticate = false;
         private string standaloneWelcomeMessage = null;
         private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
+        private string standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll";
         private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll";
 
         private string m_assetStorage = "db4o";
@@ -132,7 +133,7 @@ namespace OpenSim
             standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
             standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
             standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
-
+            standaloneAssetPlugin = configSource.Configs["StandAlone"].GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll");
             m_networkServersInfo.loadFromConfiguration(configSource);
         }
 
@@ -283,7 +284,7 @@ namespace OpenSim
             }
             else
             {
-                assetServer = new SQLAssetServer("OpenSim.Framework.Data.SQLite.dll");
+                assetServer = new SQLAssetServer(standaloneAssetPlugin);
             }
             assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
             m_assetCache = new AssetCache(assetServer);
-- 
cgit v1.1