fix merge

6 files changed, 122 insertions, 122 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 0aaf95c..8791235 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (!m_groupMessagingEnabled)
                 return;
-            
+
             scene.RegisterModuleInterface<IGroupsMessagingModule>(this);
 
             scene.AddCommand(
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 "This setting turns on very verbose groups messaging debugging",
                 HandleDebugGroupsMessagingVerbose);
         }
-        
+
         public void RegionLoaded(Scene scene)
         {
             if (!m_groupMessagingEnabled)
@@ -205,7 +205,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             m_msgTransferModule = null;
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -253,7 +253,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled)
                 m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-                
+
             GroupRecord groupInfo = m_groupData.GetGroupRecord(agentID, groupID, null);
 
             if (groupInfo != null)
@@ -270,7 +270,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             SendMessageToGroup(im, groupID, new UUID(im.fromAgentID), null);
         }
-        
+
         public void SendMessageToGroup(
             GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition)
         {
@@ -294,19 +294,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     m_usersOnlineCache.Add(groupID, onlineAgents, m_usersOnlineCacheExpirySeconds);
                 }
 
-                attemptDeliveryUuidSet 
+                attemptDeliveryUuidSet
                     = new HashSet<string>(Array.ConvertAll<PresenceInfo, string>(onlineAgents, pi => pi.UserID));
             }
             else
             {
-                attemptDeliveryUuidSet 
+                attemptDeliveryUuidSet
                     = new HashSet<string>(groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()));
 
                 if (m_debugEnabled)
                     m_log.DebugFormat(
                         "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} visible members",
                         groupID, groupMembers.Count);
-            }           
+            }
 
             foreach (GroupMembersData member in groupMembers)
             {
@@ -314,9 +314,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     if (!sendCondition(member))
                     {
-                        if (m_debugEnabled) 
+                        if (m_debugEnabled)
                             m_log.DebugFormat(
-                                "[GROUPS-MESSAGING]: Not sending to {0} as they do not fulfill send condition", 
+                                "[GROUPS-MESSAGING]: Not sending to {0} as they do not fulfill send condition",
                                  member.AgentID);
 
                         continue;
@@ -325,7 +325,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 else if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
-                    if (m_debugEnabled) 
+                    if (m_debugEnabled)
                         m_log.DebugFormat(
                             "[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
 
@@ -360,9 +360,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         // If they're not local, forward across the grid
                         m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
 
-                        if (m_debugEnabled) 
+                        if (m_debugEnabled)
                             m_log.DebugFormat(
-                                "[GROUPS-MESSAGING]: Delivering to {0} via grid took {1} ms", 
+                                "[GROUPS-MESSAGING]: Delivering to {0} via grid took {1} ms",
                                 member.AgentID, Environment.TickCount - startTick);
                     }
                     else
@@ -372,9 +372,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         ProcessMessageFromGroupSession(msg, client);
 
                         // Deliver locally, directly
-                        if (m_debugEnabled) 
+                        if (m_debugEnabled)
                             m_log.DebugFormat(
-                                "[GROUPS-MESSAGING]: Delivering to {0} locally took {1} ms", 
+                                "[GROUPS-MESSAGING]: Delivering to {0} locally took {1} ms",
                                 member.AgentID, Environment.TickCount - startTick);
                     }
                 }
@@ -385,9 +385,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                     m_msgTransferModule.HandleUndeliverableMessage(msg, delegate(bool success) { });
 
-                    if (m_debugEnabled) 
+                    if (m_debugEnabled)
                         m_log.DebugFormat(
-                            "[GROUPS-MESSAGING]: Handling undeliverable message for {0} took {1} ms", 
+                            "[GROUPS-MESSAGING]: Handling undeliverable message for {0} took {1} ms",
                             member.AgentID, Environment.TickCount - startTick);
                 }
             }
@@ -397,7 +397,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     "[GROUPS-MESSAGING]: Total SendMessageToGroup for group {0} with {1} members, {2} candidates for delivery took {3} ms",
                     groupID, groupMembersCount, attemptDeliveryUuidSet.Count(), Environment.TickCount - requestStartTick);
         }
-        
+
         #region SimGridEventHandlers
 
         void OnClientLogin(IClientAPI client)
@@ -417,7 +417,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // The instant message module will only deliver messages of dialog types:
             // MessageFromAgent, StartTyping, StopTyping, MessageFromObject
             //
-            // Any other message type will not be delivered to a client by the 
+            // Any other message type will not be delivered to a client by the
             // Instant Message Module
 
             if (m_debugEnabled)
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
 
             // Incoming message from a group
