Massive tab and trailing space cleanup

17 files changed, 161 insertions, 161 deletions

diff --git a/OpenSim/Addons/Groups/GroupsExtendedData.cs b/OpenSim/Addons/Groups/GroupsExtendedData.cs
index c783b9e..d92c442 100644
--- a/OpenSim/Addons/Groups/GroupsExtendedData.cs
+++ b/OpenSim/Addons/Groups/GroupsExtendedData.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Groups
         public string AccessToken;
     }
 
-    public class ExtendedGroupMembersData 
+    public class ExtendedGroupMembersData
     {
         // This is the only difference: this is a string
         public string AgentID;
@@ -65,7 +65,7 @@ namespace OpenSim.Groups
         public UUID RoleID;
         // This is the only difference: this is a string
         public string MemberID;
-    
+
     }
 
     public struct ExtendedGroupNoticeData
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 2ec9652..f4d3490 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Groups
         {
             if (!m_groupMessagingEnabled)
                 return;
-            
+
             scene.RegisterModuleInterface<IGroupsMessagingModule>(this);
             m_sceneList.Add(scene);
 
@@ -163,7 +163,7 @@ namespace OpenSim.Groups
             if (m_groupData == null)
             {
                 m_log.Error("[Groups.Messaging]: Could not get IGroupsServicesConnector, GroupsMessagingModule is now disabled.");
-                RemoveRegion(scene); 
+                RemoveRegion(scene);
                 return;
             }
 
@@ -218,7 +218,7 @@ namespace OpenSim.Groups
             m_msgTransferModule = null;
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -262,7 +262,7 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled)
                 m_log.DebugFormat("[Groups.Messaging]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-                
+
             GroupRecord groupInfo = m_groupData.GetGroupRecord(agentID.ToString(), groupID, null);
 
             if (groupInfo != null)
@@ -279,7 +279,7 @@ namespace OpenSim.Groups
         {
             SendMessageToGroup(im, groupID, UUID.Zero, null);
         }
-        
+
         public void SendMessageToGroup(
             GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition)
         {
@@ -355,9 +355,9 @@ namespace OpenSim.Groups
                 {
                     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;
@@ -366,7 +366,7 @@ namespace OpenSim.Groups
                 else if (hasAgentDroppedGroupChatSession(member.AgentID.ToString(), 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);
 
                     continue;
@@ -414,7 +414,7 @@ namespace OpenSim.Groups
                     "[Groups.Messaging]: SendMessageToGroup for group {0} with {1} visible members, {2} online took {3}ms",
                     groupID, groupMembersCount, groupMembers.Count(), Environment.TickCount - requestStartTick);
         }
-        
+
         #region SimGridEventHandlers
 
         void OnClientLogin(IClientAPI client)
@@ -445,13 +445,13 @@ namespace OpenSim.Groups
             // 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
 
             UUID regionID = new UUID(msg.RegionID);
             if (m_debugEnabled)
             {
-                m_log.DebugFormat("[Groups.Messaging]: {0} called, IM from region {1}", 
+                m_log.DebugFormat("[Groups.Messaging]: {0} called, IM from region {1}",
                     System.Reflection.MethodBase.GetCurrentMethod().Name, regionID);
 
                 DebugGridInstantMessage(msg);
@@ -508,7 +508,7 @@ namespace OpenSim.Groups
                                             m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because he has an agent in region of origin", sp.UUID);
                                         return;
                                     }
-                                    else                                
+                                    else
                                     {
                                         if (m_debugEnabled)
                                             m_log.DebugFormat("[Groups.Messaging]: not skipping agent {0}", sp.UUID);
@@ -531,7 +531,7 @@ namespace OpenSim.Groups
                                 }
                             }
                         });
-                        
+
                 }
             }
         }
@@ -555,7 +555,7 @@ namespace OpenSim.Groups
                     break;
 
                 case (byte)InstantMessageDialog.SessionSend:
-                    // User hasn't dropped, so they're in the session, 
+                    // User hasn't dropped, so they're in the session,
                     // maybe we should deliver it.
                     IClientAPI client = GetActiveClient(new UUID(msg.toAgentID));
                     if (client != null)
