diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index 7b89c2c..3e0a610 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
52 | 52 | ||
53 | #region ISharedRegionModule | 53 | #region ISharedRegionModule |
54 | 54 | ||
55 | public new void Initialise(IConfigSource config) | 55 | public override void Initialise(IConfigSource config) |
56 | { | 56 | { |
57 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", null); | 57 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", null); |
58 | if (umanmod == Name) | 58 | if (umanmod == Name) |
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
111 | } | 111 | } |
112 | 112 | ||
113 | // This is it! Let's ask the other world | 113 | // This is it! Let's ask the other world |
114 | if (words[0].Contains(".")) | 114 | if (words[0].Contains(".")) |
115 | { | 115 | { |
116 | string[] names = words[0].Split(new char[] { '.' }); | 116 | string[] names = words[0].Split(new char[] { '.' }); |
117 | if (names.Length >= 2) | 117 | if (names.Length >= 2) |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
130 | } | 130 | } |
131 | 131 | ||
132 | UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr); | 132 | UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr); |
133 | 133 | ||
134 | UUID userID = UUID.Zero; | 134 | UUID userID = UUID.Zero; |
135 | try | 135 | try |
136 | { | 136 | { |
@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
140 | { | 140 | { |
141 | m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e); | 141 | m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e); |
142 | } | 142 | } |
143 | 143 | ||
144 | if (!userID.Equals(UUID.Zero)) | 144 | if (!userID.Equals(UUID.Zero)) |
145 | { | 145 | { |
146 | UserData ud = new UserData(); | 146 | UserData ud = new UserData(); |
@@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
163 | //{ | 163 | //{ |
164 | // foreach (UserData d in m_UserCache.Values) | 164 | // foreach (UserData d in m_UserCache.Values) |
165 | // { | 165 | // { |
166 | // if (d.LastName.StartsWith("@") && | 166 | // if (d.LastName.StartsWith("@") && |
167 | // (d.FirstName.ToLower().StartsWith(query.ToLower()) || | 167 | // (d.FirstName.ToLower().StartsWith(query.ToLower()) || |
168 | // d.LastName.ToLower().StartsWith(query.ToLower()))) | 168 | // d.LastName.ToLower().StartsWith(query.ToLower()))) |
169 | // users.Add(d); | 169 | // users.Add(d); |
170 | // } | 170 | // } |
@@ -172,4 +172,4 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
172 | } | 172 | } |
173 | 173 | ||
174 | } | 174 | } |
175 | } \ No newline at end of file | 175 | } |