From 8131a24cde3f3877b3b8dd850871c57c17b2b216 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 27 Mar 2012 10:08:13 -0700
Subject: Send the config section name up to the service classes themselves
 (XInventory and Assets).

---
 .../Services/HypergridService/HGAssetService.cs    |  4 +--
 .../HypergridService/HGInventoryService.cs         | 40 ++++------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

(limited to 'OpenSim/Services/HypergridService')

diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 22e233a..db98166 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -58,10 +58,10 @@ namespace OpenSim.Services.HypergridService
 
         private UserAccountCache m_Cache;
 
-        public HGAssetService(IConfigSource config) : base(config)
+        public HGAssetService(IConfigSource config, string configName) : base(config, configName)
         {
             m_log.Debug("[HGAsset Service]: Starting");
-            IConfig assetConfig = config.Configs["HGAssetService"];
+            IConfig assetConfig = config.Configs[configName];
             if (assetConfig == null)
                 throw new Exception("No HGAssetService configuration");
 
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 41d5a7a..a1287fd 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -60,36 +60,19 @@ namespace OpenSim.Services.HypergridService
 
         private UserAccountCache m_Cache;
 
-        public HGInventoryService(IConfigSource config)
-            : base(config)
+        public HGInventoryService(IConfigSource config, string configName)
+            : base(config, configName)
         {
             m_log.Debug("[HGInventory Service]: Starting");
-
-            string dllName = String.Empty;
-            string connString = String.Empty;
-            //string realm = "Inventory"; // OSG version doesn't use this
-
-            //
-            // Try reading the [DatabaseService] section, if it exists
-            //
-            IConfig dbConfig = config.Configs["DatabaseService"];
-            if (dbConfig != null)
-            {
-                if (dllName == String.Empty)
-                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                if (connString == String.Empty)
-                    connString = dbConfig.GetString("ConnectionString", String.Empty);
-            }
+            if (configName != string.Empty)
+                m_ConfigName = configName;
 
             //
             // Try reading the [InventoryService] section, if it exists
             //
-            IConfig invConfig = config.Configs["HGInventoryService"];
+            IConfig invConfig = config.Configs[m_ConfigName];
             if (invConfig != null)
-            {
-                dllName = invConfig.GetString("StorageProvider", dllName);
-                connString = invConfig.GetString("ConnectionString", connString);
-                
+            {                
                 // realm = authConfig.GetString("Realm", realm);
                 string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
                 if (userAccountsDll == string.Empty)
@@ -108,17 +91,6 @@ namespace OpenSim.Services.HypergridService
                 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
 
-            //
-            // We tried, but this doesn't exist. We can't proceed.
-            //
-            if (dllName == String.Empty)
-                throw new Exception("No StorageProvider configured");
-
-            m_Database = LoadPlugin<IXInventoryData>(dllName,
-                    new Object[] {connString, String.Empty});
-            if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
-
             m_log.Debug("[HG INVENTORY SERVICE]: Starting...");
         }
 
-- 
cgit v1.1