@@ -655,7 +655,7 @@ namespace OpenSim.Groups
                 UUID AgentID = new UUID(im.fromAgentID);
 
                 GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), GroupID, null);
-    
+
                 if (groupInfo != null)
                 {
                     AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
@@ -681,7 +681,7 @@ namespace OpenSim.Groups
                 UUID GroupID = new UUID(im.imSessionID);
                 UUID AgentID = new UUID(im.fromAgentID);
 
-                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
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 57fbbf7..1e9f2b5 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Groups
         private List<Scene> m_sceneList = new List<Scene>();
 
         private IMessageTransferModule m_msgTransferModule = null;
-        
+
         private IGroupsServicesConnector m_groupData = null;
         private IUserManagement m_UserManagement;
 
@@ -210,7 +210,7 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.Debug("[Groups]: Shutting down Groups module.");
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -318,7 +318,7 @@ namespace OpenSim.Groups
 
             SendAgentGroupDataUpdate(remoteClient, false);
 
-            // also current viewers do ignore it and ask later on a much nicer thread 
+            // also current viewers do ignore it and ask later on a much nicer thread
             // its a info request not a change, so nothing is sent to others
             // they do get the group title with the avatar object update on arrivel to a region
         }
@@ -453,9 +453,9 @@ namespace OpenSim.Groups
                     }
 
                     if (m_groupData.AddGroupNotice(GetRequestingAgentIDStr(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message,
-                        hasAttachment, 
+                        hasAttachment,
                         (byte)(item == null ? 0 : item.AssetType),
-                        item == null ? null : item.Name, 
+                        item == null ? null : item.Name,
                         item == null ? UUID.Zero : item.ID,
                         item == null ? UUID.Zero.ToString() : item.Owner.ToString()))
                     {
@@ -463,7 +463,7 @@ namespace OpenSim.Groups
                         {
                             OnNewGroupNotice(GroupID, NoticeID);
                         }
-                       
+
                         // Send notice out to everyone that wants notices
                         foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID))
                         {
@@ -497,7 +497,7 @@ namespace OpenSim.Groups
 
                     m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
                     string message;
-                    InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId, 
+                    InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
                         giver, notice.noticeData.AttachmentItemID, out message);
 
                     if (itemCopy == null)
@@ -509,10 +509,10 @@ namespace OpenSim.Groups
                     remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
                 }
             }
-          
+
             // Interop, received special 210 code for ejecting a group member
             // this only works within the comms servers domain, and won't work hypergrid
-            // TODO:FIXME: Use a presense server of some kind to find out where the 
+            // TODO:FIXME: Use a presense server of some kind to find out where the
             // client actually is, and try contacting that region directly to notify them,
             // or provide the notification via xmlrpc update queue
             if ((im.dialog == 210))
@@ -523,7 +523,7 @@ namespace OpenSim.Groups
 
                 UUID ejecteeID = new UUID(im.toAgentID);
 
-                                im.imSessionID = UUID.Zero.Guid;
+                im.imSessionID = UUID.Zero.Guid;
                 im.dialog = (byte)InstantMessageDialog.MessageFromAgent;
                 OutgoingInstantMessage(im, ejecteeID);
 
@@ -577,7 +577,7 @@ namespace OpenSim.Groups
         {
             return m_groupData.GetGroupRecord(UUID.Zero.ToString(), UUID.Zero, name);
         }
-        
+
         public void ActivateGroup(IClientAPI remoteClient, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -585,7 +585,7 @@ namespace OpenSim.Groups
             m_groupData.SetAgentActiveGroup(GetRequestingAgentIDStr(remoteClient), GetRequestingAgentIDStr(remoteClient), 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 
+            // 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.
             SendAgentGroupDataUpdate(remoteClient, true);
@@ -620,10 +620,10 @@ namespace OpenSim.Groups
 
         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(GetRequestingAgentIDStr(remoteClient), groupID);
 
             if (m_debugEnabled)
@@ -706,7 +706,7 @@ namespace OpenSim.Groups
 
         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);
@@ -776,7 +776,7 @@ namespace OpenSim.Groups
             }
 
             string reason = string.Empty;
-            UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, 
+            UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment,
                 allowPublish, maturePublish, remoteClient.AgentId, out reason);
 
             if (groupID != UUID.Zero)
