Committing the meat of the user server interface and the bones of the service implementation

1 files changed, 12 insertions, 10 deletions

diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index c42d469..c60dd1f 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -46,23 +46,25 @@ namespace OpenSim.Services.AssetService
             string connString = String.Empty;
 
             //
-            // Try reading the [DatabaseService] section first, if it exists
+            // Try reading the [AssetService] section first, if it exists
             //
-            IConfig dbConfig = config.Configs["DatabaseService"];
-            if (dbConfig != null)
+            IConfig assetConfig = config.Configs["AssetService"];
+            if (assetConfig != null)
             {
-                dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                connString = dbConfig.GetString("ConnectionString", String.Empty);
+                dllName = assetConfig.GetString("StorageProvider", dllName);
+                connString = assetConfig.GetString("ConnectionString", connString);
             }
 
             //
-            // Try reading the more specific [AssetService] section, if it exists
+            // Try reading the [DatabaseService] section, if it exists
             //
-            IConfig assetConfig = config.Configs["AssetService"];
-            if (assetConfig != null)
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
             {
-                dllName = assetConfig.GetString("StorageProvider", dllName);
-                connString = assetConfig.GetString("ConnectionString", connString);
+                if (dllName != String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (connString != String.Empty)
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
             //