Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"

The patch was for 0.7

This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb.

4 files changed, 320 insertions, 1570 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 6b942cb..8d32e66 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -43,8 +43,6 @@ using OpenSim.Region.CoreModules.Framework.EventQueue;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-using OpenSim.Services.Interfaces;
-
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
 
@@ -89,6 +87,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         
         private IGroupsServicesConnector m_groupData = null;
 
+        class GroupRequestIDInfo
+        {
+            public GroupRequestID RequestID = new GroupRequestID();
+            public DateTime LastUsedTMStamp = DateTime.MinValue;
+        }
+        private Dictionary<UUID, GroupRequestIDInfo> m_clientRequestIDInfo = new Dictionary<UUID, GroupRequestIDInfo>();
+        private const int m_clientRequestIDFlushTimeOut = 300000; // Every 5 minutes
+        private Timer m_clientRequestIDFlushTimer;
+
+
         // Configuration settings
         private bool m_groupsEnabled = false;
         private bool m_groupNoticesEnabled = true;
@@ -125,6 +133,30 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_groupNoticesEnabled   = groupsConfig.GetBoolean("NoticesEnabled", true);
                 m_debugEnabled          = groupsConfig.GetBoolean("DebugEnabled", true);
 
+                m_clientRequestIDFlushTimer = new Timer();
+                m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut;
+                m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache;
+                m_clientRequestIDFlushTimer.AutoReset = true;
+                m_clientRequestIDFlushTimer.Start();
+            }
+        }
+
+        void FlushClientRequestIDInfoCache(object sender, ElapsedEventArgs e)
+        {
+            lock (m_clientRequestIDInfo)
+            {
+                TimeSpan cacheTimeout = new TimeSpan(0,0, m_clientRequestIDFlushTimeOut / 1000);
+                UUID[] CurrentKeys = new UUID[m_clientRequestIDInfo.Count];
+                foreach (UUID key in CurrentKeys)
+                {
+                    if (m_clientRequestIDInfo.ContainsKey(key))
+                    {
+                        if (DateTime.Now - m_clientRequestIDInfo[key].LastUsedTMStamp > cacheTimeout)
+                        {
+                            m_clientRequestIDInfo.Remove(key);
+                        }
+                    }
+                }
             }
         }
 
@@ -202,6 +234,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return;
 
             if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module.");
+
+            m_clientRequestIDFlushTimer.Stop();
         }
 
         public Type ReplaceableInterface 
@@ -238,7 +272,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Used for Notices and Group Invites/Accept/Reject
             client.OnInstantMessage += OnInstantMessage;
 
-            // Send client thier groups information.
+            lock (m_clientRequestIDInfo)
+            {
+                if (m_clientRequestIDInfo.ContainsKey(client.AgentId))
+                {
+                    // flush any old RequestID information
+                    m_clientRequestIDInfo.Remove(client.AgentId);
+                }
+            }
             SendAgentGroupDataUpdate(client, client.AgentId);
         }
 
@@ -246,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetRequestingAgentID(remoteClient), avatarID).ToArray();
+            //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), avatarID).ToArray();
             GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID);
             remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups);
         }
@@ -285,17 +326,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
         */
 
+
         void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart)
         {
             if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups)
             {
-                if (m_debugEnabled) 
-                    m_log.DebugFormat(
-                        "[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", 
-                        System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart);
+                if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart);
 
                 // TODO: This currently ignores pretty much all the query flags including Mature and sort order
-                remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetRequestingAgentID(remoteClient), queryText).ToArray());
+                remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetClientGroupRequestID(remoteClient), queryText).ToArray());
             }
             
         }
@@ -309,7 +348,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             string activeGroupName = string.Empty;
             ulong activeGroupPowers  = (ulong)GroupPowers.None;
 
-            GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient), dataForAgentID);
+            GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetClientGroupRequestID(remoteClient), dataForAgentID);
             if (membership != null)
             {
                 activeGroupID = membership.GroupID;
@@ -322,13 +361,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             SendScenePresenceUpdate(dataForAgentID, activeGroupTitle);
         }
 
-        private void HandleUUIDGroupNameRequest(UUID GroupID, IClientAPI remoteClient)
+        private void HandleUUIDGroupNameRequest(UUID GroupID,IClientAPI remoteClient)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             string GroupName;
             
-            GroupRecord group = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null);
+            GroupRecord group = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null);
             if (group != null)
             {
                 GroupName = group.GroupName;
@@ -349,7 +388,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
             {
                 UUID inviteID = new UUID(im.imSessionID);
-                GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID);
+                GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID);
 
                 if (inviteInfo == null)
                 {
@@ -368,7 +407,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received an accept invite notice.");
 
                         // and the sessionid is the role
-                        m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID);
+                        m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID);
 
                         GridInstantMessage msg = new GridInstantMessage();
                         msg.imSessionID = UUID.Zero.Guid;
@@ -392,14 +431,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         // TODO: If the inviter is still online, they need an agent dataupdate 
                         // and maybe group membership updates for the invitee
 
-                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID);
+                        m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID);
                     }
 
                     // Reject
                     if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)
                     {
                         if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received a reject invite notice.");
-                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID);
+                        m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID);
                     }
                 }
             }
@@ -413,7 +452,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
 
                 UUID GroupID = new UUID(im.toAgentID);
-                if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null) != null)
+                if (m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null) != null)
                 {
                     UUID NoticeID = UUID.Random();
                     string Subject = im.message.Substring(0, im.message.IndexOf('|'));
@@ -457,21 +496,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     }
 
                     
-                    m_groupData.AddGroupNotice(GetRequestingAgentID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket);
+                    m_groupData.AddGroupNotice(GetClientGroupRequestID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket);
                     if (OnNewGroupNotice != null)
                     {
                         OnNewGroupNotice(GroupID, NoticeID);
                     }
 
                     // Send notice out to everyone that wants notices
-                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), GroupID))
+                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), GroupID))
                     {
                          if (m_debugEnabled)
                         {
-                            UserAccount targetUser = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, member.AgentID);
-                            if (targetUser != null)
+                            UserProfileData targetUserProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(member.AgentID);
+                            if (targetUserProfile != null)
                             {
-                                m_log.DebugFormat("[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices);
+                                m_log.DebugFormat("[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", NoticeID, targetUserProfile.Name, member.AcceptNotices);
                             }
                             else
                             {
@@ -549,25 +588,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         public GroupRecord GetGroupRecord(UUID GroupID)
         {
-            return m_groupData.GetGroupRecord(UUID.Zero, GroupID, null);
+            return m_groupData.GetGroupRecord(null, GroupID, null);
         }
 
-        public GroupRecord GetGroupRecord(string name)
-        {
-            return m_groupData.GetGroupRecord(UUID.Zero, UUID.Zero, name);
-        }
-        
         public void ActivateGroup(IClientAPI remoteClient, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_groupData.SetAgentActiveGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID);
+            m_groupData.SetAgentActiveGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID);
 
             // Changing active group changes title, active powers, all kinds of things
             // anyone who is in any region that can see this client, should probably be 
             // updated with new group info.  At a minimum, they should get ScenePresence
             // updated with new title.
-            UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient));
+            UpdateAllClientsWithGroupInfo(remoteClient.AgentId);
         }
 
         /// <summary>
@@ -577,9 +611,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
 
-            List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID);
-            GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID);
+            List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(grID, remoteClient.AgentId, groupID);
+            GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID);
 
             List<GroupTitlesData> titles = new List<GroupTitlesData>();
             foreach (GroupRolesData role in agentRoles)
@@ -601,15 +636,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-            List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID);

-

-            if (m_debugEnabled)

-            {

-                foreach (GroupMembersData member in data)

-                {

-                    m_log.DebugFormat("[GROUPS]: Member({0}) - IsOwner({1})", member.AgentID, member.IsOwner);

-                }

-            }
+
+            List<GroupMembersData> data = m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), groupID);
 
             return data;
 
@@ -619,25 +647,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            List<GroupRolesData> data = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID);
+            List<GroupRolesData> data = m_groupData.GetGroupRoles(GetClientGroupRequestID(remoteClient), groupID);
 
             return data;
+
         }
 
         public List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetRequestingAgentID(remoteClient), groupID);

-

-            if (m_debugEnabled)

-            {

-                foreach (GroupRoleMembersData member in data)

-                {

-                    m_log.DebugFormat("[GROUPS]: Member({0}) - Role({1})", member.MemberID, member.RoleID);

-                }

-            }
+            List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetClientGroupRequestID(remoteClient), groupID);
+
             return data;
+
+
         }
 
         public GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID)
@@ -646,16 +670,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             GroupProfileData profile = new GroupProfileData();
 
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
 
-            GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null);
+            GroupRecord groupInfo = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), groupID, null);
             if (groupInfo != null)
             {
                 profile.AllowPublish = groupInfo.AllowPublish;
                 profile.Charter = groupInfo.Charter;
                 profile.FounderID = groupInfo.FounderID;
                 profile.GroupID = groupID;
-                profile.GroupMembershipCount = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID).Count;
-                profile.GroupRolesCount = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID).Count;
+                profile.GroupMembershipCount = m_groupData.GetGroupMembers(grID, groupID).Count;
+                profile.GroupRolesCount = m_groupData.GetGroupRoles(grID, groupID).Count;
                 profile.InsigniaID = groupInfo.GroupPicture;
                 profile.MaturePublish = groupInfo.MaturePublish;
                 profile.MembershipFee = groupInfo.MembershipFee;
@@ -666,7 +691,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 profile.ShowInList = groupInfo.ShowInList;
             }
 
-            GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID);
+            GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID);
             if (memberInfo != null)
             {
                 profile.MemberTitle = memberInfo.GroupTitle;
@@ -680,46 +705,46 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            return m_groupData.GetAgentGroupMemberships(UUID.Zero, agentID).ToArray();
+            return m_groupData.GetAgentGroupMemberships(null, agentID).ToArray();
         }
 
         public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID)
         {
-            if (m_debugEnabled) 
-                m_log.DebugFormat(
-                    "[GROUPS]: {0} called with groupID={1}, agentID={2}",
-                    System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID);
+            if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            return m_groupData.GetAgentGroupMembership(UUID.Zero, agentID, groupID);
+            return m_groupData.GetAgentGroupMembership(null, agentID, groupID);
         }
 
         public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            // Note: Permissions checking for modification rights is handled by the Groups Server/Service
