aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-15 19:02:34 +0000
committerJustin Clarke Casey2008-09-15 19:02:34 +0000
commitddaa90d270c9bd10c74cf89b29b45963719f9b60 (patch)
tree638e92f3f5a079335901dc4011a1425f33ff2328 /OpenSim/Framework/Communications
parent* oops! Add interface file I forgot in the last checkin (diff)
downloadopensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.zip
opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.gz
opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.bz2
opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.xz
* refactor: collapse UpdateUserProfileProperties() into existing UpdateUserProfile
* the methods were identical except that the Properties one did a check for the user profile beforehand. However, every caller was doing this already anyway.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs7
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs23
3 files changed, 1 insertions, 31 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 27cdd35..5bed282 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
350 350
351 public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile) 351 public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
352 { 352 {
353 m_userService.UpdateUserProfileProperties(UserProfile); 353 m_userService.UpdateUserProfile(UserProfile);
354 return; 354 return;
355 } 355 }
356 356
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 64c6c68..50c9917 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -88,13 +88,6 @@ namespace OpenSim.Framework.Communications
88 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms); 88 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
89 89
90 /// <summary> 90 /// <summary>
91 /// Updates a user profile
92 /// </summary>
93 /// <param name="UserProfile">Profile to update</param>
94 /// <returns></returns>
95 bool UpdateUserProfileProperties(UserProfileData UserProfile);
96
97 /// <summary>
98 /// Logs off a user on the user server 91 /// Logs off a user on the user server
99 /// </summary> 92 /// </summary>
100 /// <param name="UserID">UUID of the user</param> 93 /// <param name="UserID">UUID of the user</param>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f06a438..46a9b67 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -600,29 +600,6 @@ namespace OpenSim.Framework.Communications
600 return true; 600 return true;
601 } 601 }
602 602
603 public bool UpdateUserProfileProperties(UserProfileData UserProfile)
604 {
605 if (null == GetUserProfile(UserProfile.ID))
606 {
607 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
608 return false;
609 }
610 foreach (IUserDataPlugin plugin in _plugins)
611 {
612 try
613 {
614 plugin.UpdateUserProfile(UserProfile);
615 }
616 catch (Exception e)
617 {
618 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
619 + " via " + plugin.Name + "(" + e.ToString() + ")");
620 return false;
621 }
622 }
623 return true;
624 }
625
626 public abstract UserProfileData SetupMasterUser(string firstName, string lastName); 603 public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
627 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); 604 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
628 public abstract UserProfileData SetupMasterUser(UUID uuid); 605 public abstract UserProfileData SetupMasterUser(UUID uuid);