From 7f4a3392fced9cac79a39b23f564a6d2720812c9 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 23 Jun 2009 08:37:12 +0000
Subject: Fix the AssetServiceBase bug I introduced by reordering configuration
 load order. Thanks, Grumly57, for pointing it out. The point of the original
 change was to let the more specific setting override the less specific one,
 actually, I disabled the use of the less specific one.

---
 OpenSim/Services/AssetService/AssetServiceBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index c60dd1f..86752f9 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -61,9 +61,9 @@ namespace OpenSim.Services.AssetService
             IConfig dbConfig = config.Configs["DatabaseService"];
             if (dbConfig != null)
             {
-                if (dllName != String.Empty)
+                if (dllName == String.Empty)
                     dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                if (connString != String.Empty)
+                if (connString == String.Empty)
                     connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
-- 
cgit v1.1