From 15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 18 Sep 2009 20:09:43 -0700
Subject: Reverted the order of reading configs in GridServiceBase.

---
 OpenSim/Services/GridService/GridServiceBase.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs
index 7b69290..7522e64 100644
--- a/OpenSim/Services/GridService/GridServiceBase.cs
+++ b/OpenSim/Services/GridService/GridServiceBase.cs
@@ -47,17 +47,6 @@ namespace OpenSim.Services.GridService
             string realm = "regions";
 
             //
-            // Try reading the [AssetService] section first, if it exists
-            //
-            IConfig gridConfig = config.Configs["GridService"];
-            if (gridConfig != null)
-            {
-                dllName = gridConfig.GetString("StorageProvider", dllName);
-                connString = gridConfig.GetString("ConnectionString", connString);
-                realm = gridConfig.GetString("Realm", realm);
-            }
-
-            //
             // Try reading the [DatabaseService] section, if it exists
             //
             IConfig dbConfig = config.Configs["DatabaseService"];
@@ -70,6 +59,17 @@ namespace OpenSim.Services.GridService
             }
 
             //
+            // [GridService] section overrides [DatabaseService], if it exists
+            //
+            IConfig gridConfig = config.Configs["GridService"];
+            if (gridConfig != null)
+            {
+                dllName = gridConfig.GetString("StorageProvider", dllName);
+                connString = gridConfig.GetString("ConnectionString", connString);
+                realm = gridConfig.GetString("Realm", realm);
+            }
+
+            //
             // We tried, but this doesn't exist. We can't proceed.
             //
             if (dllName.Equals(String.Empty))
-- 
cgit v1.1