diff options
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index b8e3114..48807c2 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -194,7 +194,6 @@ namespace OpenSim.Framework.UserManagement | |||
194 | /// <returns>A List of FriendListItems that contains info about the user's friends</returns> | 194 | /// <returns>A List of FriendListItems that contains info about the user's friends</returns> |
195 | public List<FriendListItem> GetUserFriendList(LLUUID ownerID) | 195 | public List<FriendListItem> GetUserFriendList(LLUUID ownerID) |
196 | { | 196 | { |
197 | |||
198 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 197 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
199 | { | 198 | { |
200 | try | 199 | try |
@@ -208,12 +207,10 @@ namespace OpenSim.Framework.UserManagement | |||
208 | } | 207 | } |
209 | 208 | ||
210 | return null; | 209 | return null; |
211 | |||
212 | } | 210 | } |
213 | 211 | ||
214 | public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) | 212 | public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) |
215 | { | 213 | { |
216 | |||
217 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 214 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
218 | { | 215 | { |
219 | try | 216 | try |
@@ -240,10 +237,8 @@ namespace OpenSim.Framework.UserManagement | |||
240 | m_log.Info("[USERSTORAGE]: Unable to AddNewUserFriend via " + plugin.Key + "(" + e.ToString() + ")"); | 237 | m_log.Info("[USERSTORAGE]: Unable to AddNewUserFriend via " + plugin.Key + "(" + e.ToString() + ")"); |
241 | } | 238 | } |
242 | } | 239 | } |
243 | |||
244 | } | 240 | } |
245 | 241 | ||
246 | |||
247 | public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) | 242 | public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) |
248 | { | 243 | { |
249 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 244 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
@@ -273,6 +268,7 @@ namespace OpenSim.Framework.UserManagement | |||
273 | } | 268 | } |
274 | } | 269 | } |
275 | } | 270 | } |
271 | |||
276 | /// <summary> | 272 | /// <summary> |
277 | /// Loads a user agent by name (not called directly) | 273 | /// Loads a user agent by name (not called directly) |
278 | /// </summary> | 274 | /// </summary> |
@@ -295,7 +291,10 @@ namespace OpenSim.Framework.UserManagement | |||
295 | return null; | 291 | return null; |
296 | } | 292 | } |
297 | 293 | ||
298 | // TODO: document | 294 | /// <summary> |
295 | /// Resets the currentAgent in the user profile | ||
296 | /// </summary> | ||
297 | /// <param name="agentID">The agent's ID</param> | ||
299 | public void clearUserAgent(LLUUID agentID) | 298 | public void clearUserAgent(LLUUID agentID) |
300 | { | 299 | { |
301 | UserProfileData profile = GetUserProfile(agentID); | 300 | UserProfileData profile = GetUserProfile(agentID); |
@@ -459,7 +458,6 @@ namespace OpenSim.Framework.UserManagement | |||
459 | // If currentagent is null, we can't reference it here or the UserServer crashes! | 458 | // If currentagent is null, we can't reference it here or the UserServer crashes! |
460 | m_log.Info("[LOGOUT]: didn't save logout position: " + userid.ToString()); | 459 | m_log.Info("[LOGOUT]: didn't save logout position: " + userid.ToString()); |
461 | } | 460 | } |
462 | |||
463 | } | 461 | } |
464 | else | 462 | else |
465 | { | 463 | { |