-            m_groupData.UpdateGroup(GetRequestingAgentID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish);
+            // TODO: Security Check?
+
+            m_groupData.UpdateGroup(GetClientGroupRequestID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish);
         }
 
         public void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile)
         {
-            // Note: Permissions checking for modification rights is handled by the Groups Server/Service
+            // TODO: Security Check?
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_groupData.SetAgentGroupInfo(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, acceptNotices, listInProfile);
+            m_groupData.SetAgentGroupInfo(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, acceptNotices, listInProfile);
         }
 
         public UUID CreateGroup(IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), UUID.Zero, name) != null)
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
+
+            if (m_groupData.GetGroupRecord(grID, UUID.Zero, name) != null)
             {
                 remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists.");
                 return UUID.Zero;
             }
             // is there is a money module present ?
-            IMoneyModule money = remoteClient.Scene.RequestModuleInterface<IMoneyModule>();
+            IMoneyModule money=remoteClient.Scene.RequestModuleInterface<IMoneyModule>();
             if (money != null)
             {
                 // do the transaction, that is if the agent has got sufficient funds
@@ -727,14 +752,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient));
+                money.ApplyGroupCreationCharge(remoteClient.AgentId);
             }
-            UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
+            UUID groupID = m_groupData.CreateGroup(grID, name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, remoteClient.AgentId);
 
             remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly");
 
             // Update the founder with new group information.
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
 
             return groupID;
         }
@@ -745,7 +770,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // ToDo: check if agent is a member of group and is allowed to see notices?
 
-            return m_groupData.GetGroupNotices(GetRequestingAgentID(remoteClient), groupID).ToArray();
+            return m_groupData.GetGroupNotices(GetClientGroupRequestID(remoteClient), groupID).ToArray();
         }
 
         /// <summary>
@@ -755,7 +780,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            GroupMembershipData membership = m_groupData.GetAgentActiveMembership(UUID.Zero, avatarID);
+            GroupMembershipData membership = m_groupData.GetAgentActiveMembership(null, avatarID);
             if (membership != null)
             {
                 return membership.GroupTitle;
@@ -770,13 +795,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_groupData.SetAgentActiveGroupRole(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, titleRoleID);
+            m_groupData.SetAgentActiveGroupRole(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, titleRoleID);
 
             // TODO: Not sure what all is needed here, but if the active group role change is for the group
             // the client currently has set active, then we need to do a scene presence update too
-            // if (m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient)).GroupID == GroupID)
+            // if (m_groupData.GetAgentActiveMembership(remoteClient.AgentId).GroupID == GroupID)
                 
-            UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient));
+            UpdateAllClientsWithGroupInfo(remoteClient.AgentId);
         }
 
 
@@ -786,14 +811,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // Security Checks are handled in the Groups Service.
 
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
+
             switch ((OpenMetaverse.GroupRoleUpdate)updateType)
             {
                 case OpenMetaverse.GroupRoleUpdate.Create:
-                    m_groupData.AddGroupRole(GetRequestingAgentID(remoteClient), groupID, UUID.Random(), name, description, title, powers);
+                    m_groupData.AddGroupRole(grID, groupID, UUID.Random(), name, description, title, powers);
                     break;
 
                 case OpenMetaverse.GroupRoleUpdate.Delete:
-                    m_groupData.RemoveGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID);
+                    m_groupData.RemoveGroupRole(grID, groupID, roleID);
                     break;
 
                 case OpenMetaverse.GroupRoleUpdate.UpdateAll:
@@ -804,7 +831,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         GroupPowers gp = (GroupPowers)powers;
                         m_log.DebugFormat("[GROUPS]: Role ({0}) updated with Powers ({1}) ({2})", name, powers.ToString(), gp.ToString());
                     }
-                    m_groupData.UpdateGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID, name, description, title, powers);
+                    m_groupData.UpdateGroupRole(grID, groupID, roleID, name, description, title, powers);
                     break;
 
                 case OpenMetaverse.GroupRoleUpdate.NoUpdate:
@@ -815,7 +842,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
 
             // TODO: This update really should send out updates for everyone in the role that just got changed.
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
         }
 
         public void GroupRoleChanges(IClientAPI remoteClient, UUID groupID, UUID roleID, UUID memberID, uint changes)
@@ -823,16 +850,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
             // Todo: Security check
 
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
+
             switch (changes)
             {
                 case 0:
                     // Add
-                    m_groupData.AddAgentToGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID);
+                    m_groupData.AddAgentToGroupRole(grID, memberID, groupID, roleID);
 
                     break;
                 case 1:
                     // Remove
-                    m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID);
+                    m_groupData.RemoveAgentFromGroupRole(grID, memberID, groupID, roleID);
                     
                     break;
                 default:
@@ -841,23 +870,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
 
             // TODO: This update really should send out updates for everyone in the role that just got changed.
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
         }
 
         public void GroupNoticeRequest(IClientAPI remoteClient, UUID groupNoticeID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            GroupNoticeInfo data = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), groupNoticeID);
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
+
+            GroupNoticeInfo data = m_groupData.GetGroupNotice(grID, groupNoticeID);
 
             if (data != null)
             {
-                GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), data.GroupID, null);
+                GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, data.GroupID, null);
 
                 GridInstantMessage msg = new GridInstantMessage();
                 msg.imSessionID = UUID.Zero.Guid;
                 msg.fromAgentID = data.GroupID.Guid;
-                msg.toAgentID = GetRequestingAgentID(remoteClient).Guid;
+                msg.toAgentID = remoteClient.AgentId.Guid;
                 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
                 msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName;
                 msg.message = data.noticeData.Subject + "|" + data.Message;
@@ -869,7 +900,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 msg.RegionID = UUID.Zero.Guid;
                 msg.binaryBucket = data.BinaryBucket;
 
-                OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient));
+                OutgoingInstantMessage(msg, remoteClient.AgentId);
             }
 
         }
@@ -889,7 +920,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             msg.Position = Vector3.Zero;
             msg.RegionID = UUID.Zero.Guid;
 
-            GroupNoticeInfo info = m_groupData.GetGroupNotice(agentID, groupNoticeID);
+            GroupNoticeInfo info = m_groupData.GetGroupNotice(null, groupNoticeID);
             if (info != null)
             {
                 msg.fromAgentID = info.GroupID.Guid;
@@ -916,7 +947,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             // Send agent information about his groups
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
         }
 
         public void JoinGroupRequest(IClientAPI remoteClient, UUID groupID)
@@ -924,19 +955,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             // Should check to see if OpenEnrollment, or if there's an outstanding invitation
-            m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, UUID.Zero);
+            m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, UUID.Zero);
 
             remoteClient.SendJoinGroupReply(groupID, true);
 
             // Should this send updates to everyone in the group?
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
         }
 
         public void LeaveGroupRequest(IClientAPI remoteClient, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID);
+            m_groupData.RemoveAgentFromGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID);
 
             remoteClient.SendLeaveGroupReply(groupID, true);
 
@@ -944,32 +975,34 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // SL sends out notifcations to the group messaging session that the person has left
             // Should this also update everyone who is in the group?
-            SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+            SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
         }
 
         public void EjectGroupMemberRequest(IClientAPI remoteClient, UUID groupID, UUID ejecteeID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
+            GroupRequestID grID = GetClientGroupRequestID(remoteClient);
 
             // Todo: Security check?
-            m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), ejecteeID, groupID);
+            m_groupData.RemoveAgentFromGroup(grID, ejecteeID, groupID);
 
-            remoteClient.SendEjectGroupMemberReply(GetRequestingAgentID(remoteClient), groupID, true);
+            remoteClient.SendEjectGroupMemberReply(remoteClient.AgentId, groupID, true);
 
-            GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null);
+            GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, groupID, null);
+            UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(ejecteeID);
 
-            UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, ejecteeID);
-            if ((groupInfo == null) || (account == null))
+            if ((groupInfo == null) || (userProfile == null))
             {
                 return;
-            }            
+            }
+            
 
             // Send Message to Ejectee
             GridInstantMessage msg = new GridInstantMessage();
             
             msg.imSessionID = UUID.Zero.Guid;
-            msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid;
+            msg.fromAgentID = remoteClient.AgentId.Guid;
             // msg.fromAgentID = info.GroupID;
             msg.toAgentID = ejecteeID.Guid;
             //msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
@@ -995,13 +1028,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             msg = new GridInstantMessage();
             msg.imSessionID = UUID.Zero.Guid;
-            msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid;
-            msg.toAgentID = GetRequestingAgentID(remoteClient).Guid;
+            msg.fromAgentID = remoteClient.AgentId.Guid;
+            msg.toAgentID = remoteClient.AgentId.Guid;
             msg.timestamp = 0;
             msg.fromAgentName = remoteClient.Name;
-            if (account != null)
+            if (userProfile != null)
             {
-                msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", remoteClient.Name, groupInfo.GroupName, account.FirstName + " " + account.LastName);
+                msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", remoteClient.Name, groupInfo.GroupName, userProfile.Name);
             }
             else
             {
@@ -1014,7 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             msg.Position = Vector3.Zero;
             msg.RegionID = remoteClient.Scene.RegionInfo.RegionID.Guid;
             msg.binaryBucket = new byte[0];
-            OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient));
+            OutgoingInstantMessage(msg, remoteClient.AgentId);
 
 
             // SL sends out messages to everyone in the group
@@ -1028,12 +1061,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // Todo: Security check, probably also want to send some kind of notification
             UUID InviteID = UUID.Random();
+            GroupRequestID grid = GetClientGroupRequestID(remoteClient);
 
-            m_groupData.AddAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID, groupID, roleID, invitedAgentID);
+            m_groupData.AddAgentToGroupInvite(grid, InviteID, groupID, roleID, invitedAgentID);
 
             // Check to see if the invite went through, if it did not then it's possible
             // the remoteClient did not validate or did not have permission to invite.
-            GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID);
+            GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(grid, InviteID);
 
             if (inviteInfo != null)
             {
@@ -1045,7 +1079,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                     msg.imSessionID = inviteUUID;
 
-                    // msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid;
+                    // msg.fromAgentID = remoteClient.AgentId.Guid;
                     msg.fromAgentID = groupID.Guid;
                     msg.toAgentID = invitedAgentID.Guid;
                     //msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
@@ -1098,6 +1132,57 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return child;
         }
 
