From 5b2af7f99ea9caf7c00674abd87b33797ce13ef4 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 24 Mar 2014 18:33:18 +0200
Subject: Moved the linkage between LoginService and HGInventoryService to the
 config file

---
 OpenSim/Services/LLLoginService/LLLoginService.cs | 9 +++++----
 bin/Robust.HG.ini.example                         | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index d8f036a..b61b5e8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -167,11 +167,12 @@ namespace OpenSim.Services.LLLoginService
                 m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args);
 
             // Get the Hypergrid inventory service (exists only if Hypergrid is enabled)
-            string hgInvService = Util.GetConfigVarFromSections<string>(config, "LocalServiceModule", new string[] { "HGInventoryService" }, String.Empty);
-            if (hgInvService != string.Empty)
+            string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
+            if (hgInvServicePlugin != string.Empty)
             {
-                Object[] args2 = new Object[] { config, "HGInventoryService" };
-                m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvService, args2);
+                string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
+                Object[] args2 = new Object[] { config, hgInvServiceArg };
+                m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2);
             }
 
             //
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 91ea42a..14e9bff 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -335,6 +335,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
+    ; This inventory service will be used to initialize the user's inventory
+    HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+    HGInventoryServiceConstructorArg = "HGInventoryService"
+
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
-- 
cgit v1.1