@@ -823,7 +823,7 @@ namespace OpenSim.Groups
             if (membership != null)
             {
                 return membership.GroupTitle;
-            } 
+            }
             return string.Empty;
         }
 
@@ -839,7 +839,7 @@ namespace OpenSim.Groups
             // 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)
-                
+
             SendDataUpdate(remoteClient, true);
         }
 
@@ -899,7 +899,7 @@ namespace OpenSim.Groups
                 case 1:
                     // Remove
                     m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentIDStr(remoteClient), memberID.ToString(), groupID, roleID);
-                    
+
                     break;
                 default:
                     m_log.ErrorFormat("[Groups]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes);
@@ -1072,7 +1072,7 @@ namespace OpenSim.Groups
 
             // Send Message to Ejectee
             GridInstantMessage msg = new GridInstantMessage();
-            
+
             // if local send a normal message
             if(ejecteeClient != null)
             {
@@ -1324,7 +1324,7 @@ namespace OpenSim.Groups
                     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/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 7d57de1..9852581 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Groups
             if (!m_Enabled)
                 return;
 
-            m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); 
+            m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName);
             scene.RegisterModuleInterface<IGroupsServicesConnector>(this);
             m_Scenes.Add(scene);
 
@@ -135,7 +135,7 @@ namespace OpenSim.Groups
                 {
                     m_LocalGroupsConnector = new GroupsServiceLocalConnectorModule(m_Config, m_UserManagement);
                     // Also, if local, create the endpoint for the HGGroupsService
-                    new HGGroupsServiceRobustConnector(m_Config, MainServer.Instance, string.Empty, 
+                    new HGGroupsServiceRobustConnector(m_Config, MainServer.Instance, string.Empty,
                         scene.RequestModuleInterface<IOfflineIMService>(), scene.RequestModuleInterface<IUserAccountService>());
 
                 }
@@ -170,7 +170,7 @@ namespace OpenSim.Groups
                 if (sp is ScenePresence && ((ScenePresence)sp).PresenceType != PresenceType.Npc)
                 {
                     AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId);
-                    if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 && 
+                    if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 &&
                         m_OfflineIM != null && m_Messaging != null)
                     {
                         List<GridInstantMessage> ims = m_OfflineIM.GetMessages(aCircuit.AgentID);
@@ -184,12 +184,12 @@ namespace OpenSim.Groups
 
         #region IGroupsServicesConnector
 
-        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
+        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment,
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
             reason = string.Empty;
             if (m_UserManagement.IsLocalGridUser(RequestingAgentID))
-                return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID, 
+                return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID,
                     membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason);
             else
             {
@@ -198,14 +198,14 @@ namespace OpenSim.Groups
             }
         }
 
-        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish, out string reason)
         {
             reason = string.Empty;
             string url = string.Empty;
             string name = string.Empty;
             if (IsLocal(groupID, out url, out name))
-                return m_LocalGroupsConnector.UpdateGroup(AgentUUI(RequestingAgentID), groupID, charter, showInList, insigniaID, membershipFee, 
+                return m_LocalGroupsConnector.UpdateGroup(AgentUUI(RequestingAgentID), groupID, charter, showInList, insigniaID, membershipFee,
                     openEnrollment, allowPublish, maturePublish, out reason);
             else
             {
@@ -374,7 +374,7 @@ namespace OpenSim.Groups
 
                 }
             }
-            
+
             return new List<GroupRoleMembersData>();
         }
 
@@ -626,7 +626,7 @@ namespace OpenSim.Groups
             }
             if (agent != null)
                 return Util.ProduceUserUniversalIdentifier(agent);
-            
+
             // we don't know anything about this foreign user
             // try asking the user management module, which may know more
             return m_UserManagement.GetUserUUI(AgentID);
@@ -664,7 +664,7 @@ namespace OpenSim.Groups
             string url = string.Empty, first = string.Empty, last = string.Empty, tmp = string.Empty;
             if (Util.ParseUniversalUserIdentifier(uID, out userID, out url, out first, out last, out tmp))
                 m_UserManagement.AddUser(userID, first, last, url);