+        private GroupRequestID GetClientGroupRequestID(IClientAPI client)
+        {
+            if (client == null)
+            {
+                return new GroupRequestID();
+            }
+
+            lock (m_clientRequestIDInfo)
+            {
+                if (!m_clientRequestIDInfo.ContainsKey(client.AgentId))
+                {
+                    GroupRequestIDInfo info = new GroupRequestIDInfo();
+                    info.RequestID.AgentID = client.AgentId;
+                    info.RequestID.SessionID = client.SessionId;
+
+                    UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(client.AgentId);
+                    if (userProfile == null)
+                    {
+                        // This should be impossible.  If I've been passed a reference to a client
+                        // that client should be registered with the UserService.  So something
+                        // is horribly wrong somewhere.
+
+                        m_log.WarnFormat("[GROUPS]: Could not find a user profile for {0} / {1}", client.Name, client.AgentId);
+
+                        // Default to local user service and hope for the best?
+                        info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
+
+                    }
+                    else if (userProfile is ForeignUserProfileData)
+                    {
+                        // They aren't from around here
+                        ForeignUserProfileData fupd = (ForeignUserProfileData)userProfile;
+                        info.RequestID.UserServiceURL = fupd.UserServerURI;
+                    }
+                    else
+                    {
+                        // They're a local user, use this:
+                        info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
+                    }
+
+                    m_clientRequestIDInfo.Add(client.AgentId, info);
+                }
+
+                m_clientRequestIDInfo[client.AgentId].LastUsedTMStamp = DateTime.Now;
+
+                return m_clientRequestIDInfo[client.AgentId].RequestID;
+            }
+// Unreachable code!
+//            return new GroupRequestID();
+        }
+
         /// <summary>
         /// Send 'remoteClient' the group membership 'data' for agent 'dataForAgentID'.
         /// </summary>
@@ -1116,7 +1201,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             foreach (GroupMembershipData membership in data)
             {
-                if (GetRequestingAgentID(remoteClient) != dataForAgentID)
+                if (remoteClient.AgentId != dataForAgentID)
                 {
                     if (!membership.ListInProfile)
                     {
@@ -1144,18 +1229,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             OSDMap llDataStruct = new OSDMap(3);
             llDataStruct.Add("AgentData", AgentData);
             llDataStruct.Add("GroupData", GroupData);
-            llDataStruct.Add("NewGroupData", NewGroupData);

-

-            if (m_debugEnabled)

-            {

-                m_log.InfoFormat("[GROUPS]: {0}", OSDParser.SerializeJsonString(llDataStruct));

-            }
+            llDataStruct.Add("NewGroupData", NewGroupData);
 
             IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
 
             if (queue != null)
             {
-                queue.Enqueue(EventQueueHelper.buildEvent("AgentGroupDataUpdate", llDataStruct), GetRequestingAgentID(remoteClient));
+                queue.Enqueue(EventQueueHelper.buildEvent("AgentGroupDataUpdate", llDataStruct), remoteClient.AgentId);
             }
             
         }
@@ -1228,7 +1308,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// <returns></returns>
         private GroupMembershipData[] GetProfileListedGroupMemberships(IClientAPI requestingClient, UUID dataForAgentID)
         {
-            List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(requestingClient.AgentId, dataForAgentID);
+            List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(requestingClient), dataForAgentID);
             GroupMembershipData[] membershipArray;
 
             if (requestingClient.AgentId != dataForAgentID)
@@ -1250,7 +1330,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId);
                 foreach (GroupMembershipData membership in membershipArray)
                 {
-                    m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2} - {3}", dataForAgentID, membership.GroupName, membership.GroupTitle, membership.GroupPowers);
+                    m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2}", dataForAgentID, membership.GroupName, membership.GroupTitle);
                 }
             }
 
@@ -1262,12 +1342,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             // TODO: All the client update functions need to be reexamined because most do too much and send too much stuff
-            UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, dataForAgentID);
+            UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(dataForAgentID);
             string firstname, lastname;
-            if (account != null)
+            if (userProfile != null)
             {
-                firstname = account.FirstName;
-                lastname = account.LastName;
+                firstname = userProfile.FirstName;
+                lastname = userProfile.SurName;
             }
             else
             {
@@ -1308,24 +1388,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             //
         }
 
-        #endregion

-

-        private UUID GetRequestingAgentID(IClientAPI client)

-        {

-            UUID requestingAgentID = UUID.Zero;

-            if (client != null)

-            {

-                requestingAgentID = client.AgentId;

-            }

-            return requestingAgentID;

-        }
+        #endregion
     }
 
-    public class GroupNoticeInfo
-    {
-        public GroupNoticeData noticeData = new GroupNoticeData();
-        public UUID GroupID = UUID.Zero;
-        public string Message = string.Empty;
-        public byte[] BinaryBucket = new byte[0];
-    }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
index 6487967..9e0fa2d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
@@ -36,41 +36,42 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 {
     interface IGroupsServicesConnector
     {
-        UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish, UUID founderID);
-        void UpdateGroup(UUID RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish);
-        GroupRecord GetGroupRecord(UUID RequestingAgentID, UUID GroupID, string GroupName);
-        List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search);
-        List<GroupMembersData> GetGroupMembers(UUID RequestingAgentID, UUID GroupID);
+        UUID CreateGroup(GroupRequestID requestID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish, UUID founderID);
+        void UpdateGroup(GroupRequestID requestID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish);
+        GroupRecord GetGroupRecord(GroupRequestID requestID, UUID GroupID, string GroupName);
+        List<DirGroupsReplyData> FindGroups(GroupRequestID requestID, string search);
+        List<GroupMembersData> GetGroupMembers(GroupRequestID requestID, UUID GroupID);
 
-        void AddGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers);
-        void UpdateGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers);
-        void RemoveGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID);
-        List<GroupRolesData> GetGroupRoles(UUID RequestingAgentID, UUID GroupID);
-        List<GroupRoleMembersData> GetGroupRoleMembers(UUID RequestingAgentID, UUID GroupID);
+        void AddGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers);
+        void UpdateGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers);
+        void RemoveGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID);
+        List<GroupRolesData> GetGroupRoles(GroupRequestID requestID, UUID GroupID);
+        List<GroupRoleMembersData> GetGroupRoleMembers(GroupRequestID requestID, UUID GroupID);
 
-        void AddAgentToGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID);
-        void RemoveAgentFromGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
+        void AddAgentToGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID);
+        void RemoveAgentFromGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID);
 
-        void AddAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID);
-        GroupInviteInfo GetAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID);
-        void RemoveAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID);
+        void AddAgentToGroupInvite(GroupRequestID requestID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID);
+        GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID);
+        void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID);
 
-        void AddAgentToGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID);
-        void RemoveAgentFromGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID);
-        List<GroupRolesData> GetAgentGroupRoles(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
 
-        void SetAgentActiveGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
-        GroupMembershipData GetAgentActiveMembership(UUID RequestingAgentID, UUID AgentID);
+        void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID);
+        void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID);
+        List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID);
 
-        void SetAgentActiveGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID);
-        void SetAgentGroupInfo(UUID RequestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile);
+        void SetAgentActiveGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID);
+        GroupMembershipData GetAgentActiveMembership(GroupRequestID requestID, UUID AgentID);
 
-        GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
-        List<GroupMembershipData> GetAgentGroupMemberships(UUID RequestingAgentID, UUID AgentID);
+        void SetAgentActiveGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID);
+        void SetAgentGroupInfo(GroupRequestID requestID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile);
 
-        void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket);
-        GroupNoticeInfo GetGroupNotice(UUID RequestingAgentID, UUID noticeID);
-        List<GroupNoticeData> GetGroupNotices(UUID RequestingAgentID, UUID GroupID);
+        GroupMembershipData GetAgentGroupMembership(GroupRequestID requestID, UUID AgentID, UUID GroupID);
+        List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID);
+
+        void AddGroupNotice(GroupRequestID requestID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket);
+        GroupNoticeInfo GetGroupNotice(GroupRequestID requestID, UUID noticeID);
+        List<GroupNoticeData> GetGroupNotices(GroupRequestID requestID, UUID GroupID);
     }
 
     public class GroupInviteInfo
@@ -80,4 +81,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         public UUID AgentID  = UUID.Zero;
         public UUID InviteID = UUID.Zero;
     }
