aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-02 17:47:20 +0000
committerMelanie Thielker2017-01-02 17:47:20 +0000
commitf03a6bbc616c3c9ce8dadce6059cf7899ef91b9b (patch)
tree9a1865348dc394b3cadbf0cd0a21adfb2e36ee9c /OpenSim/Services/LLLoginService
parentReplaced OpenMetaverse libs/xmls with new ones. Also added a file in openmeta... (diff)
downloadopensim-SC_OLD-f03a6bbc616c3c9ce8dadce6059cf7899ef91b9b.zip
opensim-SC_OLD-f03a6bbc616c3c9ce8dadce6059cf7899ef91b9b.tar.gz
opensim-SC_OLD-f03a6bbc616c3c9ce8dadce6059cf7899ef91b9b.tar.bz2
opensim-SC_OLD-f03a6bbc616c3c9ce8dadce6059cf7899ef91b9b.tar.xz
Create a generic way for passing constructor args to plugins
The old syntax didn't allow for any parameters except for services listed in the ServiceList. Now, services loaded by other services can also be made to use different ini sections or have additional paramters. Syntax is: [<ExtraParam>@]...<DllName>[:<ClassName>]
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6d63959..5d69705 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -180,9 +180,14 @@ namespace OpenSim.Services.LLLoginService
180 string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); 180 string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
181 if (hgInvServicePlugin != string.Empty) 181 if (hgInvServicePlugin != string.Empty)
182 { 182 {
183 // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release
183 string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); 184 string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
184 Object[] args2 = new Object[] { config, hgInvServiceArg }; 185 if (hgInvServiceArg != String.Empty)
185 m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2); 186 {
187 m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax.");
188 hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin;
189 }
190 m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args);
186 } 191 }
187 192
188 // 193 //