diff options
| author | UbitUmarov | 2019-11-02 21:53:12 +0000 |
|---|---|---|
| committer | UbitUmarov | 2019-11-02 21:53:12 +0000 |
| commit | f2cf3b201b4a967eae556d46202262b00344d84e (patch) | |
| tree | 8feb91f570d9ecc257d9669c2782e0e488d474f7 /OpenSim/Services/UserAccountService/UserAccountService.cs | |
| parent | FlotSamAssetcache write to disk needs be sync. (diff) | |
| download | opensim-SC-f2cf3b201b4a967eae556d46202262b00344d84e.zip opensim-SC-f2cf3b201b4a967eae556d46202262b00344d84e.tar.gz opensim-SC-f2cf3b201b4a967eae556d46202262b00344d84e.tar.bz2 opensim-SC-f2cf3b201b4a967eae556d46202262b00344d84e.tar.xz | |
avoid a null ref
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Services/UserAccountService/UserAccountService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index aada0be8..4f0698f 100755 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -294,6 +294,8 @@ namespace OpenSim.Services.UserAccountService | |||
| 294 | public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs) | 294 | public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs) |
| 295 | { | 295 | { |
| 296 | UserAccountData[] ret = m_Database.GetUsersWhere(scopeID, "PrincipalID in ('" + String.Join("', '", IDs) + "')"); | 296 | UserAccountData[] ret = m_Database.GetUsersWhere(scopeID, "PrincipalID in ('" + String.Join("', '", IDs) + "')"); |
| 297 | if(ret == null || ret.Length == 0) | ||
| 298 | return new List<UserAccount>(); | ||
| 297 | return new List<UserAccount>(ret.Select((x) => MakeUserAccount(x))); | 299 | return new List<UserAccount>(ret.Select((x) => MakeUserAccount(x))); |
| 298 | } | 300 | } |
| 299 | 301 | ||