aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/UserAccounts
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-19 00:16:53 +0100
committerJustin Clark-Casey (justincc)2011-10-19 00:16:53 +0100
commit97c66f8eac648229b55ba5a000d57e4b9377c663 (patch)
tree687eccd1d00751170953a96bfce3a2154f0e9a3b /OpenSim/Server/Handlers/UserAccounts
parentAllow an http call to set account details if AllowSetAccount = true in [UserA... (diff)
downloadopensim-SC_OLD-97c66f8eac648229b55ba5a000d57e4b9377c663.zip
opensim-SC_OLD-97c66f8eac648229b55ba5a000d57e4b9377c663.tar.gz
opensim-SC_OLD-97c66f8eac648229b55ba5a000d57e4b9377c663.tar.bz2
opensim-SC_OLD-97c66f8eac648229b55ba5a000d57e4b9377c663.tar.xz
Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output
Diffstat (limited to 'OpenSim/Server/Handlers/UserAccounts')
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs6
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();