-            if ((msg.fromGroup == true) && 
+            if ((msg.fromGroup == true) &&
                 ((msg.dialog == (byte)InstantMessageDialog.SessionSend)
                  || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
                  || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)))
@@ -450,7 +450,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void ProcessMessageFromGroupSession(GridInstantMessage msg, IClientAPI client)
         {
-            if (m_debugEnabled) 
+            if (m_debugEnabled)
                 m_log.DebugFormat(
                     "[GROUPS-MESSAGING]: Session message from {0} going to agent {1}, sessionID {2}, type {3}",
                     msg.fromAgentName, msg.toAgentID, msg.imSessionID, (InstantMessageDialog)msg.dialog);
@@ -522,7 +522,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                                 }
                             }
                         }
-                        else 
+                        else
                         {
                             client.SendInstantMessage(msg);
                         }
@@ -570,7 +570,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING]: imSessionID({0}) toAgentID({1})", im.imSessionID, im.toAgentID);
 
                 GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero, GroupID, null);
-    
+
                 if (groupInfo != null)
                 {
                     m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
@@ -586,7 +586,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Send a message from locally connected client to a group
             if ((im.dialog == (byte)InstantMessageDialog.SessionSend))
             {
-                if (m_debugEnabled) 
+                if (m_debugEnabled)
                     m_log.DebugFormat("[GROUPS-MESSAGING]: Send message to session for group {0} with session ID {1}", GroupID, im.imSessionID.ToString());
 
                 //If this agent is sending a message, then they want to be in the session
@@ -597,7 +597,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if ((im.dialog == (byte)InstantMessageDialog.SessionDrop))
             {
-                if (m_debugEnabled) 
+                if (m_debugEnabled)
                     m_log.DebugFormat("[GROUPS-MESSAGING]: Send message to session for group {0} with session ID {1}", GroupID, im.imSessionID.ToString());
 
                 m_groupData.AgentDroppedFromGroupChatSession(AgentID, GroupID);
@@ -659,7 +659,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// </summary>
         private IClientAPI GetActiveClient(UUID agentID)
         {
-            if (m_debugEnabled) 
+            if (m_debugEnabled)
                 m_log.DebugFormat("[GROUPS-MESSAGING]: Looking for local client {0}", agentID);
 
             IClientAPI child = null;
@@ -672,14 +672,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     if (!sp.IsChildAgent)
                     {
-                        if (m_debugEnabled) 
+                        if (m_debugEnabled)
                             m_log.DebugFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", sp.ControllingClient.Name);
 
                         return sp.ControllingClient;
                     }
                     else
                     {
-                        if (m_debugEnabled) 
+                        if (m_debugEnabled)
                             m_log.DebugFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", sp.ControllingClient.Name);
 
                         child = sp.ControllingClient;
@@ -690,12 +690,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // If we didn't find a root, then just return whichever child we found, or null if none
             if (child == null)
             {
-                if (m_debugEnabled) 
+                if (m_debugEnabled)
                     m_log.DebugFormat("[GROUPS-MESSAGING]: Could not find local client for agent : {0}", agentID);
             }
             else
             {
-                if (m_debugEnabled) 
+                if (m_debugEnabled)
                     m_log.DebugFormat("[GROUPS-MESSAGING]: Returning child agent for client : {0}", child.Name);
             }
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 81add13..f0de7d4 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -50,19 +50,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// ; To use this module, you must specify the following in your OpenSim.ini
         /// [GROUPS]
         /// Enabled = true
-        /// 
+        ///
         /// Module   = GroupsModule
         /// NoticesEnabled = true
         /// DebugEnabled   = true
-        /// 
+        ///
         /// GroupsServicesConnectorModule = XmlRpcGroupsServicesConnector
         /// XmlRpcServiceURL      = http://osflotsam.org/xmlrpc.php
         /// XmlRpcServiceReadKey  = 1234
         /// XmlRpcServiceWriteKey = 1234
-        /// 
+        ///
         /// MessagingModule  = GroupsMessagingModule
         /// MessagingEnabled = true
-        /// 
+        ///
         /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for
         /// ; a problem discovered on some Windows based region servers.  Only disable
         /// ; if you see a large number (dozens) of the following Exceptions:
@@ -332,7 +332,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups);
         }
 
-       
+
         private void OnClientClosed(UUID AgentId, Scene scene)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -387,7 +387,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             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);
             if (group != null)
             {
@@ -403,9 +403,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
-            if (m_debugEnabled) 
+            if (m_debugEnabled)
                 m_log.DebugFormat(
-                    "[GROUPS]: {0} called for {1}, message type {2}", 
+                    "[GROUPS]: {0} called for {1}, message type {2}",
                     System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name, (InstantMessageDialog)im.dialog);
 
             // Group invitations
@@ -569,20 +569,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                                 if (targetUser != null)
                                 {
                                     m_log.DebugFormat(
-                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", 
+                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})",
                                         NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices);
                                 }
                                 else
                                 {
                                     m_log.DebugFormat(
-                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", 
+                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})",
                                         NoticeID, member.AgentID, member.AcceptNotices);
                                 }
                             }
                         }
                     }
 