-            
+
             return userID;
         }
 
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index f60c1a5..af00770 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -64,8 +64,8 @@ namespace OpenSim.Groups
 
             m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName);
 
-            string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", 
-                new string[] { "Startup", "Hypergrid", m_ConfigName}, string.Empty); 
+            string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+                new string[] { "Startup", "Hypergrid", m_ConfigName}, string.Empty);
             if (homeURI == string.Empty)
                 throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName));
 
diff --git a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
index a09b59e..8a6e88d 100644
--- a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
+++ b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
@@ -34,9 +34,9 @@ namespace OpenSim.Groups
 {
     public interface IGroupsServicesConnector
     {
-        UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+        UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish, UUID founderID, out string reason);
-        bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+        bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish, out string reason);
         ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName);
         List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search);
@@ -75,7 +75,7 @@ namespace OpenSim.Groups
         /// If the user is a member of the group then the data structure is returned.  If not, then null is returned.
         /// </returns>
         ExtendedGroupMembershipData GetAgentGroupMembership(string RequestingAgentID, string AgentID, UUID GroupID);
-        
+
         /// <summary>
         /// Get information about the groups to which a user belongs.
         /// </summary>
@@ -87,7 +87,7 @@ namespace OpenSim.Groups
         /// </returns>
         List<GroupMembershipData> GetAgentGroupMemberships(string RequestingAgentID, string AgentID);
 
-        bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, 
+        bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message,
             bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID);
         GroupNoticeInfo GetGroupNotice(string RequestingAgentID, UUID noticeID);
         List<ExtendedGroupNoticeData> GetGroupNotices(string RequestingAgentID, UUID GroupID);
diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
index 8e30df5..c7877c6 100644
--- a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Groups
             if (!m_Enabled)
                 return;
 
-            m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); 
+            m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName);
             scene.RegisterModuleInterface<IGroupsServicesConnector>(this);
             m_Scenes.Add(scene);
         }
@@ -146,16 +146,16 @@ namespace OpenSim.Groups
 
         #region IGroupsServicesConnector
 
-        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
+        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment,
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
             m_log.DebugFormat("[Groups]: Creating group {0}", name);
             reason = string.Empty;
-            return m_GroupsService.CreateGroup(RequestingAgentID.ToString(), name, charter, showInList, insigniaID, 
+            return m_GroupsService.CreateGroup(RequestingAgentID.ToString(), name, charter, showInList, insigniaID,
                     membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason);
         }
 
-        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish, out string reason)
         {
             reason = string.Empty;
@@ -296,7 +296,7 @@ namespace OpenSim.Groups
         public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message,
             bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID)
         {
-            return m_GroupsService.AddGroupNotice(RequestingAgentID, groupID, noticeID, fromName, subject, message, 
+            return m_GroupsService.AddGroupNotice(RequestingAgentID, groupID, noticeID, fromName, subject, message,
                 hasAttachment, attType, attName, attItemID, attOwnerID);
         }
 
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
index 98630eb..e9be9c4 100644
--- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Mono.Addins;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Addons.Groups")]
@@ -15,8 +15,8 @@ using Mono.Addins;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -26,7 +26,7 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
index 7450c14..8f6be0d 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
@@ -41,7 +41,7 @@ using Nini.Config;
 
 namespace OpenSim.Groups
 {
-    public class GroupsServiceRemoteConnector 
+    public class GroupsServiceRemoteConnector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -71,7 +71,7 @@ namespace OpenSim.Groups
             }
             ///
 
-            m_log.DebugFormat("[Groups.RemoteConnector]: Groups server at {0}, authentication {1}", 
+            m_log.DebugFormat("[Groups.RemoteConnector]: Groups server at {0}, authentication {1}",
                 m_ServerURI, (m_Auth == null ? "None" : m_Auth.GetType().ToString()));
         }
 
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
index d4739c6..b6c75a8 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Groups
             if (!m_Enabled)
                 return;
 
-            m_log.DebugFormat("[Groups.RemoteConnector]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); 
+            m_log.DebugFormat("[Groups.RemoteConnector]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName);
             scene.RegisterModuleInterface<IGroupsServicesConnector>(this);
             m_Scenes.Add(scene);
         }
@@ -151,7 +151,7 @@ namespace OpenSim.Groups
 
         #region IGroupsServicesConnector
 
-        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
+        public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment,
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
             m_log.DebugFormat("[Groups.RemoteConnector]: Creating group {0}", name);
@@ -167,7 +167,7 @@ namespace OpenSim.Groups
             return groupID;
         }
 
-        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+        public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish, out string reason)
         {
             string r = string.Empty;
@@ -186,9 +186,9 @@ namespace OpenSim.Groups
             if (GroupID == UUID.Zero && (GroupName == null || GroupName != null && GroupName == string.Empty))
                 return null;
 
-            return m_CacheWrapper.GetGroupRecord(RequestingAgentID,GroupID,GroupName, delegate 
-            { 
-                return m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName); 
+            return m_CacheWrapper.GetGroupRecord(RequestingAgentID,GroupID,GroupName, delegate
+            {
+                return m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName);
             });
         }
 
