diff options
author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /OpenSim/Server/Handlers/UserAccounts | |
parent | merge issue (diff) | |
parent | tests making sure evering thing is coerently wrong.. (diff) | |
download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Server/Handlers/UserAccounts')
-rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index 237ffc7..b22c4cc 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -328,12 +328,16 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
328 | if (request.ContainsKey("Email")) | 328 | if (request.ContainsKey("Email")) |
329 | email = request["Email"].ToString(); | 329 | email = request["Email"].ToString(); |
330 | 330 | ||
331 | string model = ""; | ||
332 | if (request.ContainsKey("Model")) | ||
333 | model = request["Model"].ToString(); | ||
334 | |||
331 | UserAccount createdUserAccount = null; | 335 | UserAccount createdUserAccount = null; |
332 | 336 | ||
333 | if (m_UserAccountService is UserAccountService) | 337 | if (m_UserAccountService is UserAccountService) |
334 | createdUserAccount | 338 | createdUserAccount |
335 | = ((UserAccountService)m_UserAccountService).CreateUser( | 339 | = ((UserAccountService)m_UserAccountService).CreateUser( |
336 | scopeID, principalID, firstName, lastName, password, email); | 340 | scopeID, principalID, firstName, lastName, password, email, model); |
337 | 341 | ||
338 | if (createdUserAccount == null) | 342 | if (createdUserAccount == null) |
339 | return FailureResult(); | 343 | return FailureResult(); |
@@ -393,4 +397,4 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
393 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | 397 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
394 | } | 398 | } |
395 | } | 399 | } |
396 | } \ No newline at end of file | 400 | } |