diff options
| author | Diva Canto | 2014-06-08 12:18:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-06-08 12:18:26 -0700 |
| commit | 7f45ac72e1d45833abafbcaa38a36893a9cb4efc (patch) | |
| tree | 197c51b37a3864be588bc75931acaa48a5052513 /OpenSim/Addons | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7f45ac72e1d45833abafbcaa38a36893a9cb4efc.zip opensim-SC_OLD-7f45ac72e1d45833abafbcaa38a36893a9cb4efc.tar.gz opensim-SC_OLD-7f45ac72e1d45833abafbcaa38a36893a9cb4efc.tar.bz2 opensim-SC_OLD-7f45ac72e1d45833abafbcaa38a36893a9cb4efc.tar.xz | |
Don't try to package null invites.
Diffstat (limited to 'OpenSim/Addons')
| -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 | ||