-                    GridInstantMessage msg 
+                    GridInstantMessage msg
                         = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
 
                     if (m_groupsMessagingModule != null)
@@ -599,7 +599,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                 UUID noticeID = new UUID(im.imSessionID);
 
-                if (m_debugEnabled) 
+                if (m_debugEnabled)
                     m_log.DebugFormat("[GROUPS]: Requesting notice {0} for {1}", noticeID, remoteClient.AgentId);
 
                 GroupNoticeInfo notice = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), noticeID);
@@ -625,10 +625,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
                 else
                 {
-                    if (m_debugEnabled) 
+                    if (m_debugEnabled)
                         m_log.DebugFormat(
-                            "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.", 
-                            noticeID, remoteClient.AgentId);                   
+                            "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.",
+                            noticeID, remoteClient.AgentId);
                 }
             }
 
@@ -698,7 +698,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             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);
@@ -739,10 +739,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID)
         {
-            if (m_debugEnabled) 
+            if (m_debugEnabled)
                 m_log.DebugFormat(
                     "[GROUPS]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name);
-            
+
             List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID);
 
             if (m_debugEnabled)
@@ -829,7 +829,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID)
         {
-            if (m_debugEnabled) 
+            if (m_debugEnabled)
                 m_log.DebugFormat(
                     "[GROUPS]: {0} called with groupID={1}, agentID={2}",
                     System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID);
@@ -926,7 +926,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (membership != null)
             {
                 return membership.GroupTitle;
-            } 
+            }
             return string.Empty;
         }
 
@@ -999,7 +999,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 case 1:
                     // Remove
                     m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID);
-                    
+
                     break;
                 default:
                     m_log.ErrorFormat("[GROUPS]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes);
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // Send Message to Ejectee
             GridInstantMessage msg = new GridInstantMessage();
-            
+
             string ejecteeName = "Unknown member";
             // if local send a normal message
             if(ejecteeClient != null)
@@ -1219,7 +1219,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             msg.timestamp = 0;
             msg.fromAgentName = agentName;
             msg.message = string.Format("You have been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName);
-//            
+//
             msg.fromGroup = false;
             msg.offline = (byte)0;
             msg.ParentEstateID = 0;
@@ -1470,7 +1470,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     membershipArray = membershipData.ToArray();
                 }
             }
