aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2014-03-24 18:33:18 +0200
committerOren Hurvitz2014-03-24 18:33:18 +0200
commit5b2af7f99ea9caf7c00674abd87b33797ce13ef4 (patch)
treed8ac6ab0a312b37f790dd7964dc2a989c6bd70f2
parentWhen a user logs-in, automatically create the Suitcase folder (diff)
downloadopensim-SC_OLD-5b2af7f99ea9caf7c00674abd87b33797ce13ef4.zip
opensim-SC_OLD-5b2af7f99ea9caf7c00674abd87b33797ce13ef4.tar.gz
opensim-SC_OLD-5b2af7f99ea9caf7c00674abd87b33797ce13ef4.tar.bz2
opensim-SC_OLD-5b2af7f99ea9caf7c00674abd87b33797ce13ef4.tar.xz
Moved the linkage between LoginService and HGInventoryService to the config file
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs9
-rw-r--r--bin/Robust.HG.ini.example4
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
167 m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args); 167 m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args);
168 168
169 // Get the Hypergrid inventory service (exists only if Hypergrid is enabled) 169 // Get the Hypergrid inventory service (exists only if Hypergrid is enabled)
170 string hgInvService = Util.GetConfigVarFromSections<string>(config, "LocalServiceModule", new string[] { "HGInventoryService" }, String.Empty); 170 string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
171 if (hgInvService != string.Empty) 171 if (hgInvServicePlugin != string.Empty)
172 { 172 {
173 Object[] args2 = new Object[] { config, "HGInventoryService" }; 173 string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
174 m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvService, args2); 174 Object[] args2 = new Object[] { config, hgInvServiceArg };
175 m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2);
175 } 176 }
176 177
177 // 178 //
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
335 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 335 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
336 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 336 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
337 337
338 ; This inventory service will be used to initialize the user's inventory
339 HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
340 HGInventoryServiceConstructorArg = "HGInventoryService"
341
338 ;; Ask co-operative viewers to use a different currency name 342 ;; Ask co-operative viewers to use a different currency name
339 ;Currency = "" 343 ;Currency = ""
340 344