diff options
author | Dr Scofield | 2008-07-04 11:13:25 +0000 |
---|---|---|
committer | Dr Scofield | 2008-07-04 11:13:25 +0000 |
commit | 6265a09ff90d1de4a09b41fbdcb99a1eb2ebc2d4 (patch) | |
tree | 9a70bf001c72897fac37d96812d2e66681c456b9 /OpenSim/Framework/Communications | |
parent | mini-warnings-safari, plus cleanup of IUserServices method naming. (diff) | |
download | opensim-SC-6265a09ff90d1de4a09b41fbdcb99a1eb2ebc2d4.zip opensim-SC-6265a09ff90d1de4a09b41fbdcb99a1eb2ebc2d4.tar.gz opensim-SC-6265a09ff90d1de4a09b41fbdcb99a1eb2ebc2d4.tar.bz2 opensim-SC-6265a09ff90d1de4a09b41fbdcb99a1eb2ebc2d4.tar.xz |
Renaming UserManagerBase.SetUserProfile(UserProfileData) to
UserManager.UpdateUserProfile(UserProfileData).
Adding UpdateUserProfile(UserProfileData) to IUserService interface.
Adding RemoteAdminPlugin.XmlRpcUpdateUserAccountMethod(...) to provide
a remote update capability.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/IUserService.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs index 6ad72c0..c1ae0e2 100644 --- a/OpenSim/Framework/Communications/IUserService.cs +++ b/OpenSim/Framework/Communications/IUserService.cs | |||
@@ -64,6 +64,13 @@ namespace OpenSim.Framework.Communications | |||
64 | /// <param name="user"></param> | 64 | /// <param name="user"></param> |
65 | LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY); | 65 | LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY); |
66 | 66 | ||
67 | /// <summary> | ||
68 | /// Update the user's profile. | ||
69 | /// </summary> | ||
70 | /// <param name="data">UserProfileData object with updated data. Should be obtained | ||
71 | /// via a call to GetUserProfile().</param> | ||
72 | /// <returns>true if the update could be applied, false if it could not be applied.</returns> | ||
73 | bool UpdateUserProfile(UserProfileData data); | ||
67 | 74 | ||
68 | /// <summary> | 75 | /// <summary> |
69 | /// Adds a new friend to the database for XUser | 76 | /// Adds a new friend to the database for XUser |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index d5b1e74..1b73152 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -153,11 +153,11 @@ namespace OpenSim.Framework.Communications | |||
153 | } | 153 | } |
154 | 154 | ||
155 | /// <summary> | 155 | /// <summary> |
156 | /// Set's user profile from data object | 156 | /// Updates a user profile from data object |
157 | /// </summary> | 157 | /// </summary> |
158 | /// <param name="data"></param> | 158 | /// <param name="data"></param> |
159 | /// <returns></returns> | 159 | /// <returns></returns> |
160 | public bool SetUserProfile(UserProfileData data) | 160 | public bool UpdateUserProfile(UserProfileData data) |
161 | { | 161 | { |
162 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 162 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
163 | { | 163 | { |
@@ -168,7 +168,8 @@ namespace OpenSim.Framework.Communications | |||
168 | } | 168 | } |
169 | catch (Exception e) | 169 | catch (Exception e) |
170 | { | 170 | { |
171 | m_log.Info("[USERSTORAGE]: Unable to set user via " + plugin.Key + "(" + e.ToString() + ")"); | 171 | m_log.InfoFormat("[USERSTORAGE]: Unable to set user {0} {1} via {2}: {3}", data.FirstName, data.SurName, |
172 | plugin.Key, e.ToString()); | ||
172 | } | 173 | } |
173 | } | 174 | } |
174 | return false; | 175 | return false; |
@@ -352,7 +353,7 @@ namespace OpenSim.Framework.Communications | |||
352 | UserProfileData profile = GetUserProfile(agentID); | 353 | UserProfileData profile = GetUserProfile(agentID); |
353 | profile.CurrentAgent = null; | 354 | profile.CurrentAgent = null; |
354 | 355 | ||
355 | SetUserProfile(profile); | 356 | UpdateUserProfile(profile); |
356 | } | 357 | } |
357 | 358 | ||
358 | 359 | ||
@@ -539,7 +540,7 @@ namespace OpenSim.Framework.Communications | |||
539 | // TODO: what is the logic should be? | 540 | // TODO: what is the logic should be? |
540 | bool ret = false; | 541 | bool ret = false; |
541 | ret = AddUserAgent(profile.CurrentAgent); | 542 | ret = AddUserAgent(profile.CurrentAgent); |
542 | ret = ret & SetUserProfile(profile); | 543 | ret = ret & UpdateUserProfile(profile); |
543 | return ret; | 544 | return ret; |
544 | } | 545 | } |
545 | 546 | ||