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

catch some NULL refs

LSLKeyTest
UbitUmarov 2016-08-19 02:41:15 +01:00
parent d701de4021
commit e62d38a4ab
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -1733,6 +1733,8 @@ namespace OpenSim.Region.ClientStack.Linden
OSDArray osdtitles = new OSDArray(); OSDArray osdtitles = new OSDArray();
foreach(GroupRolesData grd in roles) foreach(GroupRolesData grd in roles)
{ {
if(grd.Title == null)
continue;
string title = grd.Title; string title = grd.Title;
if(i==0) if(i==0)
defaultPowers = grd.Powers; defaultPowers = grd.Powers;
@ -1744,6 +1746,9 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
if(titles.Count == 0)
break;
OSDMap osdmembers = new OSDMap(); OSDMap osdmembers = new OSDMap();
foreach(GroupMembersData gmd in members) foreach(GroupMembersData gmd in members)
{ {
@ -1752,7 +1757,7 @@ namespace OpenSim.Region.ClientStack.Linden
m["last_login"] = new OSDString(gmd.OnlineStatus); m["last_login"] = new OSDString(gmd.OnlineStatus);
if(gmd.AgentPowers != defaultPowers) if(gmd.AgentPowers != defaultPowers)
m["powers"] = new OSDString((gmd.AgentPowers).ToString("X")); m["powers"] = new OSDString((gmd.AgentPowers).ToString("X"));
if(titles.ContainsKey(gmd.Title) && titles[gmd.Title] != 0) if(gmd.Title != null && titles.ContainsKey(gmd.Title) && titles[gmd.Title] != 0)
m["title"] = new OSDInteger(titles[gmd.Title]); m["title"] = new OSDInteger(titles[gmd.Title]);
if(gmd.IsOwner) if(gmd.IsOwner)
m["owner"] = new OSDString("true"); m["owner"] = new OSDString("true");