+
+    public class GroupRequestID
+    {
+        public UUID AgentID = UUID.Zero;
+        public string UserServiceURL = string.Empty;
+        public UUID SessionID = UUID.Zero;
+    }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
deleted file mode 100644
index 590753e..0000000
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ /dev/null
@@ -1,1278 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
-
-using Nwc.XmlRpc;
-
-using log4net;
-using Mono.Addins;
-using Nini.Config;
-
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Services.Interfaces;
-
-/***************************************************************************
- * Simian Data Map
- * ===============
- * 
- * OwnerID -> Type -> Key
- * -----------------------
- * 
- * UserID -> Group -> ActiveGroup
- * + GroupID
- * 
- * UserID -> GroupMember -> GroupID
- * + SelectedRoleID [UUID]
- * + AcceptNotices  [bool]
- * + ListInProfile  [bool]
- * + Contribution   [int]
- *
- * UserID -> GroupRole[GroupID] -> RoleID
- * 
- * GroupID -> Group -> GroupName 
- * + Charter
- * + ShowInList
- * + InsigniaID
- * + MembershipFee
- * + OpenEnrollment
- * + AllowPublish
- * + MaturePublish
- * + FounderID
- * + EveryonePowers
- * + OwnerRoleID
- * + OwnersPowers
- * 
- * GroupID -> GroupRole -> RoleID
- * + Name
- * + Description
- * + Title
- * + Powers
- * 
- * GroupID -> GroupMemberInvite -> InviteID
- * + AgentID
- * + RoleID
- * 
- * GroupID -> GroupNotice -> NoticeID
- * + TimeStamp          [uint]
- * + FromName           [string]
- * + Subject            [string]
- * + Message            [string]
- * + BinaryBucket       [byte[]]
- *
- * */
-
-namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public const GroupPowers m_DefaultEveryonePowers = GroupPowers.AllowSetHome | 
-            GroupPowers.Accountable | 
-            GroupPowers.JoinChat | 
-            GroupPowers.AllowVoiceChat | 
-            GroupPowers.ReceiveNotices | 
-            GroupPowers.StartProposal | 
-            GroupPowers.VoteOnProposal;
-
-        // Would this be cleaner as (GroupPowers)ulong.MaxValue;
-        public const GroupPowers m_DefaultOwnerPowers = GroupPowers.Accountable
-                                | GroupPowers.AllowEditLand
-                                | GroupPowers.AllowFly
-                                | GroupPowers.AllowLandmark
-                                | GroupPowers.AllowRez
-                                | GroupPowers.AllowSetHome
-                                | GroupPowers.AllowVoiceChat
-                                | GroupPowers.AssignMember
-                                | GroupPowers.AssignMemberLimited
-                                | GroupPowers.ChangeActions
-                                | GroupPowers.ChangeIdentity
-                                | GroupPowers.ChangeMedia
-                                | GroupPowers.ChangeOptions
-                                | GroupPowers.CreateRole
-                                | GroupPowers.DeedObject
-                                | GroupPowers.DeleteRole
-                                | GroupPowers.Eject
-                                | GroupPowers.FindPlaces
-                                | GroupPowers.Invite
-                                | GroupPowers.JoinChat
-                                | GroupPowers.LandChangeIdentity
-                                | GroupPowers.LandDeed
-                                | GroupPowers.LandDivideJoin
-                                | GroupPowers.LandEdit
-                                | GroupPowers.LandEjectAndFreeze
-                                | GroupPowers.LandGardening
-                                | GroupPowers.LandManageAllowed
-                                | GroupPowers.LandManageBanned
-                                | GroupPowers.LandManagePasses
-                                | GroupPowers.LandOptions
-                                | GroupPowers.LandRelease
-                                | GroupPowers.LandSetSale
-                                | GroupPowers.ModerateChat
-                                | GroupPowers.ObjectManipulate
-                                | GroupPowers.ObjectSetForSale
-                                | GroupPowers.ReceiveNotices
-                                | GroupPowers.RemoveMember
-                                | GroupPowers.ReturnGroupOwned
-                                | GroupPowers.ReturnGroupSet
-                                | GroupPowers.ReturnNonGroup
-                                | GroupPowers.RoleProperties
-                                | GroupPowers.SendNotices
-                                | GroupPowers.SetLandingPoint
-                                | GroupPowers.StartProposal
-                                | GroupPowers.VoteOnProposal;
-
-        private bool m_connectorEnabled = false;
-
-        private string m_serviceURL = string.Empty;
-
-        private bool m_debugEnabled = false;
-
-        // private IUserAccountService m_accountService = null;
-        
-
-        #region IRegionModuleBase Members
-
-        public string Name
-        {
-            get { return "SimianGroupsServicesConnector"; }
-        }
-
-        // this module is not intended to be replaced, but there should only be 1 of them.
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void Initialise(IConfigSource config)
-        {
-            IConfig groupsConfig = config.Configs["Groups"];
-
-            if (groupsConfig == null)
-            {
-                // Do not run this module by default.
-                return;
-            }
-            else
-            {
-                // if groups aren't enabled, we're not needed.
-                // if we're not specified as the connector to use, then we're not wanted
-                if ((groupsConfig.GetBoolean("Enabled", false) == false)
-                    || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))
-                {
-                    m_connectorEnabled = false;
-                    return;
-                }
-
-                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
-
-                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
-                if ((m_serviceURL == null) ||
-                    (m_serviceURL == string.Empty))
-                {
-                    m_log.ErrorFormat("Please specify a valid Simian Server URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
-                    m_connectorEnabled = false;
-                    return;
-                }
-
-                // If we got all the config options we need, lets start'er'up
-                m_connectorEnabled = true;
-
-                m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
-
-            }
-        }
-
-        public void Close()
-        {
-            m_log.InfoFormat("[GROUPS-CONNECTOR]: Closing {0}", this.Name);
-        }
-
-        public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene)
-        {
-            if (m_connectorEnabled)
-            {
-                scene.RegisterModuleInterface<IGroupsServicesConnector>(this);
-            }
-        }
-
-        public void RemoveRegion(OpenSim.Region.Framework.Scenes.Scene scene)
-        {
-            if (scene.RequestModuleInterface<IGroupsServicesConnector>() == this)
-            {
-                scene.UnregisterModuleInterface<IGroupsServicesConnector>(this);
-            }
-        }
-
-        public void RegionLoaded(OpenSim.Region.Framework.Scenes.Scene scene)
-        {
-            // TODO: May want to consider listenning for Agent Connections so we can pre-cache group info
-            // scene.EventManager.OnNewClient += OnNewClient;
-        }
-
-        #endregion
-
-        #region ISharedRegionModule Members
-
-        public void PostInitialise()
-        {
-            // NoOp
-        }
-
-        #endregion
-
-
-
-
-        #region IGroupsServicesConnector Members
-
-        /// <summary>
-        /// Create a Group, including Everyone and Owners Role, place FounderID in both groups, select Owner as selected role, and newly created group as agent's active role.
-        /// </summary>
-        public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, 
-                                int membershipFee, bool openEnrollment, bool allowPublish, 
-                                bool maturePublish, UUID founderID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            UUID GroupID     = UUID.Random();
-            UUID OwnerRoleID = UUID.Random();
-
-            OSDMap GroupInfoMap = new OSDMap();
-            GroupInfoMap["Charter"] = OSD.FromString(charter);
-            GroupInfoMap["ShowInList"] = OSD.FromBoolean(showInList);
-            GroupInfoMap["InsigniaID"] = OSD.FromUUID(insigniaID);
-            GroupInfoMap["MembershipFee"] = OSD.FromInteger(0);
-            GroupInfoMap["OpenEnrollment"] = OSD.FromBoolean(openEnrollment);
-            GroupInfoMap["AllowPublish"] = OSD.FromBoolean(allowPublish);
-            GroupInfoMap["MaturePublish"] = OSD.FromBoolean(maturePublish);
-            GroupInfoMap["FounderID"] = OSD.FromUUID(founderID);
-            GroupInfoMap["EveryonePowers"] = OSD.FromULong((ulong)m_DefaultEveryonePowers);
-            GroupInfoMap["OwnerRoleID"] = OSD.FromUUID(OwnerRoleID);
-            GroupInfoMap["OwnersPowers"] = OSD.FromULong((ulong)m_DefaultOwnerPowers);
-
-            if(SimianAddGeneric(GroupID, "Group", name, GroupInfoMap))
-            {
-                AddGroupRole(requestingAgentID, GroupID, UUID.Zero, "Everyone", "Members of " + name, "Member of " + name, (ulong)m_DefaultEveryonePowers);

-                AddGroupRole(requestingAgentID, GroupID, OwnerRoleID, "Owners", "Owners of " + name, "Owner of " + name, (ulong)m_DefaultOwnerPowers);

-                
-                AddAgentToGroup(requestingAgentID, requestingAgentID, GroupID, OwnerRoleID);
-
-                return GroupID;
-            }
-            else
-            {
-                return UUID.Zero;
-            }
-        }
-
-
-        public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, 
-                                UUID insigniaID, int membershipFee, bool openEnrollment, 
-                                bool allowPublish, bool maturePublish)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-            // TODO: Check to make sure requestingAgentID has permission to update group
-
-            string GroupName;
-            OSDMap GroupInfoMap;
-            if( SimianGetFirstGenericEntry(groupID, "GroupInfo", out GroupName, out GroupInfoMap) )
-            {
-                GroupInfoMap["Charter"] = OSD.FromString(charter);
-                GroupInfoMap["ShowInList"] = OSD.FromBoolean(showInList);
-                GroupInfoMap["InsigniaID"] = OSD.FromUUID(insigniaID);
-                GroupInfoMap["MembershipFee"] = OSD.FromInteger(0);
-                GroupInfoMap["OpenEnrollment"] = OSD.FromBoolean(openEnrollment);
-                GroupInfoMap["AllowPublish"] = OSD.FromBoolean(allowPublish);
-                GroupInfoMap["MaturePublish"] = OSD.FromBoolean(maturePublish);
-
-                SimianAddGeneric(groupID, "Group", GroupName, GroupInfoMap);
-            }
-
-        }
-
-
-        public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
-                                 string title, ulong powers)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupRoleInfo = new OSDMap();
-            GroupRoleInfo["Name"] = OSD.FromString(name);
-            GroupRoleInfo["Description"] = OSD.FromString(description);
-            GroupRoleInfo["Title"] = OSD.FromString(title);
-            GroupRoleInfo["Powers"] = OSD.FromULong((ulong)powers);
-
-            // TODO: Add security, make sure that requestingAgentID has permision to add roles
-            SimianAddGeneric(groupID, "GroupRole", roleID.ToString(), GroupRoleInfo);
-        }
-
-        public void RemoveGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // TODO: Add security
-
-            // Can't delete the Everyone Role
-            if (roleID != UUID.Zero)
-            {
-                // Remove all GroupRole Members from Role
-                Dictionary<UUID, OSDMap> GroupRoleMembers;
-                string GroupRoleMemberType = "GroupRole" + groupID.ToString();
-                if (SimianGetGenericEntries(GroupRoleMemberType, roleID.ToString(), out GroupRoleMembers))
-                {
-                    foreach(UUID UserID in GroupRoleMembers.Keys)
-                    {
-                        EnsureRoleNotSelectedByMember(groupID, roleID, UserID);
-
-                        SimianRemoveGenericEntry(UserID, GroupRoleMemberType, roleID.ToString());
-                    }
-                }
-
-                // Remove role
-                SimianRemoveGenericEntry(groupID, "GroupRole", roleID.ToString());
-            }
-        }
-
-
-        public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
-                                    string title, ulong powers)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // TODO: Security, check that requestingAgentID is allowed to update group roles
-
-            OSDMap GroupRoleInfo;
-            if (SimianGetGenericEntry(groupID, "GroupRole", roleID.ToString(), out GroupRoleInfo))
-            {
-                if (name != null)
-                {
-                    GroupRoleInfo["Name"] = OSD.FromString(name);
-                }
-                if (description != null)
-                {
-                    GroupRoleInfo["Description"] = OSD.FromString(description);
-                }
-                if (title != null)
-                {
-                    GroupRoleInfo["Title"] = OSD.FromString(title);
-                }
-                GroupRoleInfo["Powers"] = OSD.FromULong((ulong)powers);
-
-            }
-
-
-            SimianAddGeneric(groupID, "GroupRole", roleID.ToString(), GroupRoleInfo);
-        }
-
-        public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupInfoMap = null;
-            if (groupID != UUID.Zero)
-            {
-                if (!SimianGetFirstGenericEntry(groupID, "Group", out groupName, out GroupInfoMap))
-                {
-                    return null;
-                }
-            } 
-            else if ((groupName != null) && (groupName != string.Empty))
-            {

-                if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap))
-                {
-                    return null;
-                }
-            }
-
-            GroupRecord GroupInfo = new GroupRecord();
-
-            GroupInfo.GroupID = groupID;

