diff options
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
Diffstat (limited to 'OpenSim/Server/Handlers/UserAccounts')
| -rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index f987383..5ab4caf 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
| @@ -356,7 +356,5 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
| 356 | UTF8Encoding encoding = new UTF8Encoding(); | 356 | UTF8Encoding encoding = new UTF8Encoding(); |
| 357 | return encoding.GetBytes(xmlString); | 357 | return encoding.GetBytes(xmlString); |
| 358 | } | 358 | } |
| 359 | |||
| 360 | |||
| 361 | } | 359 | } |
| 362 | } | 360 | } |