From 648cf51411fbe41cc4ccbdbc69860377087c25b7 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Thu, 23 Jun 2016 06:38:34 -0700
Subject: [PATCH] Fix failing test

---
 .../OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index ef14270e31..0849dafd77 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1395,7 +1395,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
             IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-            eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
+            if (eq != null)
+                eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
+            else
+                remoteClient.SendGroupMembership(membershipArray);
 
             remoteClient.RefreshGroupMembership();
          }