-            GroupInfo.GroupName = groupName;
-            GroupInfo.Charter = GroupInfoMap["Charter"].AsString();
-            GroupInfo.ShowInList = GroupInfoMap["ShowInList"].AsBoolean();
-            GroupInfo.GroupPicture = GroupInfoMap["InsigniaID"].AsUUID();
-            GroupInfo.MembershipFee = GroupInfoMap["MembershipFee"].AsInteger();
-            GroupInfo.OpenEnrollment = GroupInfoMap["OpenEnrollment"].AsBoolean();
-            GroupInfo.AllowPublish = GroupInfoMap["AllowPublish"].AsBoolean();
-            GroupInfo.MaturePublish = GroupInfoMap["MaturePublish"].AsBoolean();
-            GroupInfo.FounderID = GroupInfoMap["FounderID"].AsUUID();
-            GroupInfo.OwnerRoleID = GroupInfoMap["OwnerRoleID"].AsUUID();
-
-            return GroupInfo;
-
-        }
-
-        public GroupProfileData GetMemberGroupProfile(UUID requestingAgentID, UUID groupID, UUID memberID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap groupProfile;
-            string groupName;
-            if (!SimianGetFirstGenericEntry(groupID, "Group", out groupName, out groupProfile))
-            {
-                // GroupProfileData is not nullable
-                return new GroupProfileData();
-            }
-
-            GroupProfileData MemberGroupProfile = new GroupProfileData();
-            MemberGroupProfile.GroupID = groupID;
-            MemberGroupProfile.Name = groupName;
-
-            if (groupProfile["Charter"] != null)
-            {
-                MemberGroupProfile.Charter = groupProfile["Charter"].AsString();
-            }
-            
-            MemberGroupProfile.ShowInList = groupProfile["ShowInList"].AsString() == "1";
-            MemberGroupProfile.InsigniaID = groupProfile["InsigniaID"].AsUUID();
-            MemberGroupProfile.MembershipFee = groupProfile["MembershipFee"].AsInteger();
-            MemberGroupProfile.OpenEnrollment = groupProfile["OpenEnrollment"].AsBoolean();
-            MemberGroupProfile.AllowPublish = groupProfile["AllowPublish"].AsBoolean();
-            MemberGroupProfile.MaturePublish = groupProfile["MaturePublish"].AsBoolean();
-            MemberGroupProfile.FounderID = groupProfile["FounderID"].AsUUID();;
-            MemberGroupProfile.OwnerRole = groupProfile["OwnerRoleID"].AsUUID(); 
-
-            Dictionary<UUID, OSDMap> Members;
-            if (SimianGetGenericEntries("GroupMember",groupID.ToString(), out Members))
-            {
-                MemberGroupProfile.GroupMembershipCount = Members.Count;
-            }
-
-            Dictionary<string, OSDMap> Roles;
-            if (SimianGetGenericEntries(groupID, "GroupRole", out Roles))
-            {
-                MemberGroupProfile.GroupRolesCount = Roles.Count;
-            }
-
-            // TODO: Get Group Money balance from somewhere
-            // group.Money = 0;
-
-            GroupMembershipData MemberInfo = GetAgentGroupMembership(requestingAgentID, memberID, groupID);
-
-            MemberGroupProfile.MemberTitle = MemberInfo.GroupTitle;
-            MemberGroupProfile.PowersMask = MemberInfo.GroupPowers;
-
-            return MemberGroupProfile;
-        }
-
-        public void SetAgentActiveGroup(UUID requestingAgentID, UUID agentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap ActiveGroup = new OSDMap();
-            ActiveGroup.Add("GroupID", OSD.FromUUID(groupID));
-            SimianAddGeneric(agentID, "Group", "ActiveGroup", ActiveGroup);
-        }
-
-        public void SetAgentActiveGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupMemberInfo;
-            if (!SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out GroupMemberInfo))
-            {
-                GroupMemberInfo = new OSDMap();
-            }
-
-            GroupMemberInfo["SelectedRoleID"] = OSD.FromUUID(roleID);
-            SimianAddGeneric(agentID, "GroupMember", groupID.ToString(), GroupMemberInfo);
-        }
-
-        public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupMemberInfo;
-            if (!SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out GroupMemberInfo))
-            {
-                GroupMemberInfo = new OSDMap();
-            }
-            
-            GroupMemberInfo["AcceptNotices"] = OSD.FromBoolean(acceptNotices);
-            GroupMemberInfo["ListInProfile"] = OSD.FromBoolean(listInProfile);
-            GroupMemberInfo["Contribution"] = OSD.FromInteger(0);
-            GroupMemberInfo["SelectedRole"] = OSD.FromUUID(UUID.Zero);
-            SimianAddGeneric(agentID, "GroupMember", groupID.ToString(), GroupMemberInfo);
-        }
-
-        public void AddAgentToGroupInvite(UUID requestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap Invite = new OSDMap();
-            Invite["AgentID"] = OSD.FromUUID(agentID);
-            Invite["RoleID"] = OSD.FromUUID(roleID);
-
-            SimianAddGeneric(groupID, "GroupMemberInvite", inviteID.ToString(), Invite);
-        }
-
-        public GroupInviteInfo GetAgentToGroupInvite(UUID requestingAgentID, UUID inviteID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupMemberInvite;
-            UUID GroupID;
-            if (!SimianGetFirstGenericEntry("GroupMemberInvite", inviteID.ToString(), out GroupID, out GroupMemberInvite))
-            {
-                return null;
-            }
-
-            GroupInviteInfo inviteInfo = new GroupInviteInfo();
-            inviteInfo.InviteID = inviteID;
-            inviteInfo.GroupID = GroupID;
-            inviteInfo.AgentID = GroupMemberInvite["AgentID"].AsUUID();
-            inviteInfo.RoleID = GroupMemberInvite["RoleID"].AsUUID();
-
-            return inviteInfo;
-        }
-
-        public void RemoveAgentToGroupInvite(UUID requestingAgentID, UUID inviteID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            GroupInviteInfo invite = GetAgentToGroupInvite(requestingAgentID, inviteID);
-            SimianRemoveGenericEntry(invite.GroupID, "GroupMemberInvite", inviteID.ToString());
-        }
-
-        public void AddAgentToGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // Setup Agent/Group information
-            SetAgentGroupInfo(requestingAgentID, AgentID, GroupID, true, true);
-
-            // Add agent to Everyone Group
-            AddAgentToGroupRole(requestingAgentID, AgentID, GroupID, UUID.Zero);
-
-            // Add agent to Specified Role
-            AddAgentToGroupRole(requestingAgentID, AgentID, GroupID, RoleID);
-
-            // Set selected role in this group to specified role
-            SetAgentActiveGroupRole(requestingAgentID, AgentID, GroupID, RoleID);
-        }
-
-        public void RemoveAgentFromGroup(UUID requestingAgentID, UUID agentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // If current active group is the group the agent is being removed from, change their group to UUID.Zero
-            GroupMembershipData memberActiveMembership = GetAgentActiveMembership(requestingAgentID, agentID);
-            if (memberActiveMembership.GroupID == groupID)
-            {
-                SetAgentActiveGroup(agentID, agentID, UUID.Zero);
-            }
-
-            // Remove Group Member information for this group
-            SimianRemoveGenericEntry(agentID, "GroupMember", groupID.ToString());
-
-            // By using a Simian Generics Type consisting of a prefix and a groupID, 
-            // combined with RoleID as key allows us to get a list of roles a particular member
-            // of a group is assigned to.
-            string GroupRoleMemberType = "GroupRole" + groupID.ToString();
-
-            // Take Agent out of all other group roles
-            Dictionary<string, OSDMap> GroupRoles;
-            if (SimianGetGenericEntries(agentID, GroupRoleMemberType, out GroupRoles))
-            {
-                foreach (string roleID in GroupRoles.Keys)
-                {
-                    SimianRemoveGenericEntry(agentID, GroupRoleMemberType, roleID);
-                }
-            }
-        }
-
-        public void AddAgentToGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            SimianAddGeneric(agentID, "GroupRole" + groupID.ToString(), roleID.ToString(), new OSDMap());
-        }
-
-        public void RemoveAgentFromGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // Cannot remove members from the Everyone Role
-            if (roleID != UUID.Zero)
-            {
-                EnsureRoleNotSelectedByMember(groupID, roleID, agentID);
-
-                string GroupRoleMemberType = "GroupRole" + groupID.ToString();
-                SimianRemoveGenericEntry(agentID, GroupRoleMemberType, roleID.ToString());
-            }
-        }
-
-        public List<DirGroupsReplyData> FindGroups(UUID requestingAgentID, string search)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<DirGroupsReplyData> findings = new List<DirGroupsReplyData>();
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "Type", "Group" },
-                { "Key", search },
-                { "Fuzzy", "1" }
-            };
-
-
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
-            if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
-            {
-                OSDArray entryArray = (OSDArray)response["Entries"];
-                foreach (OSDMap entryMap in entryArray)
-                {
-                    DirGroupsReplyData data = new DirGroupsReplyData();
-                    data.groupID = entryMap["OwnerID"].AsUUID();
-                    data.groupName = entryMap["Key"].AsString();
-
-                    // TODO: is there a better way to do this?
-                    Dictionary<UUID, OSDMap> Members;
-                    if (SimianGetGenericEntries("GroupMember", data.groupID.ToString(), out Members))
-                    {
-                        data.members = Members.Count;
-                    }
-                    else
-                    {
-                        data.members = 0;
-                    }
-                    
-                    // TODO: sort results?
-                    // data.searchOrder = order;
-
-                    findings.Add(data);
-                }
-            }
-
-
-            return findings;
-        }
-
-        public GroupMembershipData GetAgentGroupMembership(UUID requestingAgentID, UUID agentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            GroupMembershipData data = new GroupMembershipData();
-
-            ///////////////////////////////
-            // Agent Specific Information:
-            //
-            OSDMap UserActiveGroup;
-            if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
-            {
-                data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID);
-            }
-
-            OSDMap UserGroupMemberInfo;
-            if( SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo) )
-            {
-                data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean();
-                data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger();
-                data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean();
-                data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID();
-
-                ///////////////////////////////
-                // Role Specific Information:
-                //
-
-                OSDMap GroupRoleInfo;
-                if( SimianGetGenericEntry(groupID, "GroupRole", data.ActiveRole.ToString(), out GroupRoleInfo) )
-                {
-                    data.GroupTitle = GroupRoleInfo["Title"].AsString();
-                    data.GroupPowers = GroupRoleInfo["Powers"].AsULong();
-                }
-            }
-
-            ///////////////////////////////
-            // Group Specific Information:
-            //
-            OSDMap GroupInfo;
-            string GroupName;
-            if( SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo) )
-            {
-                data.GroupID = groupID;
-                data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean();
-                data.Charter = GroupInfo["Charter"].AsString();
-                data.FounderID = GroupInfo["FounderID"].AsUUID();
-                data.GroupName = GroupName;
-                data.GroupPicture = GroupInfo["InsigniaID"].AsUUID();
-                data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean();
-                data.MembershipFee = GroupInfo["MembershipFee"].AsInteger();
-                data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean();
-                data.ShowInList = GroupInfo["ShowInList"].AsBoolean();
-            }
-
-            return data;
-        }
-
-        public GroupMembershipData GetAgentActiveMembership(UUID requestingAgentID, UUID agentID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            UUID GroupID = UUID.Zero;
-            OSDMap UserActiveGroup;
-            if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
-            {
-                GroupID = UserActiveGroup["GroupID"].AsUUID();
-            }

-

-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Active GroupID : {0}", GroupID.ToString());

-            return GetAgentGroupMembership(requestingAgentID, agentID, GroupID);
-        }
-
-        public List<GroupMembershipData> GetAgentGroupMemberships(UUID requestingAgentID, UUID agentID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupMembershipData> memberships = new List<GroupMembershipData>();
-
-            Dictionary<string,OSDMap> GroupMemberShips;
-            if (SimianGetGenericEntries(agentID, "GroupMember", out GroupMemberShips))
-            {
-                foreach (string key in GroupMemberShips.Keys)
-                {
-                    memberships.Add(GetAgentGroupMembership(requestingAgentID, agentID, UUID.Parse(key)));
-                }
-            }
-            
-            return memberships;
-        }
-
-        public List<GroupRolesData> GetAgentGroupRoles(UUID requestingAgentID, UUID agentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupRolesData> Roles = new List<GroupRolesData>();
-
-            Dictionary<string, OSDMap> GroupRoles;

-            if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles))

