aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-17 01:45:41 +0100
committerJustin Clark-Casey (justincc)2011-10-17 01:45:41 +0100
commitddcb88ff53d2348dfc81451a3ec61bb643c49aff (patch)
treed038620b44a13b5f59f84c79ca1f88dcfb5666d7
parentImplement osNpcSit(). This is still in development so don't trust it (diff)
parentBug fix on the bug fix on UserAccountService.cs (diff)
downloadopensim-SC_OLD-ddcb88ff53d2348dfc81451a3ec61bb643c49aff.zip
opensim-SC_OLD-ddcb88ff53d2348dfc81451a3ec61bb643c49aff.tar.gz
opensim-SC_OLD-ddcb88ff53d2348dfc81451a3ec61bb643c49aff.tar.bz2
opensim-SC_OLD-ddcb88ff53d2348dfc81451a3ec61bb643c49aff.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index e234c0a..9425816 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -62,7 +62,6 @@ namespace OpenSim.Services.UserAccountService
62 if (userConfig == null) 62 if (userConfig == null)
63 throw new Exception("No UserAccountService configuration"); 63 throw new Exception("No UserAccountService configuration");
64 64
65 m_RootInstance = this;
66 string gridServiceDll = userConfig.GetString("GridService", string.Empty); 65 string gridServiceDll = userConfig.GetString("GridService", string.Empty);
67 if (gridServiceDll != string.Empty) 66 if (gridServiceDll != string.Empty)
68 m_GridService = LoadPlugin<IGridService>(gridServiceDll, new Object[] { config }); 67 m_GridService = LoadPlugin<IGridService>(gridServiceDll, new Object[] { config });