diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index ea3bbe7..3e0a610 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
@@ -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 | // } |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs index 4e3b7e5..9d91aa3 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests | |||
37 | { | 37 | { |
38 | [TestFixture] | 38 | [TestFixture] |
39 | public class HGUserManagementModuleTests : OpenSimTestCase | 39 | public class HGUserManagementModuleTests : OpenSimTestCase |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation. | 42 | /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation. |
43 | /// </summary> | 43 | /// </summary> |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 2701912..51f973a 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -345,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
345 | } | 345 | } |
346 | 346 | ||
347 | /// <summary> | 347 | /// <summary> |
348 | /// | 348 | /// |
349 | /// </summary> | 349 | /// </summary> |
350 | /// <param name="uuid"></param> | 350 | /// <param name="uuid"></param> |
351 | /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param> | 351 | /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param> |
@@ -557,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
557 | return ret; | 557 | return ret; |
558 | 558 | ||
559 | // try grid user service | 559 | // try grid user service |
560 | 560 | ||
561 | GridUserInfo[] pinfos = m_Scenes[0].GridUserService.GetGridUserInfo(missing.ToArray()); | 561 | GridUserInfo[] pinfos = m_Scenes[0].GridUserService.GetGridUserInfo(missing.ToArray()); |
562 | if(pinfos.Length > 0) | 562 | if(pinfos.Length > 0) |
563 | { | 563 | { |