-            {

-                Dictionary<string, OSDMap> MemberRoles;

-                if (SimianGetGenericEntries(agentID, "GroupRole" + groupID.ToString(), out MemberRoles))

-                {

-                    foreach (KeyValuePair<string, OSDMap> kvp in MemberRoles)

-                    {

-                        GroupRolesData data = new GroupRolesData();

-                        data.RoleID = UUID.Parse(kvp.Key);

-                        data.Name = GroupRoles[kvp.Key]["Name"].AsString();

-                        data.Description = GroupRoles[kvp.Key]["Description"].AsString();

-                        data.Title = GroupRoles[kvp.Key]["Title"].AsString();

-                        data.Powers = GroupRoles[kvp.Key]["Powers"].AsULong();

-

-                        Roles.Add(data);

-                    }

-                }

-            }
-            return Roles;
-        }
-
-        public List<GroupRolesData> GetGroupRoles(UUID requestingAgentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupRolesData> Roles = new List<GroupRolesData>();
-
-            Dictionary<string, OSDMap> GroupRoles;
-            if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles))
-            {
-                foreach (KeyValuePair<string, OSDMap> role in GroupRoles)
-                {
-                    GroupRolesData data = new GroupRolesData();
-
-                    data.RoleID = UUID.Parse(role.Key);
-
-                    data.Name = role.Value["Name"].AsString();
-                    data.Description = role.Value["Description"].AsString();
-                    data.Title = role.Value["Title"].AsString();
-                    data.Powers = role.Value["Powers"].AsULong();
-
-                    Dictionary<UUID, OSDMap> GroupRoleMembers;
-                    if (SimianGetGenericEntries("GroupRole" + groupID.ToString(), role.Key, out GroupRoleMembers))
-                    {
-                        data.Members = GroupRoleMembers.Count;
-                    }
-                    else
-                    {
-                        data.Members = 0;
-                    }
-
-                    Roles.Add(data);
-                }
-            }
-
-            return Roles;
-
-        }
-
-
-
-        public List<GroupMembersData> GetGroupMembers(UUID requestingAgentID, UUID GroupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupMembersData> members = new List<GroupMembersData>();
-
-            OSDMap GroupInfo;
-            string GroupName;
-            UUID GroupOwnerRoleID = UUID.Zero;
-            if (!SimianGetFirstGenericEntry(GroupID, "Group", out GroupName, out GroupInfo))
-            {
-                return members;
-            }
-            GroupOwnerRoleID = GroupInfo["OwnerRoleID"].AsUUID();
-
-            // Locally cache group roles, since we'll be needing this data for each member
-            Dictionary<string,OSDMap> GroupRoles;
-            SimianGetGenericEntries(GroupID, "GroupRole", out GroupRoles);
-
-            // Locally cache list of group owners
-            Dictionary<UUID, OSDMap> GroupOwners;
-            SimianGetGenericEntries("GroupRole" + GroupID.ToString(), GroupOwnerRoleID.ToString(), out GroupOwners);
-
-
-            Dictionary<UUID, OSDMap> GroupMembers;
-            if (SimianGetGenericEntries("GroupMember", GroupID.ToString(), out GroupMembers))
-            {
-                foreach (KeyValuePair<UUID, OSDMap> member in GroupMembers)
-                {
-                    GroupMembersData data = new GroupMembersData();
-
-                    data.AgentID = member.Key;
-
-                    UUID SelectedRoleID = member.Value["SelectedRoleID"].AsUUID();
-
-                    data.AcceptNotices = member.Value["AcceptNotices"].AsBoolean();
-                    data.ListInProfile = member.Value["ListInProfile"].AsBoolean();
-                    data.Contribution = member.Value["Contribution"].AsInteger();
-
-                    data.IsOwner = GroupOwners.ContainsKey(member.Key);
-
-                    OSDMap GroupRoleInfo = GroupRoles[SelectedRoleID.ToString()];
-                    data.Title = GroupRoleInfo["Title"].AsString();
-                    data.AgentPowers = GroupRoleInfo["Powers"].AsULong();
-
-                    members.Add(data);
-                }
-            }
-
-            return members;
-
-        }
-
-        public List<GroupRoleMembersData> GetGroupRoleMembers(UUID requestingAgentID, UUID groupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupRoleMembersData> members = new List<GroupRoleMembersData>();
-
-            Dictionary<string, OSDMap> GroupRoles;
-            if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles))
-            {
-                foreach( KeyValuePair<string, OSDMap> Role in GroupRoles )
-                {
-                    Dictionary<UUID, OSDMap> GroupRoleMembers;
-                    if( SimianGetGenericEntries("GroupRole"+groupID.ToString(), Role.Key, out GroupRoleMembers) )
-                    {
-                        foreach( KeyValuePair<UUID, OSDMap> GroupRoleMember in GroupRoleMembers )
-                        {
-                            GroupRoleMembersData data = new GroupRoleMembersData();

-

-                            data.MemberID = GroupRoleMember.Key;
-                            data.RoleID = UUID.Parse(Role.Key);
-
-                            members.Add(data);
-                        }
-                    }
-                }
-            }
-
-            return members;
-        }
-
-        public List<GroupNoticeData> GetGroupNotices(UUID requestingAgentID, UUID GroupID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            List<GroupNoticeData> values = new List<GroupNoticeData>();
-
-            Dictionary<string, OSDMap> Notices;
-            if (SimianGetGenericEntries(GroupID, "GroupNotice", out Notices))
-            {
-                foreach (KeyValuePair<string, OSDMap> Notice in Notices)
-                {
-                    GroupNoticeData data = new GroupNoticeData();
-                    data.NoticeID = UUID.Parse(Notice.Key);
-                    data.Timestamp = Notice.Value["TimeStamp"].AsUInteger();
-                    data.FromName = Notice.Value["FromName"].AsString();
-                    data.Subject = Notice.Value["Subject"].AsString();
-                    data.HasAttachment = Notice.Value["BinaryBucket"].AsBinary().Length > 0;
-
-                    //TODO: Figure out how to get this
-                    data.AssetType = 0;
-
-                    values.Add(data);
-                }
-            }
-
-            return values;
-
-        }
-        public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap GroupNotice;
-            UUID GroupID;
-            if (SimianGetFirstGenericEntry("GroupNotice", noticeID.ToString(), out GroupID, out GroupNotice))
-            {
-                GroupNoticeInfo data = new GroupNoticeInfo();
-                data.GroupID = GroupID;
-                data.Message = GroupNotice["Message"].AsString();
-                data.BinaryBucket = GroupNotice["BinaryBucket"].AsBinary();
-                data.noticeData.NoticeID = noticeID;
-                data.noticeData.Timestamp = GroupNotice["TimeStamp"].AsUInteger();
-                data.noticeData.FromName = GroupNotice["FromName"].AsString();
-                data.noticeData.Subject = GroupNotice["Subject"].AsString();
-                data.noticeData.HasAttachment = data.BinaryBucket.Length > 0;
-                data.noticeData.AssetType = 0;
-
-                if (data.Message == null)
-                {
-                    data.Message = string.Empty;
-                }
-
-                return data;
-            }
-            return null;
-        }
-        public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            OSDMap Notice = new OSDMap();
-            Notice["TimeStamp"] = OSD.FromUInteger((uint)Util.UnixTimeSinceEpoch());
-            Notice["FromName"] = OSD.FromString(fromName);
-            Notice["Subject"] = OSD.FromString(subject);
-            Notice["Message"] = OSD.FromString(message);
-            Notice["BinaryBucket"] = OSD.FromBinary(binaryBucket);
-
-            SimianAddGeneric(groupID, "GroupNotice", noticeID.ToString(), Notice);
-            
-        }
-        #endregion
-
-
-        private void EnsureRoleNotSelectedByMember(UUID groupID, UUID roleID, UUID userID)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-
-            // If member's SelectedRole is roleID, change their selected role to Everyone
-            // before removing them from the role
-            OSDMap UserGroupInfo;
-            if (SimianGetGenericEntry(userID, "GroupMember", groupID.ToString(), out UserGroupInfo))
-            {
-                if (UserGroupInfo["SelectedRoleID"].AsUUID() == roleID)
-                {
-                    UserGroupInfo["SelectedRoleID"] = OSD.FromUUID(UUID.Zero);
-                }
-                SimianAddGeneric(userID, "GroupMember", groupID.ToString(), UserGroupInfo);
-            }
-        }
-
-
-        #region Simian Util Methods
-        private bool SimianAddGeneric(UUID ownerID, string type, string key, OSDMap map)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key);
-
-            string value = OSDParser.SerializeJsonString(map);
-
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  value: {0}", value);
-
-            NameValueCollection RequestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "AddGeneric" },
-                { "OwnerID", ownerID.ToString() },
-                { "Type", type },
-                { "Key", key },
-                { "Value", value}
-            };
-
-
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
-            if (Response["Success"].AsBoolean())
-            {
-                return true;
-            }
-            else
-            {
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error {0}, {1}, {2}, {3}", ownerID, type, key, Response["Message"]);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Returns the first of possibly many entries for Owner/Type pair
-        /// </summary>
-        private bool SimianGetFirstGenericEntry(UUID ownerID, string type, out string key, out OSDMap map)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type);
-
-            NameValueCollection RequestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "OwnerID", ownerID.ToString() },
-                { "Type", type }
-            };
-
-
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
-            if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
-            {
-                OSDArray entryArray = (OSDArray)Response["Entries"];

-                if (entryArray.Count >= 1)

-                {

-                    OSDMap entryMap = entryArray[0] as OSDMap;

-                    key = entryMap["Key"].AsString();

-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

-                    return true;

-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }
-            }
-            else
-            {
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]);
-            }
-            key = null;
-            map = null;
-            return false;
-        }
-        private bool SimianGetFirstGenericEntry(string type, string key, out UUID ownerID, out OSDMap map)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, type, key);
-
-
-            NameValueCollection RequestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "Type", type },
-                { "Key", key}
-            };
-
-
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
-            if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
-            {
-                OSDArray entryArray = (OSDArray)Response["Entries"];

-                if (entryArray.Count >= 1)

-                {

-                    OSDMap entryMap = entryArray[0] as OSDMap;

-                    ownerID = entryMap["OwnerID"].AsUUID();

-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

-                    return true;

-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }
-            }
-            else
-            {
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]);
-            }
-            ownerID = UUID.Zero;
-            map = null;
-            return false;
-        }
-
-        private bool SimianGetGenericEntry(UUID ownerID, string type, string key, out OSDMap map)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key);
-
-            NameValueCollection RequestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "OwnerID", ownerID.ToString() },
-                { "Type", type },
-                { "Key", key}
-            };
-
-
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
-            if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
-            {
-                OSDArray entryArray = (OSDArray)Response["Entries"];
-                if (entryArray.Count == 1)
-                {
-                    OSDMap entryMap = entryArray[0] as OSDMap;
-                    key = entryMap["Key"].AsString();
-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

-                    return true;
-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }

-            }
-            else
-            {
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]);
-            }
-            map = null;
-            return false;
-        }
-
-        private bool SimianGetGenericEntries(UUID ownerID, string type, out Dictionary<string, OSDMap> maps)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name,ownerID, type);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "OwnerID", ownerID.ToString() },
-                { "Type", type }
-            };
-            
-
-
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
-            if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
-            {
-                maps = new Dictionary<string, OSDMap>();
-
-                OSDArray entryArray = (OSDArray)response["Entries"];
-                foreach (OSDMap entryMap in entryArray)
-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-                    maps.Add(entryMap["Key"].AsString(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()));
-                }
-                if(maps.Count == 0)

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }
-
-                return true;
-            }
-            else
-            {
-                maps = null;
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", response["Message"]);
-            }
-            return false;
-        }
-        private bool SimianGetGenericEntries(string type, string key, out Dictionary<UUID, OSDMap> maps)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, type, key);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetGenerics" },
-                { "Type", type },
-                { "Key", key }
-            };
-
-
-
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
-            if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
-            {
-                maps = new Dictionary<UUID, OSDMap>();
-
-                OSDArray entryArray = (OSDArray)response["Entries"];
-                foreach (OSDMap entryMap in entryArray)
-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
-                    maps.Add(entryMap["OwnerID"].AsUUID(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()));
-                }

