diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Framework/Communications/UserManagerBase.cs | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index d946e00..f913d2c 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.Security.Cryptography; | 32 | using System.Security.Cryptography; |
@@ -93,13 +92,13 @@ namespace OpenSim.Framework.UserManagement | |||
93 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 92 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
94 | { | 93 | { |
95 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); | 94 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); |
96 | 95 | ||
97 | if (null != profile) | 96 | if (null != profile) |
98 | { | 97 | { |
99 | profile.currentAgent = getUserAgent(profile.UUID); | 98 | profile.currentAgent = getUserAgent(profile.UUID); |
100 | return profile; | 99 | return profile; |
101 | } | 100 | } |
102 | } | 101 | } |
103 | 102 | ||
104 | return null; | 103 | return null; |
105 | } | 104 | } |
@@ -112,11 +111,11 @@ namespace OpenSim.Framework.UserManagement | |||
112 | try | 111 | try |
113 | { | 112 | { |
114 | pickerlist = plugin.Value.GeneratePickerResults(queryID, query); | 113 | pickerlist = plugin.Value.GeneratePickerResults(queryID, query); |
115 | |||
116 | } | 114 | } |
117 | catch (Exception) | 115 | catch (Exception) |
118 | { | 116 | { |
119 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); | 117 | MainLog.Instance.Verbose("USERSTORAGE", |
118 | "Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); | ||
120 | return new List<AvatarPickerAvatar>(); | 119 | return new List<AvatarPickerAvatar>(); |
121 | } | 120 | } |
122 | } | 121 | } |
@@ -162,7 +161,8 @@ namespace OpenSim.Framework.UserManagement | |||
162 | } | 161 | } |
163 | catch (Exception e) | 162 | catch (Exception e) |
164 | { | 163 | { |
165 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")"); | 164 | MainLog.Instance.Verbose("USERSTORAGE", |
165 | "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")"); | ||
166 | } | 166 | } |
167 | } | 167 | } |
168 | 168 | ||
@@ -188,7 +188,8 @@ namespace OpenSim.Framework.UserManagement | |||
188 | } | 188 | } |
189 | catch (Exception e) | 189 | catch (Exception e) |
190 | { | 190 | { |
191 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 191 | MainLog.Instance.Verbose("USERSTORAGE", |
192 | "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | ||
192 | } | 193 | } |
193 | } | 194 | } |
194 | 195 | ||
@@ -210,7 +211,8 @@ namespace OpenSim.Framework.UserManagement | |||
210 | } | 211 | } |
211 | catch (Exception e) | 212 | catch (Exception e) |
212 | { | 213 | { |
213 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 214 | MainLog.Instance.Verbose("USERSTORAGE", |
215 | "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | ||
214 | } | 216 | } |
215 | } | 217 | } |
216 | 218 | ||
@@ -222,7 +224,7 @@ namespace OpenSim.Framework.UserManagement | |||
222 | { | 224 | { |
223 | UserProfileData profile = GetUserProfile(agentID); | 225 | UserProfileData profile = GetUserProfile(agentID); |
224 | profile.currentAgent = null; | 226 | profile.currentAgent = null; |
225 | 227 | ||
226 | setUserProfile(profile); | 228 | setUserProfile(profile); |
227 | } | 229 | } |
228 | 230 | ||
@@ -242,7 +244,8 @@ namespace OpenSim.Framework.UserManagement | |||
242 | } | 244 | } |
243 | catch (Exception e) | 245 | catch (Exception e) |
244 | { | 246 | { |
245 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 247 | MainLog.Instance.Verbose("USERSTORAGE", |
248 | "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | ||
246 | } | 249 | } |
247 | } | 250 | } |
248 | 251 | ||
@@ -356,7 +359,8 @@ namespace OpenSim.Framework.UserManagement | |||
356 | } | 359 | } |
357 | catch (Exception e) | 360 | catch (Exception e) |
358 | { | 361 | { |
359 | MainLog.Instance.Verbose("USERSTORAGE", "Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); | 362 | MainLog.Instance.Verbose("USERSTORAGE", |
363 | "Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); | ||
360 | } | 364 | } |
361 | } | 365 | } |
362 | 366 | ||
@@ -365,6 +369,6 @@ namespace OpenSim.Framework.UserManagement | |||
365 | 369 | ||
366 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName); | 370 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName); |
367 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); | 371 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); |
368 | public abstract UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid); | 372 | public abstract UserProfileData SetupMasterUser(LLUUID uuid); |
369 | } | 373 | } |
370 | } | 374 | } \ No newline at end of file |