diff options
author | Diva Canto | 2014-06-08 12:18:26 -0700 |
---|---|---|
committer | Justin Clark-Casey | 2014-06-10 20:29:24 +0100 |
commit | a8edc908e0a4032ea8ae8896196ffd46e0e3ba82 (patch) | |
tree | c2c85c3990bc136d772c9d9be5e0fb75b023d32d /OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |
parent | BulletSim: fix exceptions while rebuilding linksets with mesh children. (diff) | |
download | opensim-SC_OLD-a8edc908e0a4032ea8ae8896196ffd46e0e3ba82.zip opensim-SC_OLD-a8edc908e0a4032ea8ae8896196ffd46e0e3ba82.tar.gz opensim-SC_OLD-a8edc908e0a4032ea8ae8896196ffd46e0e3ba82.tar.bz2 opensim-SC_OLD-a8edc908e0a4032ea8ae8896196ffd46e0e3ba82.tar.xz |
Don't try to package null invites.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 52b9728..95c3208 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
@@ -665,7 +665,11 @@ namespace OpenSim.Groups | |||
665 | GroupInviteInfo invite = m_GroupsService.GetAgentToGroupInvite(request["RequestingAgentID"].ToString(), | 665 | GroupInviteInfo invite = m_GroupsService.GetAgentToGroupInvite(request["RequestingAgentID"].ToString(), |
666 | new UUID(request["InviteID"].ToString())); | 666 | new UUID(request["InviteID"].ToString())); |
667 | 667 | ||
668 | result["RESULT"] = GroupsDataUtils.GroupInviteInfo(invite); | 668 | if (invite != null) |
669 | result["RESULT"] = GroupsDataUtils.GroupInviteInfo(invite); | ||
670 | else | ||
671 | result["RESULT"] = "NULL"; | ||
672 | |||
669 | return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); | 673 | return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); |
670 | } | 674 | } |
671 | 675 | ||