-                if (maps.Count == 0)

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }

-                return true;
-            }
-            else
-            {
-                maps = null;
-                m_log.WarnFormat("[SIMIAN-GROUPS-CONNECTOR]: Error retrieving group info ({0})", response["Message"]);
-            }
-            return false;
-        }
-
-        private bool SimianRemoveGenericEntry(UUID ownerID, string type, string key)
-        {
-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "RemoveGeneric" },
-                { "OwnerID", ownerID.ToString() },
-                { "Type", type },
-                { "Key", key }
-            };
-
-
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
-            if (response["Success"].AsBoolean())
-            {
-                return true;
-            }
-            else
-            {
-                m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error {0}, {1}, {2}, {3}", ownerID, type, key, response["Message"]);
-                return false;
-            }
-        }
-        #endregion
-    }
-
-}
-
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index ab343c8..964d0bb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -40,16 +40,16 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class XmlRpcGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
 
         public const GroupPowers m_DefaultEveryonePowers = GroupPowers.AllowSetHome | 
             GroupPowers.Accountable | 
@@ -68,8 +68,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         private string m_groupReadKey  = string.Empty;
         private string m_groupWriteKey = string.Empty;
 
-        private IUserAccountService m_accountService = null;
-        
 
         #region IRegionModuleBase Members
 
@@ -120,9 +118,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_groupReadKey = groupsConfig.GetString("XmlRpcServiceReadKey", string.Empty);
                 m_groupWriteKey = groupsConfig.GetString("XmlRpcServiceWriteKey", string.Empty);
 
-                
-
-
                 // If we got all the config options we need, lets start'er'up
                 m_connectorEnabled = true;
             }
@@ -136,24 +131,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene)
         {
             if (m_connectorEnabled)
-            {
-
-                if (m_accountService == null)
-                {
-                    m_accountService = scene.UserAccountService;
-                }
-
-
                 scene.RegisterModuleInterface<IGroupsServicesConnector>(this);
-            }
         }
 
         public void RemoveRegion(OpenSim.Region.Framework.Scenes.Scene scene)
         {
             if (scene.RequestModuleInterface<IGroupsServicesConnector>() == this)
-            {
                 scene.UnregisterModuleInterface<IGroupsServicesConnector>(this);
-            }
         }
 
         public void RegionLoaded(OpenSim.Region.Framework.Scenes.Scene scene)
@@ -173,12 +157,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
 
+
+
         #region IGroupsServicesConnector Members
 
         /// <summary>
         /// Create a Group, including Everyone and Owners Role, place FounderID in both groups, select Owner as selected role, and newly created group as agent's active role.
         /// </summary>
-        public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, 
+        public UUID CreateGroup(GroupRequestID requestID, string name, string charter, bool showInList, UUID insigniaID, 
                                 int membershipFee, bool openEnrollment, bool allowPublish, 
                                 bool maturePublish, UUID founderID)
         {
@@ -250,7 +236,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
 
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.createGroup", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.createGroup", param);
 
             if (respData.Contains("error"))
             {
@@ -262,7 +248,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return UUID.Parse((string)respData["GroupID"]);
         }
 
-        public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, 
+        public void UpdateGroup(GroupRequestID requestID, UUID groupID, string charter, bool showInList, 
                                 UUID insigniaID, int membershipFee, bool openEnrollment, 
                                 bool allowPublish, bool maturePublish)
         {
@@ -276,10 +262,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             param["AllowPublish"] = allowPublish == true ? 1 : 0;
             param["MaturePublish"] = maturePublish == true ? 1 : 0;
 
-            XmlRpcCall(requestingAgentID, "groups.updateGroup", param);
+            XmlRpcCall(requestID, "groups.updateGroup", param);
         }
 
-        public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        public void AddGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, 
                                  string title, ulong powers)
         {
             Hashtable param = new Hashtable();
@@ -290,19 +276,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             param["Title"] = title;
             param["Powers"] = powers.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.addRoleToGroup", param);
+            XmlRpcCall(requestID, "groups.addRoleToGroup", param);
         }
 
-        public void RemoveGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID)
+        public void RemoveGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = groupID.ToString();
             param["RoleID"] = roleID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.removeRoleFromGroup", param);
+            XmlRpcCall(requestID, "groups.removeRoleFromGroup", param);
         }
 
-        public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        public void UpdateGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, 
                                     string title, ulong powers)
         {
             Hashtable param = new Hashtable();
@@ -322,10 +308,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
             param["Powers"] = powers.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.updateGroupRole", param);
+            XmlRpcCall(requestID, "groups.updateGroupRole", param);
         }
 
-        public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID GroupID, string GroupName)
+        public GroupRecord GetGroupRecord(GroupRequestID requestID, UUID GroupID, string GroupName)
         {
             Hashtable param = new Hashtable();
             if (GroupID != UUID.Zero)
@@ -337,7 +323,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 param["Name"] = GroupName.ToString();
             }
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroup", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroup", param);
 
             if (respData.Contains("error"))
             {
@@ -348,12 +334,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         }
 
-        public GroupProfileData GetMemberGroupProfile(UUID requestingAgentID, UUID GroupID, UUID AgentID)
+        public GroupProfileData GetMemberGroupProfile(GroupRequestID requestID, UUID GroupID, UUID AgentID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroup", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroup", param);
 
             if (respData.Contains("error"))
             {
@@ -361,35 +347,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return new GroupProfileData();
             }
 
-            GroupMembershipData MemberInfo = GetAgentGroupMembership(requestingAgentID, AgentID, GroupID);
+            GroupMembershipData MemberInfo = GetAgentGroupMembership(requestID, AgentID, GroupID);
             GroupProfileData MemberGroupProfile = GroupProfileHashtableToGroupProfileData(respData);
 
             MemberGroupProfile.MemberTitle = MemberInfo.GroupTitle;
             MemberGroupProfile.PowersMask = MemberInfo.GroupPowers;
 
             return MemberGroupProfile;
+
         }
 
-        public void SetAgentActiveGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID)
+
+
+        public void SetAgentActiveGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.setAgentActiveGroup", param);
+            XmlRpcCall(requestID, "groups.setAgentActiveGroup", param);
         }
 
-        public void SetAgentActiveGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID)
+        public void SetAgentActiveGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
             param["SelectedRoleID"] = RoleID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.setAgentGroupInfo", param);
+            XmlRpcCall(requestID, "groups.setAgentGroupInfo", param);
         }
 