@@ -362,7 +362,7 @@ namespace OpenSim.Groups
             m_GroupsService.RemoveAgentToGroupInvite(RequestingAgentID, inviteID);
         }
 
-        public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, 
+        public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message,
             bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID)
         {
             GroupNoticeInfo notice = new GroupNoticeInfo();
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index d79e4fa..598e7a5 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -393,7 +393,7 @@ namespace OpenSim.Groups
 
             if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("GroupID") || !request.ContainsKey("RoleID") ||
                 !request.ContainsKey("Name") || !request.ContainsKey("Description") || !request.ContainsKey("Title") ||
-                !request.ContainsKey("Powers") || !request.ContainsKey("OP")) 
+                !request.ContainsKey("Powers") || !request.ContainsKey("OP"))
                 NullResult(result, "Bad network data");
 
             else
@@ -519,11 +519,11 @@ namespace OpenSim.Groups
 
                 bool success = false;
                 if (op == "ADD")
-                    success = m_GroupsService.AddAgentToGroupRole(request["RequestingAgentID"].ToString(), request["AgentID"].ToString(), 
+                    success = m_GroupsService.AddAgentToGroupRole(request["RequestingAgentID"].ToString(), request["AgentID"].ToString(),
                         new UUID(request["GroupID"].ToString()), new UUID(request["RoleID"].ToString()));
 
                 else if (op == "DELETE")
-                    success = m_GroupsService.RemoveAgentFromGroupRole(request["RequestingAgentID"].ToString(), request["AgentID"].ToString(), 
+                    success = m_GroupsService.RemoveAgentFromGroupRole(request["RequestingAgentID"].ToString(), request["AgentID"].ToString(),
                         new UUID(request["GroupID"].ToString()), new UUID(request["RoleID"].ToString()));
 
                 result["RESULT"] = success.ToString();
@@ -647,8 +647,8 @@ namespace OpenSim.Groups
                 string op = request["OP"].ToString();
 
                 if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
-                {   
-                    bool success = m_GroupsService.AddAgentToGroupInvite(request["RequestingAgentID"].ToString(), 
+                {
+                    bool success = m_GroupsService.AddAgentToGroupInvite(request["RequestingAgentID"].ToString(),
                         new UUID(request["InviteID"].ToString()), new UUID(request["GroupID"].ToString()),
                         new UUID(request["RoleID"].ToString()), request["AgentID"].ToString());
 
@@ -664,7 +664,7 @@ namespace OpenSim.Groups
                 }
                 else if (op == "GET")
                 {
-                    GroupInviteInfo invite = m_GroupsService.GetAgentToGroupInvite(request["RequestingAgentID"].ToString(), 
+                    GroupInviteInfo invite = m_GroupsService.GetAgentToGroupInvite(request["RequestingAgentID"].ToString(),
                         new UUID(request["InviteID"].ToString()));
 
                     if (invite != null)
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 710b00a..ea0fedd 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Groups
 
         #endregion
 
-        public UUID CreateGroup(string RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
+        public UUID CreateGroup(string RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment,
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
             reason = string.Empty;
@@ -264,7 +264,7 @@ namespace OpenSim.Groups
             if (ownerRole != null)
                 ownerRoleID = ownerRole.RoleID;
 
-            // Check visibility? 
+            // Check visibility?
             // When we don't want to check visibility, we pass it "all" as the requestingAgentID
             bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString());
 
@@ -307,20 +307,20 @@ namespace OpenSim.Groups
                 m.Contribution = Int32.Parse(d.Data["Contribution"]);
                 m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false;
 
-                                GridUserData gud = m_GridUserService.Get(d.PrincipalID);
-                                if (gud != null)
-                                {
-                                        if (bool.Parse(gud.Data["Online"])) 
-                                        {
-                                                m.OnlineStatus = @"Online";
-                                        }
-                                        else 
-                                        {
-                                                int unixtime = int.Parse(gud.Data["Login"]);
-                                                // The viewer is very picky about how these strings are formed. Eg. it will crash on malformed dates!
-                                                m.OnlineStatus = (unixtime == 0) ? @"unknown" : Util.ToDateTime(unixtime).ToString("MM/dd/yyyy");
-                                        }
-                                }
+                GridUserData gud = m_GridUserService.Get(d.PrincipalID);
+                if (gud != null)
+                {
+                    if (bool.Parse(gud.Data["Online"]))
+                    {
+                        m.OnlineStatus = @"Online";
+                    }
+                    else
+                    {
+                        int unixtime = int.Parse(gud.Data["Login"]);
+                        // The viewer is very picky about how these strings are formed. Eg. it will crash on malformed dates!
+                        m.OnlineStatus = (unixtime == 0) ? @"unknown" : Util.ToDateTime(unixtime).ToString("MM/dd/yyyy");
+                    }
+                }
 
                 // Is this person an owner of the group?
                 m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false;
@@ -553,8 +553,8 @@ namespace OpenSim.Groups
                     {
                         newRoleID = r.RoleID;
                         break;
-                    }   
-                }   
+                    }
+                }
 
             MembershipData member = m_Database.RetrieveMember(GroupID, AgentID);
             if (member != null)
@@ -712,7 +712,7 @@ namespace OpenSim.Groups
             m_Database.StoreMember(membership);
         }
 
-        public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, 
+        public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message,
             bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID)
         {
             // Check perms
diff --git a/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs b/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
index 8e237aa..98d0172 100644
--- a/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsServiceBase.cs
@@ -35,67 +35,67 @@ using OpenSim.Services.Base;
 
 namespace OpenSim.Groups
 {
-        public class GroupsServiceBase : ServiceBase
-        {
-                protected IGroupsData m_Database = null;
-                protected IGridUserData m_GridUserService = null;
+    public class GroupsServiceBase : ServiceBase
+    {
+        protected IGroupsData m_Database = null;
+        protected IGridUserData m_GridUserService = null;
 
-                public GroupsServiceBase(IConfigSource config, string cName)
-                        : base(config)
-                {
-                        string dllName = String.Empty;
-                        string connString = String.Empty;
-                        string realm = "os_groups";
-                        string usersRealm = "GridUser";
-                        string configName = (cName == string.Empty) ? "Groups" : cName;
+        public GroupsServiceBase(IConfigSource config, string cName)
+            : base(config)
+        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+            string realm = "os_groups";
+            string usersRealm = "GridUser";
+            string configName = (cName == string.Empty) ? "Groups" : cName;
 
-                        //
-                        // Try reading the [DatabaseService] section, if it exists
-                        //
-                        IConfig dbConfig = config.Configs["DatabaseService"];
-                        if (dbConfig != null)
-                        {
-                                if (dllName == String.Empty)
-                                        dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                                if (connString == String.Empty)
-                                        connString = dbConfig.GetString("ConnectionString", String.Empty);
-                        }
+            //
+            // Try reading the [DatabaseService] section, if it exists
+            //
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                if (dllName == String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (connString == String.Empty)
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
 
-                        //
-                        // [Groups] section overrides [DatabaseService], if it exists
-                        //
-                        IConfig groupsConfig = config.Configs[configName];
-                        if (groupsConfig != null)
-                        {
-                                dllName = groupsConfig.GetString("StorageProvider", dllName);
-                                connString = groupsConfig.GetString("ConnectionString", connString);
-                                realm = groupsConfig.GetString("Realm", realm);
-                        }
+            //
+            // [Groups] section overrides [DatabaseService], if it exists
+            //
+            IConfig groupsConfig = config.Configs[configName];
+            if (groupsConfig != null)
+            {
+                dllName = groupsConfig.GetString("StorageProvider", dllName);
+                connString = groupsConfig.GetString("ConnectionString", connString);
+                realm = groupsConfig.GetString("Realm", realm);
+            }
 
-                        //
-                        // We tried, but this doesn't exist. We can't proceed.
-                        //
-                        if (dllName.Equals(String.Empty))
-                                throw new Exception("No StorageProvider configured");
+            //
+            // We tried, but this doesn't exist. We can't proceed.
+            //
+            if (dllName.Equals(String.Empty))
+                throw new Exception("No StorageProvider configured");
 
-                        m_Database = LoadPlugin<IGroupsData>(dllName, new Object[] { connString, realm });
-                        if (m_Database == null)
-                                throw new Exception("Could not find a storage interface in the given module " + dllName);
+            m_Database = LoadPlugin<IGroupsData>(dllName, new Object[] { connString, realm });
+            if (m_Database == null)
+                throw new Exception("Could not find a storage interface in the given module " + dllName);
 
-                        //
-                        // [GridUserService] section overrides [DatabaseService], if it exists
-                        //
-                        IConfig usersConfig = config.Configs["GridUserService"];
-                        if (usersConfig != null)
-                        {
-                                dllName = usersConfig.GetString("StorageProvider", dllName);
-                                connString = usersConfig.GetString("ConnectionString", connString);
+            //
+            // [GridUserService] section overrides [DatabaseService], if it exists
+            //
+            IConfig usersConfig = config.Configs["GridUserService"];
+            if (usersConfig != null)
+            {
+                dllName = usersConfig.GetString("StorageProvider", dllName);
+                connString = usersConfig.GetString("ConnectionString", connString);
                 usersRealm = usersConfig.GetString("Realm", usersRealm);
-                        }
+            }
 
-                        m_GridUserService = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, usersRealm });
-                        if (m_GridUserService == null)
-                                throw new Exception("Could not find a storage inferface for the given users module " + dllName);
-                }
-        }
+            m_GridUserService = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, usersRealm });
+            if (m_GridUserService == null)
+                throw new Exception("Could not find a storage inferface for the given users module " + dllName);
+        }
+    }
 }
