OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved the linkage between LoginService and HGInventoryService to the config file

0.8.0.3
Oren Hurvitz 2014-03-24 18:33:18 +02:00
parent df9845a283
commit 5b2af7f99e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -167,11 +167,12 @@ namespace OpenSim.Services.LLLoginService
m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args); m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args);
// Get the Hypergrid inventory service (exists only if Hypergrid is enabled) // Get the Hypergrid inventory service (exists only if Hypergrid is enabled)
string hgInvService = Util.GetConfigVarFromSections<string>(config, "LocalServiceModule", new string[] { "HGInventoryService" }, String.Empty); string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
if (hgInvService != string.Empty) if (hgInvServicePlugin != string.Empty)
{ {
Object[] args2 = new Object[] { config, "HGInventoryService" }; string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvService, args2); Object[] args2 = new Object[] { config, hgInvServiceArg };
m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2);
} }
// //

4
bin/Robust.HG.ini.example
View File

@ -335,6 +335,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 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 ;; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""