diff options
| author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
| commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
| tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | |
| parent | fix entity update flags update (diff) | |
| parent | catch some NULL refs (diff) | |
| download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz | |
merge issue
Diffstat (limited to 'OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs index b63b594..8806c2c 100644 --- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs +++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | |||
| @@ -228,6 +228,8 @@ namespace OpenSim.Server.Handlers.GridUser | |||
| 228 | int i = 0; | 228 | int i = 0; |
| 229 | foreach (GridUserInfo pinfo in pinfos) | 229 | foreach (GridUserInfo pinfo in pinfos) |
| 230 | { | 230 | { |
| 231 | if(pinfo == null) | ||
| 232 | continue; | ||
| 231 | Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs(); | 233 | Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs(); |
| 232 | result["griduser" + i] = rinfoDict; | 234 | result["griduser" + i] = rinfoDict; |
| 233 | i++; | 235 | i++; |