diff --git a/OpenSim/Addons/Groups/Service/HGGroupsService.cs b/OpenSim/Addons/Groups/Service/HGGroupsService.cs
index 56e999b..7d86f85 100644
--- a/OpenSim/Addons/Groups/Service/HGGroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/HGGroupsService.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Groups
 
             // Check if it already exists
             GroupData grec = m_Database.RetrieveGroup(groupID);
-            if (grec == null || 
+            if (grec == null ||
                 (grec != null && grec.Data["Location"] != string.Empty && grec.Data["Location"].ToLower() != serviceLocation.ToLower()))
             {
                 // Create the group
diff --git a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
index a980f22..fe828bc 100644
--- a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Mono.Addins;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Addons.OfflineIM")]
@@ -15,8 +15,8 @@ using Mono.Addins;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -26,7 +26,7 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
index 047b8be..46d4979 100644
--- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
+++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
@@ -77,7 +77,7 @@ namespace OpenSim.OfflineIM
                     break;
             }
             ///
-            m_log.DebugFormat("[OfflineIM.V2.RemoteConnector]: Offline IM server at {0} with auth {1}", 
+            m_log.DebugFormat("[OfflineIM.V2.RemoteConnector]: Offline IM server at {0} with auth {1}",
                 m_ServerURI, (m_Auth == null ? "None" : m_Auth.GetType().ToString()));
         }
 
@@ -140,7 +140,7 @@ namespace OpenSim.OfflineIM
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["UserID"] = userID;
-            
+
             MakeRequest("DELETE", sendData);
         }
 
diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index 02084ff..d1ecdce 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -90,7 +90,7 @@ namespace OpenSim.OfflineIM
         public bool StoreMessage(GridInstantMessage im, out string reason)
         {
             reason = string.Empty;
-            
+
             // Check limits
             UUID principalID = new UUID(im.toAgentID);
             long count = m_Database.GetCount("PrincipalID", principalID.ToString());