Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge
commit
4215aea036
|
@ -62,7 +62,6 @@ namespace OpenSim.Services.UserAccountService
|
||||||
if (userConfig == null)
|
if (userConfig == null)
|
||||||
throw new Exception("No UserAccountService configuration");
|
throw new Exception("No UserAccountService configuration");
|
||||||
|
|
||||||
m_RootInstance = this;
|
|
||||||
string gridServiceDll = userConfig.GetString("GridService", string.Empty);
|
string gridServiceDll = userConfig.GetString("GridService", string.Empty);
|
||||||
if (gridServiceDll != string.Empty)
|
if (gridServiceDll != string.Empty)
|
||||||
m_GridService = LoadPlugin<IGridService>(gridServiceDll, new Object[] { config });
|
m_GridService = LoadPlugin<IGridService>(gridServiceDll, new Object[] { config });
|
||||||
|
|
Loading…
Reference in New Issue