-        public void SetAgentGroupInfo(UUID requestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile)
+        public void SetAgentGroupInfo(GroupRequestID requestID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
@@ -397,11 +386,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             param["AcceptNotices"] = AcceptNotices ? "1" : "0";
             param["ListInProfile"] = ListInProfile ? "1" : "0";
 
-            XmlRpcCall(requestingAgentID, "groups.setAgentGroupInfo", param);
+            XmlRpcCall(requestID, "groups.setAgentGroupInfo", param);
 
         }
 
-        public void AddAgentToGroupInvite(UUID requestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID)
+        public void AddAgentToGroupInvite(GroupRequestID requestID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID)
         {
             Hashtable param = new Hashtable();
             param["InviteID"] = inviteID.ToString();
@@ -409,16 +398,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             param["RoleID"] = roleID.ToString();
             param["GroupID"] = groupID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.addAgentToGroupInvite", param);
+            XmlRpcCall(requestID, "groups.addAgentToGroupInvite", param);
 
         }
 
-        public GroupInviteInfo GetAgentToGroupInvite(UUID requestingAgentID, UUID inviteID)
+        public GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID)
         {
             Hashtable param = new Hashtable();
             param["InviteID"] = inviteID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentToGroupInvite", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getAgentToGroupInvite", param);
 
             if (respData.Contains("error"))
             {
@@ -434,59 +423,60 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return inviteInfo;
         }
 
-        public void RemoveAgentToGroupInvite(UUID requestingAgentID, UUID inviteID)
+        public void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID)
         {
             Hashtable param = new Hashtable();
             param["InviteID"] = inviteID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.removeAgentToGroupInvite", param);
+            XmlRpcCall(requestID, "groups.removeAgentToGroupInvite", param);
         }
 
-        public void AddAgentToGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID)
+        public void AddAgentToGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
             param["RoleID"] = RoleID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.addAgentToGroup", param);
+            XmlRpcCall(requestID, "groups.addAgentToGroup", param);
         }
 
-        public void RemoveAgentFromGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID)
+        public void RemoveAgentFromGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.removeAgentFromGroup", param);
+            XmlRpcCall(requestID, "groups.removeAgentFromGroup", param);
         }
 
-        public void AddAgentToGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID)
+        public void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
             param["RoleID"] = RoleID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.addAgentToGroupRole", param);
+            XmlRpcCall(requestID, "groups.addAgentToGroupRole", param);
         }
 
-        public void RemoveAgentFromGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID)
+        public void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
             param["RoleID"] = RoleID.ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.removeAgentFromGroupRole", param);
+            XmlRpcCall(requestID, "groups.removeAgentFromGroupRole", param);
         }
 
-        public List<DirGroupsReplyData> FindGroups(UUID requestingAgentID, string search)
+
+        public List<DirGroupsReplyData> FindGroups(GroupRequestID requestID, string search)
         {
             Hashtable param = new Hashtable();
             param["Search"] = search;
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.findGroups", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.findGroups", param);
 
             List<DirGroupsReplyData> findings = new List<DirGroupsReplyData>();
 
@@ -508,13 +498,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return findings;
         }
 
-        public GroupMembershipData GetAgentGroupMembership(UUID requestingAgentID, UUID AgentID, UUID GroupID)
+        public GroupMembershipData GetAgentGroupMembership(GroupRequestID requestID, UUID AgentID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentGroupMembership", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getAgentGroupMembership", param);
 
             if (respData.Contains("error"))
             {
@@ -526,12 +516,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return data;
         }
 
-        public GroupMembershipData GetAgentActiveMembership(UUID requestingAgentID, UUID AgentID)
+        public GroupMembershipData GetAgentActiveMembership(GroupRequestID requestID, UUID AgentID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentActiveMembership", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getAgentActiveMembership", param);
 
             if (respData.Contains("error"))
             {
@@ -541,12 +531,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return HashTableToGroupMembershipData(respData);
         }
 
-        public List<GroupMembershipData> GetAgentGroupMemberships(UUID requestingAgentID, UUID AgentID)
+
+        public List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentGroupMemberships", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getAgentGroupMemberships", param);
 
             List<GroupMembershipData> memberships = new List<GroupMembershipData>();
 
@@ -561,13 +552,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return memberships;
         }
 
-        public List<GroupRolesData> GetAgentGroupRoles(UUID requestingAgentID, UUID AgentID, UUID GroupID)
+        public List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["AgentID"] = AgentID.ToString();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentRoles", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getAgentRoles", param);
 
             List<GroupRolesData> Roles = new List<GroupRolesData>();
 
@@ -593,12 +584,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         }
 
-        public List<GroupRolesData> GetGroupRoles(UUID requestingAgentID, UUID GroupID)
+        public List<GroupRolesData> GetGroupRoles(GroupRequestID requestID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupRoles", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroupRoles", param);
 
             List<GroupRolesData> Roles = new List<GroupRolesData>();
 
@@ -626,12 +617,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
 
 
-        public List<GroupMembersData> GetGroupMembers(UUID requestingAgentID, UUID GroupID)
+        public List<GroupMembersData> GetGroupMembers(GroupRequestID requestID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupMembers", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroupMembers", param);
 
             List<GroupMembersData> members = new List<GroupMembersData>();
 
@@ -659,12 +650,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         }
 
-        public List<GroupRoleMembersData> GetGroupRoleMembers(UUID requestingAgentID, UUID GroupID)
+        public List<GroupRoleMembersData> GetGroupRoleMembers(GroupRequestID requestID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupRoleMembers", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroupRoleMembers", param);
 
             List<GroupRoleMembersData> members = new List<GroupRoleMembersData>();
 
@@ -683,12 +674,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return members;
         }
 
-        public List<GroupNoticeData> GetGroupNotices(UUID requestingAgentID, UUID GroupID)
+        public List<GroupNoticeData> GetGroupNotices(GroupRequestID requestID, UUID GroupID)
         {
             Hashtable param = new Hashtable();
             param["GroupID"] = GroupID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupNotices", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroupNotices", param);
 
             List<GroupNoticeData> values = new List<GroupNoticeData>();
 
@@ -710,12 +701,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return values;
 
         }
-        public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID)
+        public GroupNoticeInfo GetGroupNotice(GroupRequestID requestID, UUID noticeID)
         {
             Hashtable param = new Hashtable();
             param["NoticeID"] = noticeID.ToString();
 
-            Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupNotice", param);
+            Hashtable respData = XmlRpcCall(requestID, "groups.getGroupNotice", param);
 
 
             if (respData.Contains("error"))
@@ -741,7 +732,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             return data;
         }
-        public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket)
+        public void AddGroupNotice(GroupRequestID requestID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket)
         {
             string binBucket = OpenMetaverse.Utils.BytesToHexString(binaryBucket, "");
 
@@ -754,7 +745,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             param["BinaryBucket"] = binBucket;
             param["TimeStamp"] = ((uint)Util.UnixTimeSinceEpoch()).ToString();
 
-            XmlRpcCall(requestingAgentID, "groups.addGroupNotice", param);
+            XmlRpcCall(requestID, "groups.addGroupNotice", param);
         }
         #endregion
 
@@ -787,6 +778,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private GroupRecord GroupProfileHashtableToGroupRecord(Hashtable groupProfile)
         {
+
             GroupRecord group = new GroupRecord();
             group.GroupID = UUID.Parse((string)groupProfile["GroupID"]);
             group.GroupName = groupProfile["Name"].ToString();
@@ -805,7 +797,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             return group;
         }
-        
         private static GroupMembershipData HashTableToGroupMembershipData(Hashtable respData)
         {
             GroupMembershipData data = new GroupMembershipData();
@@ -838,7 +829,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             data.MembershipFee = int.Parse((string)respData["MembershipFee"]);
             data.OpenEnrollment = ((string)respData["OpenEnrollment"] == "1");
             data.ShowInList = ((string)respData["ShowInList"] == "1");
-            
             return data;
         }
 
@@ -847,14 +837,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// <summary>
         /// Encapsulate the XmlRpc call to standardize security and error handling.
         /// </summary>
-        private Hashtable XmlRpcCall(UUID requestingAgentID, string function, Hashtable param)
+        private Hashtable XmlRpcCall(GroupRequestID requestID, string function, Hashtable param)
         {
-            string UserService;
-            UUID SessionID;
-            GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID);
-            param.Add("requestingAgentID", requestingAgentID.ToString());
-            param.Add("RequestingAgentUserService", UserService);
-            param.Add("RequestingSessionID", SessionID.ToString());
+            if (requestID == null)
+            {
+                requestID = new GroupRequestID();
+            }
+            param.Add("RequestingAgentID", requestID.AgentID.ToString());
+            param.Add("RequestingAgentUserService", requestID.UserServiceURL);
+            param.Add("RequestingSessionID", requestID.SessionID.ToString());
             
 
             param.Add("ReadKey", m_groupReadKey);
@@ -945,49 +936,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
         }
 
-        
-        /// <summary>
-        /// Group Request Tokens are an attempt to allow the groups service to authenticate 
-        /// requests.  Currently uses UserService, AgentID, and SessionID
-        /// TODO: Find a better way to do this.
-        /// </summary>
-        /// <param name="client"></param>
-        /// <returns></returns>
-        private void GetClientGroupRequestID(UUID AgentID, out string UserServiceURL, out UUID SessionID)
-        {
-            UserServiceURL = "";
-            SessionID = UUID.Zero;
-
-
-            // Need to rework this based on changes to User Services
-            /*
-            UserAccount userAccount = m_accountService.GetUserAccount(UUID.Zero,AgentID);
-            if (userAccount == null)
-            {
-                // This should be impossible.  If I've been passed a reference to a client
-                // that client should be registered with the UserService.  So something
-                // is horribly wrong somewhere.
-
-                m_log.WarnFormat("[GROUPS]: Could not find a UserServiceURL for {0}", AgentID);
 
-            }
-            else if (userProfile is ForeignUserProfileData)
-            {
-                // They aren't from around here
-                ForeignUserProfileData fupd = (ForeignUserProfileData)userProfile;
-                UserServiceURL = fupd.UserServerURI;
-                SessionID = fupd.CurrentAgent.SessionID;
+    }
 
-            }
-            else
-            {
-                // They're a local user, use this:
-                UserServiceURL = m_commManager.NetworkServersInfo.UserURL;
-                SessionID = userProfile.CurrentAgent.SessionID;
-            }
-            */
-        }
-        
+    public class GroupNoticeInfo
+    {
+        public GroupNoticeData noticeData = new GroupNoticeData();
+        public UUID GroupID = UUID.Zero;
+        public string Message = string.Empty;
+        public byte[] BinaryBucket = new byte[0];
     }
 }