diff options
author | Melanie | 2011-10-25 02:56:15 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 02:56:15 +0100 |
commit | e1ff72209ff742f762cb29b258ed54f4ccb4f5c4 (patch) | |
tree | 259a214b304ec864afd55943b0085f37a1a42e19 /OpenSim/Server | |
parent | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge (diff) | |
parent | Get new NewUser and SetUserAccount calls to accept PrincipalID instead of Use... (diff) | |
download | opensim-SC-e1ff72209ff742f762cb29b258ed54f4ccb4f5c4.zip opensim-SC-e1ff72209ff742f762cb29b258ed54f4ccb4f5c4.tar.gz opensim-SC-e1ff72209ff742f762cb29b258ed54f4ccb4f5c4.tar.bz2 opensim-SC-e1ff72209ff742f762cb29b258ed54f4ccb4f5c4.tar.xz |
Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index aba4f7b..7439cb0 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
108 | else | 108 | else |
109 | break; | 109 | break; |
110 | } | 110 | } |
111 | 111 | ||
112 | m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); | 112 | m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); |
113 | } | 113 | } |
114 | catch (Exception e) | 114 | catch (Exception e) |
@@ -202,7 +202,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
202 | byte[] StoreAccount(Dictionary<string, object> request) | 202 | byte[] StoreAccount(Dictionary<string, object> request) |
203 | { | 203 | { |
204 | UUID principalID = UUID.Zero; | 204 | UUID principalID = UUID.Zero; |
205 | if (!(request.ContainsKey("UserID") && UUID.TryParse(request["UserID"].ToString(), out principalID))) | 205 | if (!(request.ContainsKey("PrincipalID") && UUID.TryParse(request["PrincipalID"].ToString(), out principalID))) |
206 | return FailureResult(); | 206 | return FailureResult(); |
207 | 207 | ||
208 | UUID scopeID = UUID.Zero; | 208 | UUID scopeID = UUID.Zero; |
@@ -268,7 +268,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
268 | return FailureResult(); | 268 | return FailureResult(); |
269 | 269 | ||
270 | UUID principalID = UUID.Random(); | 270 | UUID principalID = UUID.Random(); |
271 | if (request.ContainsKey("UserID") && !UUID.TryParse(request["UserID"].ToString(), out principalID)) | 271 | if (request.ContainsKey("PrincipalID") && !UUID.TryParse(request["PrincipalID"].ToString(), out principalID)) |
272 | return FailureResult(); | 272 | return FailureResult(); |
273 | 273 | ||
274 | string firstName = request["FirstName"].ToString(); | 274 | string firstName = request["FirstName"].ToString(); |