-            
+
             if (m_debugEnabled)
             {
                 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
index cff3212..08c7096 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// <returns></returns>
         /// <param name='RequestingAgentID'>The UUID of the user making the request.</param>
         /// <param name='GroupID'>
-        /// The ID of the record to retrieve.  
+        /// The ID of the record to retrieve.
         /// GroupName may be specified instead, in which case this parameter will be UUID.Zero
         /// </param>
         /// <param name='GroupName'>
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// If the user is a member of the group then the data structure is returned.  If not, then null is returned.
         /// </returns>
         GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
-        
+
         /// <summary>
         /// Get information about the groups to which a user belongs.
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 2c45712..98c7ed4 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -48,16 +48,16 @@ using OpenSim.Services.Interfaces;
 /***************************************************************************
  * Simian Data Map
  * ===============
- * 
+ *
  * OwnerID -> Type -> Key
  * -----------------------
- * 
+ *
  * UserID -> Group -> ActiveGroup
  * + GroupID
- * 
+ *
  * UserID -> GroupSessionDropped -> GroupID
  * UserID -> GroupSessionInvited -> GroupID
- * 
+ *
  * UserID -> GroupMember -> GroupID
  * + SelectedRoleID [UUID]
  * + AcceptNotices  [bool]
@@ -65,9 +65,9 @@ using OpenSim.Services.Interfaces;
  * + Contribution   [int]
  *
  * UserID -> GroupRole[GroupID] -> RoleID
- * 
- * 
- * GroupID -> Group -> GroupName 
+ *
+ *
+ * GroupID -> Group -> GroupName
  * + Charter
  * + ShowInList
  * + InsigniaID
@@ -79,17 +79,17 @@ using OpenSim.Services.Interfaces;
  * + EveryonePowers
  * + OwnerRoleID
  * + OwnersPowers
- * 
+ *
  * GroupID -> GroupRole -> RoleID
  * + Name
  * + Description
  * + Title
  * + Powers
- * 
+ *
  * GroupID -> GroupMemberInvite -> InviteID
  * + AgentID
  * + RoleID
- * 
+ *
  * GroupID -> GroupNotice -> NoticeID
  * + TimeStamp      [uint]
  * + FromName       [string]
@@ -106,12 +106,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
     {
         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 | 
+        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;
@@ -168,12 +168,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         private bool m_debugEnabled = false;
 
         private Dictionary<string, bool> m_pendingRequests = new Dictionary<string,bool>();
-        
+
         private ExpiringCache<string, OSDMap> m_memoryCache;
         private int m_cacheTimeout = 30;
 
         // private IUserAccountService m_accountService = null;
-        
+
 
         #region Region Module interfaceBase Members
 
@@ -229,10 +229,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Groups Cache Timeout set to {0}.", m_cacheTimeout);
                 }
 
-                
+
 
                 m_memoryCache = new ExpiringCache<string,OSDMap>();
-                
+
 
                 // If we got all the config options we need, lets start'er'up
                 m_connectorEnabled = true;
@@ -287,8 +287,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// <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, 
+        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);
@@ -313,7 +313,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 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;
@@ -325,8 +325,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
 
 
-        public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, 
-                                UUID insigniaID, int membershipFee, bool openEnrollment, 
+        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);
@@ -350,7 +350,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
 
 
-        public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        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);
@@ -393,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
 
 
-        public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        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);
@@ -434,7 +434,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     return null;
                 }
-            } 
+            }
             else if (!string.IsNullOrEmpty(groupName))
             {
                 if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap))
@@ -481,7 +481,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 MemberGroupProfile.Charter = groupProfile["Charter"].AsString();
             }
-            
+
             MemberGroupProfile.ShowInList = groupProfile["ShowInList"].AsString() == "1";
             MemberGroupProfile.InsigniaID = groupProfile["InsigniaID"].AsUUID();
             MemberGroupProfile.MembershipFee = groupProfile["MembershipFee"].AsInteger();
@@ -489,7 +489,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             MemberGroupProfile.AllowPublish = groupProfile["AllowPublish"].AsBoolean();
             MemberGroupProfile.MaturePublish = groupProfile["MaturePublish"].AsBoolean();
             MemberGroupProfile.FounderID = groupProfile["FounderID"].AsUUID();;
-            MemberGroupProfile.OwnerRole = groupProfile["OwnerRoleID"].AsUUID(); 
+            MemberGroupProfile.OwnerRole = groupProfile["OwnerRoleID"].AsUUID();
 
             Dictionary<UUID, OSDMap> Members;
             if (SimianGetGenericEntries("GroupMember",groupID.ToString(), out Members))
@@ -546,7 +546,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 GroupMemberInfo = new OSDMap();
             }
-            
+
             GroupMemberInfo["AcceptNotices"] = OSD.FromBoolean(acceptNotices);
             GroupMemberInfo["ListInProfile"] = OSD.FromBoolean(listInProfile);
             GroupMemberInfo["Contribution"] = OSD.FromInteger(0);
@@ -624,7 +624,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // 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, 
+            // 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();
@@ -696,7 +696,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         data.members = 0;
                     }
-                    
+
                     // TODO: sort results?
                     // data.searchOrder = order;
 
@@ -721,8 +721,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean();
                 data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger();
                 data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean();
-                data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID();         
-                
+                data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID();
+
                 ///////////////////////////////
                 // Agent Specific Information:
                 //
@@ -730,7 +730,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
                 {
                     data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID);
-                }                
+                }
 
                 ///////////////////////////////
                 // Role Specific Information:
@@ -740,8 +740,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     data.GroupTitle = GroupRoleInfo["Title"].AsString();
                     data.GroupPowers = GroupRoleInfo["Powers"].AsULong();
-                }                
-                
+                }
+
                 ///////////////////////////////
                 // Group Specific Information:
                 //
@@ -759,7 +759,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     data.MembershipFee = GroupInfo["MembershipFee"].AsInteger();
                     data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean();
                     data.ShowInList = GroupInfo["ShowInList"].AsBoolean();
-                }                       
+                }
             }
 
             return data;
@@ -794,7 +794,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     memberships.Add(GetAgentGroupMembership(requestingAgentID, agentID, UUID.Parse(key)));
                 }
             }
-            
+
             return memberships;
         }
 
@@ -1017,7 +1017,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             Notice["BinaryBucket"] = OSD.FromBinary(binaryBucket);
 
             SimianAddGeneric(groupID, "GroupNotice", noticeID.ToString(), Notice);
-            
+
         }
         #endregion
 
@@ -1250,7 +1250,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 { "OwnerID", ownerID.ToString() },
                 { "Type", type }
             };
-            
+
 
 
             OSDMap response = CachedPostRequest(requestArgs);
@@ -1357,7 +1357,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 || requestArgs["RequestMethod"] == "AddGeneric")
             {
                 m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: clearing generics cache");
-                
+
                 // Any and all updates cause the cache to clear
                 m_memoryCache.Clear();
 
@@ -1383,14 +1383,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     if (m_memoryCache.TryGetValue(CacheKey, out response))
                         return response;
-                    
+
                     if (! m_pendingRequests.ContainsKey(CacheKey))
                     {
                         m_pendingRequests.Add(CacheKey,true);
                         firstRequest = true;
                     }
                 }
-                
+
                 if (firstRequest)
                 {
                     // if it wasn't in the cache, pass the request to the Simian Grid Services
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         m_log.ErrorFormat("[SIMIAN GROUPS CONNECTOR]: request failed {0}", CacheKey);
                     }
-                    
+
                     // and cache the response
                     lock (m_memoryCache)
                     {
@@ -1420,7 +1420,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // {
             //     m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: query not in the cache");
             //     Util.PrintCallStack();
-                
+
             //     // if it wasn't in the cache, pass the request to the Simian Grid Services
             //     response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index a942516..ccfcd8b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -77,12 +77,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 /* AgentGroupDataUpdate is udp
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Groups");            
+            IConfig config = configSource.AddConfig("Groups");
             config.Set("Enabled", true);
-            config.Set("Module", "GroupsModule");            
+            config.Set("Module", "GroupsModule");
             config.Set("DebugEnabled", true);
 
             GroupsModule gm = new GroupsModule();
@@ -124,8 +124,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 
             Assert.That(foundUpdate, Is.True, "Did not find AgentGroupDataUpdate in response");
 
-            // TODO: More checking of more actual event data.  
-*/                     
+            // TODO: More checking of more actual event data.
+*/
         }
 
         [Test]
