aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:15:13 +0100
committerMelanie2011-10-25 02:15:13 +0100
commit4215aea0366574e098027b6a406ba3fce77ebe7e (patch)
tree25aa7b0ff998170957a6d0faa1c1775cffb77877 /OpenSim/Services
parentMerge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge (diff)
parentBug fix on the bug fix on UserAccountService.cs (diff)
downloadopensim-SC_OLD-4215aea0366574e098027b6a406ba3fce77ebe7e.zip
opensim-SC_OLD-4215aea0366574e098027b6a406ba3fce77ebe7e.tar.gz
opensim-SC_OLD-4215aea0366574e098027b6a406ba3fce77ebe7e.tar.bz2
opensim-SC_OLD-4215aea0366574e098027b6a406ba3fce77ebe7e.tar.xz
Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge
Diffstat (limited to 'OpenSim/Services')
-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 c153861..4ef6410 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 });