OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid NULL refs

LSLKeyTest
UbitUmarov 2016-08-18 14:35:28 +01:00
parent 4b73550eee
commit 9c75f8a57e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
View File

@ -228,6 +228,8 @@ namespace OpenSim.Server.Handlers.GridUser
int i = 0; int i = 0;
foreach (GridUserInfo pinfo in pinfos) foreach (GridUserInfo pinfo in pinfos)
{ {
if(pinfo == null)
continue;
Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs(); Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs();
result["griduser" + i] = rinfoDict; result["griduser" + i] = rinfoDict;
i++; i++;

2
OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
View File

@ -235,6 +235,8 @@ namespace OpenSim.Server.Handlers.UserAccounts
int i = 0; int i = 0;
foreach (UserAccount acc in accounts) foreach (UserAccount acc in accounts)
{ {
if(acc == null)
continue;
Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs(); Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs();
result["account" + i] = rinfoDict; result["account" + i] = rinfoDict;
i++; i++;