@@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
 
             MessageTransferModule mtm = new MessageTransferModule();
@@ -144,12 +144,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
             IConfigSource configSource = new IniConfigSource();
 
             {
-                IConfig config = configSource.AddConfig("Messaging");            
+                IConfig config = configSource.AddConfig("Messaging");
                 config.Set("MessageTransferModule", mtm.Name);
             }
 
             {
-                IConfig config = configSource.AddConfig("Groups");            
+                IConfig config = configSource.AddConfig("Groups");
                 config.Set("Enabled", true);
                 config.Set("Module", gm.Name);
                 config.Set("DebugEnabled", true);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index eb64f71..50d3f94 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -53,17 +53,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_debugEnabled = false;
 
-        public const GroupPowers DefaultEveryonePowers 
-            = GroupPowers.AllowSetHome 
-                | GroupPowers.Accountable 
-                | GroupPowers.JoinChat 
-                | GroupPowers.AllowVoiceChat 
-                | GroupPowers.ReceiveNotices 
-                | GroupPowers.StartProposal 
+        public const GroupPowers 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 DefaultOwnerPowers 
+        public const GroupPowers DefaultOwnerPowers
             = GroupPowers.Accountable
                 | GroupPowers.AllowEditLand
                 | GroupPowers.AllowFly
@@ -823,7 +823,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (!m_groupsAgentsInvitedToChatSession[groupID].Contains(agentID))
                 m_groupsAgentsInvitedToChatSession[groupID].Add(agentID);
-        }   
+        }
 
         private void CreateGroupChatSessionTracking(UUID groupID)
         {
@@ -1051,7 +1051,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         private void LogRespDataToConsoleError(UUID requestingAgentID, string function, Hashtable param, Hashtable respData)
         {
             m_log.ErrorFormat(
-                "[XMLRPC-GROUPS-CONNECTOR]: Error when calling {0} for {1} with params {2}.  Response params are {3}", 
+                "[XMLRPC-GROUPS-CONNECTOR]: Error when calling {0} for {1} with params {2}.  Response params are {3}",
                 function, requestingAgentID, Util.PrettyFormatToSingleLine(param), Util.PrettyFormatToSingleLine(respData));
         }
 
@@ -1151,7 +1151,7 @@ namespace Nwc.XmlRpc
                 {
                     _serializer.Serialize(xml, this);
                     xml.Flush();
-                }            
+                }
             }
 
             XmlRpcResponse resp;