diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index 5bc7a1c..68ae7bb 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
| @@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors | |||
| 198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); | 198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); |
| 199 | if(multisuported) | 199 | if(multisuported) |
| 200 | return accs; | 200 | return accs; |
| 201 | 201 | ||
| 202 | // service does not do multi accounts so need to do it one by one | 202 | // service does not do multi accounts so need to do it one by one |
| 203 | 203 | ||
| 204 | UUID uuid = UUID.Zero; | 204 | UUID uuid = UUID.Zero; |
| @@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors | |||
| 344 | 344 | ||
| 345 | return SendAndGetReply(sendData); | 345 | return SendAndGetReply(sendData); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) | 348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) |
| 349 | { | 349 | { |
| 350 | string reply = string.Empty; | 350 | string reply = string.Empty; |