Massive tab and trailing space cleanup

959 files changed, 24588 insertions, 24588 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());
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 89224a6..feb73a9 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -124,7 +124,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                 m_log.Debug("[LOAD REGIONS PLUGIN]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " +
                             Thread.CurrentThread.ManagedThreadId.ToString() +
                             ")");
-                
+
                 bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
 
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
index 1873a06..976714c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -38,7 +38,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
     public class RegionLoaderFileSystem : IRegionLoader
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private IConfigSource m_configSource;
 
         public void SetIniConfigSource(IConfigSource configSource)
@@ -72,11 +72,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
 
             // Create an empty Regions.ini if there are no existing config files.
             if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0)
-            {                
+            {
                 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
                 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
             }
-            
+
             m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
 
             List<RegionInfo> regionInfos = new List<RegionInfo>();
@@ -85,16 +85,16 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             foreach (string file in iniFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
-                
+
                 IConfigSource source = new IniConfigSource(file);
 
                 foreach (IConfig config in source.Configs)
-                {                   
+                {
                     RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
                     regionInfos.Add(regionInfo);
-                    
+
                     m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
-                    
+
                     i++;
                 }
             }
@@ -102,12 +102,12 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             foreach (string file in configFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
-                
+
                 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
                 regionInfos.Add(regionInfo);
-                
+
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
-                
+
                 i++;
             }
 
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
index a8e1f95..a45abad 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/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.ApplicationPlugins.RegionModulesController")]
@@ -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/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 8f38a29..2e25c60 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -75,7 +75,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
         }
 
 #region IApplicationPlugin implementation
-        
+
         public void Initialise (OpenSimBase openSim)
         {
             m_openSim = openSim;
@@ -111,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             {
                 m_log.InfoFormat(
                     "[REGIONMODULES]: From plugin {0}, (version {1}), loaded {2} modules, {3} shared, {4} non-shared {5} unknown",
-                    loadedModuleData.Key.Id, 
+                    loadedModuleData.Key.Id,
                     loadedModuleData.Key.Version,
                     loadedModuleData.Value[0] + loadedModuleData.Value[1] + loadedModuleData.Value[2],
                     loadedModuleData.Value[0], loadedModuleData.Value[1], loadedModuleData.Value[2]);
@@ -261,7 +261,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
         }
 
 #region Region Module interfacesController implementation
-        
+
         /// <summary>
         /// Check that the given module is no disabled in the [Modules] section of the config files.
         /// </summary>
@@ -293,10 +293,10 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 if (className != String.Empty &&
                         node.Type.ToString() != className)
                     return false;
-            }            
-            
+            }
+
             return true;
-        }        
+        }
 
         // The root of all evil.
         // This is where we handle adding the modules to scenes when they
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
index c841a69..590a6a9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/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.ApplicationPlugins.RemoteController")]
@@ -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/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1a7c698..a5c9fb4 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -575,7 +575,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             responseData["success"] = true;
-            
+
             m_log.Info("[RADMIN]: Shutdown Administrator Request complete");
         }
 
@@ -747,9 +747,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         // No INI setting recorded.
                     }
-                    
+
                     string regionIniPath;
-                    
+
                     if (requestData.Contains("region_file"))
                     {
                         // Make sure that the file to be created is in a subdirectory of the region storage directory.
@@ -773,7 +773,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                                             region.RegionName.Replace(" ", "_").Replace(":", "_").
                                                                 Replace("/", "_")));
                     }
-                    
+
                     m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
                                       region.RegionID, regionIniPath);
                     region.SaveRegionToFile("dynamic region", regionIniPath);
@@ -782,9 +782,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     region.Persistent = false;
                 }
-                    
+
                 // Set the estate
-                
+
                 // Check for an existing estate
                 List<int> estateIDs = m_application.EstateDataService.GetEstates((string) requestData["estate_name"]);
                 if (estateIDs.Count < 1)
@@ -795,12 +795,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         // ok, client wants us to use an explicit UUID
                         // regardless of what the avatar name provided
                         userID = new UUID((string) requestData["estate_owner_uuid"]);
-                        
+
                         // Check that the specified user exists
                         Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene;
                         IUserAccountService accountService = currentOrFirst.UserAccountService;
                         UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID, userID);
-                        
+
                         if (user == null)
                             throw new Exception("Specified user was not found.");
                     }
@@ -809,23 +809,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         // We need to look up the UUID for the avatar with the provided name.
                         string ownerFirst = (string) requestData["estate_owner_first"];
                         string ownerLast = (string) requestData["estate_owner_last"];
-                        
+
                         Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene;
                         IUserAccountService accountService = currentOrFirst.UserAccountService;
                         UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID,
                                                                            ownerFirst, ownerLast);
-                        
+
                         // Check that the specified user exists
                         if (user == null)
                             throw new Exception("Specified user was not found.");
-                        
+
                         userID = user.PrincipalID;
                     }
                     else
                     {
                         throw new Exception("Estate owner details not provided.");
                     }
-                    
+
                     // Create a new estate with the name provided
                     region.EstateSettings = m_application.EstateDataService.CreateNewEstate();
 
@@ -852,7 +852,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             throw new Exception("Failed to join estate.");
                     }
                 }
-                
+
                 // Create the region and perform any initial initialization
 
                 IScene newScene;
@@ -1159,7 +1159,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     // Set home position
 
-                    GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
+                    GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
                                         (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
                     if (null == home)
                     {
@@ -1389,7 +1389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     if ((null != regionXLocation) && (null != regionYLocation))
                     {
-                        GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
+                        GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
                                         (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation));
                         if (null == home) {
                             m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName);
@@ -1416,7 +1416,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     throw e;
                 }
-                
+
                 m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
             }
         }
@@ -1608,7 +1608,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     GetSceneFromRegionParams(requestData, responseData, out scene);
 
                     string filename = (string) requestData["filename"];
-                    
+
                     bool mergeOar = false;
                     bool skipAssets = false;
 
@@ -1735,7 +1735,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
 
                     m_log.InfoFormat(
-                        "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}", 
+                        "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}",
                         scene.Name, filename, requestId);
 
                     archiver.ArchiveRegion(filename, requestId, options);
@@ -2082,8 +2082,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
 //            Hashtable requestData = (Hashtable)request.Params[0];
 
-            m_application.SceneManager.ForEachScene(s => 
-                s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)                
+            m_application.SceneManager.ForEachScene(s =>
+                s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)
             );
 
             responseData["success"] = true;
@@ -2815,7 +2815,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             if (destinationFolder.Type != (short)FolderType.Clothing)
             {
                 destinationFolder = new InventoryFolderBase();
-                
+
                 destinationFolder.ID       = UUID.Random();
                 destinationFolder.Name     = "Clothing";
                 destinationFolder.Owner    = destination;
@@ -2951,11 +2951,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 sourceFolder = new InventoryFolderBase();
                 sourceFolder.ID       = UUID.Random();
-                if (assetType == FolderType.Clothing) 
+                if (assetType == FolderType.Clothing)
                 {
                     sourceFolder.Name     = "Clothing";
-                } 
-                else 
+                }
+                else
                 {
                     sourceFolder.Name     = "Body Parts";
                 }
@@ -3168,7 +3168,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                             // Set home position
 
-                            GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
+                            GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
                                         (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
                             if (null == home) {
                                 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]);
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 7ba65c9..7492602 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Capabilities
 
         private CapsHandlers m_capsHandlers;
 
-        private Dictionary<string, PollServiceEventArgs> m_pollServiceHandlers 
+        private Dictionary<string, PollServiceEventArgs> m_pollServiceHandlers
             = new Dictionary<string, PollServiceEventArgs>();
 
         private Dictionary<string, string> m_externalCapsHandlers = new Dictionary<string, string>();
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Capabilities
         public void RegisterPollHandler(string capName, PollServiceEventArgs pollServiceHandler)
         {
 //            m_log.DebugFormat(
-//                "[CAPS]: Registering handler with name {0}, url {1} for {2}", 
+//                "[CAPS]: Registering handler with name {0}, url {1} for {2}",
 //                capName, pollServiceHandler.Url, m_agentID, m_regionName);
 
             m_pollServiceHandlers.Add(capName, pollServiceHandler);
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Capabilities
 //            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
 //            string protocol = "http";
 //            string hostName = m_httpListenerHostName;
-//            
+//
 //            if (MainServer.Instance.UseSSL)
 //            {
 //                hostName = MainServer.Instance.SSLCommonName;
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Capabilities
                         string hostName = m_httpListenerHostName;
                         uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
                         string protocol = "http";
-                        
+
                         if (MainServer.Instance.UseSSL)
                         {
                             hostName = MainServer.Instance.SSLCommonName;
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index 6d3b9b5..f5a40df 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -112,9 +112,9 @@ namespace OpenSim.Framework.Capabilities
                         m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);
                         m_capsHandlers.Remove(idx);
                     }
-    
+
                     if (null == value) return;
-    
+
                     m_capsHandlers[idx] = value;
                     m_httpListener.AddStreamHandler(value);
                 }
@@ -147,7 +147,7 @@ namespace OpenSim.Framework.Capabilities
         {
             Hashtable caps = new Hashtable();
             string protocol = "http://";
-            
+
             if (m_useSSL)
                 protocol = "https://";
 
diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
index 426174d..5163169 100644
--- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Capabilities.Handlers
 
             int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize));
             int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber));
-            
+
             // Full content request
             httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
             //httpResponse.ContentLength = ??;
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index e3a9a22..53ed115 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -43,7 +43,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class FetchInvDescHandler 
+    public class FetchInvDescHandler
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,14 +53,14 @@ namespace OpenSim.Capabilities.Handlers
         private IScene m_Scene;
 //        private object m_fetchLock = new Object();
 
-        public FetchInvDescHandler(IInventoryService invService, ILibraryService libService, IScene s) 
+        public FetchInvDescHandler(IInventoryService invService, ILibraryService libService, IScene s)
         {
             m_InventoryService = invService;
             m_LibraryService = libService;
             m_Scene = s;
         }
 
-        
+
         public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             //m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request);
@@ -72,14 +72,14 @@ namespace OpenSim.Capabilities.Handlers
             // correctly mark it as a uuid
             //
             request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
-    
+
             // another hack <integer>1</integer> results in a
             // System.ArgumentException: Object type System.Int32 cannot
             // be converted to target type: System.Boolean
             //
             request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
             request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
-    
+
             Hashtable hash = new Hashtable();
             try
             {
@@ -90,9 +90,9 @@ namespace OpenSim.Capabilities.Handlers
                 m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace);
                 m_log.Error("Request: " + request);
             }
-    
+
             ArrayList foldersrequested = (ArrayList)hash["folders"];
-    
+
             string response = "";
             string bad_folders_response = "";
 
@@ -516,7 +516,7 @@ from docs seems this was never a spec
 //                                }
 //                            }
 //                        }
-//    
+//
 //                        foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend)
 //                        {
 //                            m_log.DebugFormat(
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
index 8200a96..e239a90 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Capabilities.Handlers
                 {
                     // OMG!!! One by one!!! This is fallback code, in case the backend isn't updated
                     m_log.WarnFormat("[FETCH INVENTORY HANDLER]: GetMultipleItems failed. Falling back to fetching inventory items one by one.");
-                    items = new InventoryItemBase[itemsRequested.Count];                   
+                    items = new InventoryItemBase[itemsRequested.Count];
                     foreach (UUID id in itemIDs)
                         items[i++] = m_inventoryService.GetItem(m_agentID, id);
                 }
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventory2HandlerTests.cs b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventory2HandlerTests.cs
index 8af3c64..94c2c89 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventory2HandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventory2HandlerTests.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             string request = "<llsd><map><key>items</key><array><map><key>item_id</key><uuid>";
             request += "10000000-0000-0000-0000-000000000001"; // Notecard 1
             request += "</uuid></map></array></map></llsd>";
-            
+
             string llsdresponse = handler.FetchInventoryRequest(request, "/FETCH", string.Empty, req, resp);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
index 94eef3b..4143aa3 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             string request = "<llsd><map><key>folders</key><array><map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += m_rootFolderID;
             request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
-            
+
             string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
@@ -203,7 +203,7 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
 
             // Make sure that the note card link is included
             Assert.That(llsdresponse.Contains("Link to notecard"), Is.True, "Link to notecard is missing");
-            
+
             //Make sure the notecard item itself is included
             Assert.That(llsdresponse.Contains("Test Notecard 2"), Is.True, "Notecard 2 item (the source) is missing");
 
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
index 3e01bbb..41cfdb6 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -87,12 +87,12 @@ namespace OpenSim.Capabilities.Handlers
                 OSDMap osdname = new OSDMap();
                 if(parts[0] == "Unknown")
                 {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));
                     osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2));
                 }
                 else
                 {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));
                     osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1));
                 }
                 osdname["display_name"] = OSD.FromString(kvp.Value);
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
index 8f70c97..32da1c2 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Capabilities.Handlers
 
             if (m_UserManagement == null)
                 throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName));
-            
+
             server.AddStreamHandler(
                 new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null));
         }
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 8215124..062a842 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Capabilities.Handlers
         private IAssetService m_assetService;
 
         public const string DefaultFormat = "x-j2c";
-  
+
         public GetTextureHandler(IAssetService assService)
         {
             m_assetService = assService;
@@ -83,7 +83,7 @@ namespace OpenSim.Capabilities.Handlers
             if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID))
             {
 //                m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
-                
+
                 string[] formats;
                 if (!string.IsNullOrEmpty(format))
                 {
@@ -129,7 +129,7 @@ namespace OpenSim.Capabilities.Handlers
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="httpRequest"></param>
         /// <param name="httpResponse"></param>
@@ -190,7 +190,7 @@ namespace OpenSim.Capabilities.Handlers
 
             //response = new Hashtable();
 
-           
+
             //WriteTextureData(request,response,null,format);
             // not found
             //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
@@ -287,7 +287,7 @@ namespace OpenSim.Capabilities.Handlers
                     response["content_type"] = texture.Metadata.ContentType;
                 else
                     response["content_type"] = "image/" + format;
-                
+
                 response["bin_response_data"] = texture.Data;
                 response["int_bytes"] = texture.Data.Length;
 
@@ -400,7 +400,7 @@ namespace OpenSim.Capabilities.Handlers
 
                 if (image != null)
                     image.Dispose();
-                
+
                 if(managedImage != null)
                     managedImage.Clear();
                 if (imgstream != null)
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
index 5f86ed4..d5df7a2 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
@@ -24,7 +24,7 @@
  * (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.Specialized;
@@ -44,7 +44,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
- 
+
 namespace OpenSim.Capabilities.Handlers
 {
     public class GetTextureRobustHandler : BaseStreamHandler
@@ -52,9 +52,9 @@ namespace OpenSim.Capabilities.Handlers
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private IAssetService m_assetService;
- 
+
         public const string DefaultFormat = "x-j2c";
- 
+
         // TODO: Change this to a config option
         private string m_RedirectURL = null;
 
@@ -66,28 +66,28 @@ namespace OpenSim.Capabilities.Handlers
             if (m_RedirectURL != null && !m_RedirectURL.EndsWith("/"))
                 m_RedirectURL += "/";
         }
- 
+
         protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             // Try to parse the texture ID from the request URL
             NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
             string textureStr = query.GetOne("texture_id");
             string format = query.GetOne("format");
- 
+
             //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
- 
+
             if (m_assetService == null)
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
                 return null;
             }
- 
+
             UUID textureID;
             if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID))
             {
 //                m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
- 
+
                 string[] formats;
                 if (!string.IsNullOrEmpty(format))
                 {
@@ -98,10 +98,10 @@ namespace OpenSim.Capabilities.Handlers
                     formats = WebUtil.GetPreferredImageTypes(httpRequest.Headers.Get("Accept"));
                     if (formats.Length == 0)
                         formats = new string[1] { DefaultFormat }; // default
- 
+
                 }
                 // OK, we have an array with preferred formats, possibly with only one entry
- 
+
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
                 foreach (string f in formats)
                 {
@@ -113,14 +113,14 @@ namespace OpenSim.Capabilities.Handlers
             {
                 m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + httpRequest.Url);
             }
- 
+
 //            m_log.DebugFormat(
 //                "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
 //                textureID, httpResponse.StatusCode, httpResponse.ContentLength);
- 
+
             return null;
         }
- 
+
         /// <summary>
         ///
         /// </summary>
@@ -133,16 +133,16 @@ namespace OpenSim.Capabilities.Handlers
         {
 //            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
             AssetBase texture;
- 
+
             string fullID = textureID.ToString();
             if (format != DefaultFormat)
                 fullID = fullID + "-" + format;
- 
+
             if (!String.IsNullOrEmpty(m_RedirectURL))
             {
                 // Only try to fetch locally cached textures. Misses are redirected
                 texture = m_assetService.GetCached(fullID);
- 
+
                 if (texture != null)
                 {
                     if (texture.Type != (sbyte)AssetType.Texture)
@@ -166,14 +166,14 @@ namespace OpenSim.Capabilities.Handlers
             {
                 // try the cache
                 texture = m_assetService.GetCached(fullID);
- 
+
                 if (texture == null)
                 {
 //                    m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache");
- 
+
                     // Fetch locally or remotely. Misses return a 404
                     texture = m_assetService.Get(textureID.ToString());
- 
+
                     if (texture != null)
                     {
                         if (texture.Type != (sbyte)AssetType.Texture)
@@ -192,7 +192,7 @@ namespace OpenSim.Capabilities.Handlers
                             newTexture.Data = ConvertTextureData(texture, format);
                             if (newTexture.Data.Length == 0)
                                 return false; // !!! Caller try another codec, please!
- 
+
                             newTexture.Flags = AssetFlags.Collectable;
                             newTexture.Temporary = true;
                             newTexture.Local = true;
@@ -209,17 +209,17 @@ namespace OpenSim.Capabilities.Handlers
                    return true;
                }
             }
- 
+
             // not found
 //            m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
             httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
             return true;
         }
- 
+
         private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format)
         {
             string range = request.Headers.GetOne("Range");
- 
+
             if (!String.IsNullOrEmpty(range)) // JP2's only
             {
                 // Range request
@@ -233,7 +233,7 @@ namespace OpenSim.Capabilities.Handlers
 //                        m_log.DebugFormat(
 //                            "[GETTEXTURE]: Client requested range for texture {0} starting at {1} but texture has end of {2}",
 //                            texture.ID, start, texture.Data.Length);
- 
+
                         // Stricly speaking, as per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, we should be sending back
                         // Requested Range Not Satisfiable (416) here.  However, it appears that at least recent implementations
                         // of the Linden Lab viewer (3.2.1 and 3.3.4 and probably earlier), a viewer that has previously
@@ -244,7 +244,7 @@ namespace OpenSim.Capabilities.Handlers
                         // level 2.  If this estimate is greater than the total texture size, returning a RequestedRangeNotSatisfiable
                         // here will cause the viewer to treat the texture as bad and never display the full resolution
                         // However, if we return PartialContent (or OK) instead, the viewer will display that resolution.
- 
+
 //                        response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
 //                        response.AddHeader("Content-Range", String.Format("bytes */{0}", texture.Data.Length));
 //                        response.StatusCode = (int)System.Net.HttpStatusCode.OK;
@@ -257,13 +257,13 @@ namespace OpenSim.Capabilities.Handlers
                         // the rest of the entity.
                         if (end == -1)
                             end = int.MaxValue;
- 
+
                         end = Utils.Clamp(end, 0, texture.Data.Length - 1);
                         start = Utils.Clamp(start, 0, end);
                         int len = end - start + 1;
- 
+
 //                        m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
- 
+
                         // Always return PartialContent, even if the range covered the entire data length
                         // We were accidentally sending back 404 before in this situation
                         // https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 supports sending 206 even if the
@@ -275,11 +275,11 @@ namespace OpenSim.Capabilities.Handlers
 //                            response.StatusCode = (int)System.Net.HttpStatusCode.OK;
 //                        else
                         response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
- 
+
                         response.ContentLength = len;
                         response.ContentType = texture.Metadata.ContentType;
                         response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length));
- 
+
                         response.Body.Write(texture.Data, start, len);
                     }
                 }
@@ -300,7 +300,7 @@ namespace OpenSim.Capabilities.Handlers
                     response.ContentType = "image/" + format;
                 response.Body.Write(texture.Data, 0, texture.Data.Length);
             }
- 
+
 //            if (response.StatusCode < 200 || response.StatusCode > 299)
 //                m_log.WarnFormat(
 //                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
@@ -310,7 +310,7 @@ namespace OpenSim.Capabilities.Handlers
 //                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
 //                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
         }
- 
+
         /// <summary>
         /// Parse a range header.
         /// </summary>
@@ -327,18 +327,18 @@ namespace OpenSim.Capabilities.Handlers
         private bool TryParseRange(string header, out int start, out int end)
         {
             start = end = 0;
- 
+
             if (header.StartsWith("bytes="))
             {
                 string[] rangeValues = header.Substring(6).Split('-');
- 
+
                 if (rangeValues.Length == 2)
                 {
                     if (!Int32.TryParse(rangeValues[0], out start))
                         return false;
- 
+
                     string rawEnd = rangeValues[1];
- 
+
                     if (rawEnd == "")
                     {
                         end = -1;
@@ -350,27 +350,27 @@ namespace OpenSim.Capabilities.Handlers
                     }
                 }
             }
- 
+
             start = end = 0;
             return false;
         }
- 
+
         private byte[] ConvertTextureData(AssetBase texture, string format)
         {
             m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format);
             byte[] data = new byte[0];
- 
+
             MemoryStream imgstream = new MemoryStream();
             Bitmap mTexture = null;
             ManagedImage managedImage = null;
             Image image = null;
- 
+
             try
             {
                 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
- 
+
                 imgstream = new MemoryStream();
- 
+
                 // Decode image to System.Drawing.Image
                 if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
                 {
@@ -380,7 +380,7 @@ namespace OpenSim.Capabilities.Handlers
                     using(EncoderParameters myEncoderParameters = new EncoderParameters())
                     {
                         myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality,95L);
- 
+
                         // Save bitmap to stream
                         ImageCodecInfo codec = GetEncoderInfo("image/" + format);
                         if (codec != null)
@@ -404,10 +404,10 @@ namespace OpenSim.Capabilities.Handlers
                 // If we encountered an exception, one or more of these will be null
                 if (mTexture != null)
                     mTexture.Dispose();
- 
+
                 if (image != null)
                     image.Dispose();
- 
+
                 if(managedImage != null)
                     managedImage.Clear();
 
@@ -417,10 +417,10 @@ namespace OpenSim.Capabilities.Handlers
                     imgstream.Dispose();
                 }
             }
- 
+
             return data;
         }
- 
+
         // From msdn
         private static ImageCodecInfo GetEncoderInfo(String mimeType)
         {
diff --git a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
index f628ac1..387b3de 100644
--- a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Capabilities.Handlers")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 5536564..80b8306 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers
 {
     public class UploadBakedTextureHandler
     {
-      
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Caps m_HostCapsObj;
@@ -81,7 +81,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
                 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-                
+
                 BakedTextureUploader uploader =
                     new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
                 uploader.OnUpLoad += BakedTextureUploaded;
@@ -127,7 +127,7 @@ namespace OpenSim.Capabilities.Handlers
             asset.Temporary = true;
             asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
             m_assetService.Store(asset);
-            
+
         }
     }
 
@@ -151,7 +151,7 @@ namespace OpenSim.Capabilities.Handlers
             //                m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
         }
 
-       
+
 
         /// <summary>
         /// Handle raw uploaded baked texture data.
diff --git a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
index 7c4bc97..97491e3 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Capabilities
         public string state;
         public int upload_price;
         public string rsvp;
-        
+
         public LLSDNewFileAngentInventoryVariablePriceReplyResponse()
         {
             state = "confirm_upload";
diff --git a/OpenSim/Capabilities/LLSDAvatarPicker.cs b/OpenSim/Capabilities/LLSDAvatarPicker.cs
index d0b3f3a..12e892c 100644
--- a/OpenSim/Capabilities/LLSDAvatarPicker.cs
+++ b/OpenSim/Capabilities/LLSDAvatarPicker.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Capabilities
     {
         public string username;
         public string display_name;
-        //'display_name_next_update':d"1970-01-01T00:00:00Z" 
+        //'display_name_next_update':d"1970-01-01T00:00:00Z"
         public string legacy_first_name;
         public string legacy_last_name;
         public UUID id;
diff --git a/OpenSim/Capabilities/LLSDInventoryItem.cs b/OpenSim/Capabilities/LLSDInventoryItem.cs
index 958e807..460a215 100644
--- a/OpenSim/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Capabilities/LLSDInventoryItem.cs
@@ -87,12 +87,12 @@ namespace OpenSim.Framework.Capabilities
     [OSDMap]
     public class LLSDInventoryFolderContents
     {
-        public UUID agent_id; 
+        public UUID agent_id;
         public int descendents;
-        public UUID folder_id; 
+        public UUID folder_id;
         public OSDArray categories = new OSDArray();
         public OSDArray items = new OSDArray();
-        public UUID owner_id; 
+        public UUID owner_id;
         public int version;
     }
 
diff --git a/OpenSim/Capabilities/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Properties/AssemblyInfo.cs
index f8a9dae..72a5240 100644
--- a/OpenSim/Capabilities/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Capabilities")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs
index 7c003ea..e689424 100644
--- a/OpenSim/ConsoleClient/ConsoleClient.cs
+++ b/OpenSim/ConsoleClient/ConsoleClient.cs
@@ -178,7 +178,7 @@ namespace OpenSim.ConsoleClient
                 Requester.MakeRequest(requestUrl, requestData, ReadResponses);
                 return;
             }
-            
+
             List<string> lines = new List<string>();
 
             foreach (XmlNode part in rootNodeL[0].ChildNodes)
@@ -202,7 +202,7 @@ namespace OpenSim.ConsoleClient
                 string[] parts = l.Split(new char[] {':'}, 3);
                 if (parts.Length != 3)
                     continue;
-                
+
                 if (parts[2].StartsWith("+++") || parts[2].StartsWith("-++"))
                     prompt = parts[2];
                 else
diff --git a/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs b/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
index 9c0c784..87bff14 100644
--- a/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
+++ b/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.ConsoleClient")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Data/DBGuids.cs b/OpenSim/Data/DBGuids.cs
index ad1c19c..1a2bf41 100644
--- a/OpenSim/Data/DBGuids.cs
+++ b/OpenSim/Data/DBGuids.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Data
         /// <summary>This function converts a value returned from the database in one of the
         /// supported formats into a UUID.  This function is not actually DBMS-specific right
         /// now
-        /// 
+        ///
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/OpenSim/Data/IAvatarData.cs b/OpenSim/Data/IAvatarData.cs
index 0a18e21..b3f12c1 100644
--- a/OpenSim/Data/IAvatarData.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data
         public Dictionary<string, string> Data;
     }
 
-    public interface IAvatarData 
+    public interface IAvatarData
     {
         AvatarBaseData[] Get(string field, string val);
         bool Store(AvatarBaseData data);
diff --git a/OpenSim/Data/IEstateDataStore.cs b/OpenSim/Data/IEstateDataStore.cs
index f9070ea..6b30db2 100644
--- a/OpenSim/Data/IEstateDataStore.cs
+++ b/OpenSim/Data/IEstateDataStore.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Data
         /// <param name="create">If true, then an estate is created if one is not found.</param>
         /// <returns></returns>
         EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
+
         /// <summary>
         /// Load estate settings for an estate ID.
         /// </summary>
         /// <param name="estateID"></param>
         /// <returns></returns>
         EstateSettings LoadEstateSettings(int estateID);
-        
+
         /// <summary>
         /// Create a new estate.
         /// </summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Data
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<EstateSettings> LoadEstateSettingsAll();
-        
+
         /// <summary>
         /// Store estate settings.
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Data
         /// This is also called by EstateSettings.Save()</remarks>
         /// <param name="es"></param>
         void StoreEstateSettings(EstateSettings es);
-        
+
         /// <summary>
         /// Get estate IDs.
         /// </summary>
@@ -88,13 +88,13 @@ namespace OpenSim.Data
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesByOwner(UUID ownerID);
-        
+
         /// <summary>
         /// Get the IDs of all estates.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesAll();
-        
+
         /// <summary>
         /// Link a region to an estate.
         /// </summary>
@@ -102,14 +102,14 @@ namespace OpenSim.Data
         /// <param name="estateID"></param>
         /// <returns>true if the link succeeded, false otherwise</returns>
         bool LinkRegion(UUID regionID, int estateID);
-        
+
         /// <summary>
         /// Get the UUIDs of all the regions in an estate.
         /// </summary>
         /// <param name="estateID"></param>
         /// <returns></returns>
         List<UUID> GetRegions(int estateID);
-        
+
         /// <summary>
         /// Delete an estate
         /// </summary>
diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index 9afa477..1b2ea87 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the user grid datastore
     /// </summary>
-    public interface IGridUserData 
+    public interface IGridUserData
     {
         GridUserData Get(string userID);
         GridUserData[] GetAll(string query);
diff --git a/OpenSim/Data/IGroupsData.cs b/OpenSim/Data/IGroupsData.cs
index c11e649..bd059e0 100644
--- a/OpenSim/Data/IGroupsData.cs
+++ b/OpenSim/Data/IGroupsData.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Data
     }
 
 
-    public interface IGroupsData 
+    public interface IGroupsData
     {
         // groups table
         bool StoreGroup(GroupData data);
diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
index 452af7b..5e4894e 100644
--- a/OpenSim/Data/IHGTravelingData.cs
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the user grid datastore
     /// </summary>
-    public interface IHGTravelingData 
+    public interface IHGTravelingData
     {
         HGTravelingData Get(UUID sessionID);
         HGTravelingData[] GetSessions(UUID userID);
diff --git a/OpenSim/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
index 58501a3..a0f4d69 100644
--- a/OpenSim/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data
     }
 
 
-    public interface IOfflineIMData 
+    public interface IOfflineIMData
     {
         OfflineIMData[] Get(string field, string val);
         long GetCount(string field, string key);
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index 9ec48b0..4086245 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the presence datastore
     /// </summary>
-    public interface IPresenceData 
+    public interface IPresenceData
     {
         bool Store(PresenceData data);
 
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index ca9b327..c8e38a4 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the authentication datastore
     /// </summary>
-    public interface IRegionData 
+    public interface IRegionData
     {
         RegionData Get(UUID regionID, UUID ScopeID);
         List<RegionData> Get(string regionName, UUID ScopeID);
diff --git a/OpenSim/Data/IXGroupData.cs b/OpenSim/Data/IXGroupData.cs
index e5821ef..82073fe 100644
--- a/OpenSim/Data/IXGroupData.cs
+++ b/OpenSim/Data/IXGroupData.cs
@@ -38,12 +38,12 @@ namespace OpenSim.Data
         public UUID ownerRoleID;
         public string name;
         public string charter;
-        public bool showInList; 
-        public UUID insigniaID; 
+        public bool showInList;
+        public UUID insigniaID;
         public int membershipFee;
         public bool openEnrollment;
         public bool allowPublish;
-        public bool maturePublish; 
+        public bool maturePublish;
         public UUID founderID;
         public ulong everyonePowers;
         public ulong ownersPowers;
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index d606470..e54bf55 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -80,10 +80,10 @@ namespace OpenSim.Data
 
         /// <summary>Have the parameterless constructor just so we can specify it as a generic parameter with the new() constraint.
         /// Currently this is only used in the tests. A Migration instance created this way must be then
-        /// initialized with Initialize(). Regular creation should be through the parameterized constructors. 
+        /// initialized with Initialize(). Regular creation should be through the parameterized constructors.
         /// </summary>
         public Migration()
-        { 
+        {
         }
 
         public Migration(DbConnection conn, Assembly assem, string subtype, string type)
@@ -91,7 +91,7 @@ namespace OpenSim.Data
             Initialize(conn, assem, type, subtype);
         }
 
-        public Migration(DbConnection conn, Assembly assem, string type) 
+        public Migration(DbConnection conn, Assembly assem, string type)
         {
             Initialize(conn, assem, type, "");
         }
@@ -191,7 +191,7 @@ namespace OpenSim.Data
                 int newversion = kvp.Key;
                 // we need to up the command timeout to infinite as we might be doing long migrations.
 
-                /* [AlexRa 01-May-10]: We can't always just run any SQL in a single batch (= ExecuteNonQuery()). Things like 
+                /* [AlexRa 01-May-10]: We can't always just run any SQL in a single batch (= ExecuteNonQuery()). Things like
                  * stored proc definitions might have to be sent to the server each in a separate batch.
                  * This is certainly so for MS SQL; not sure how the MySQL connector sorts out the mess
                  * with 'delimiter @@'/'delimiter ;' around procs.  So each "script" this code executes now is not
@@ -276,7 +276,7 @@ namespace OpenSim.Data
         private delegate void FlushProc();
 
         /// <summary>Scans for migration resources in either old-style "scattered" (one file per version)
-        /// or new-style "integrated" format (single file with ":VERSION nnn" sections). 
+        /// or new-style "integrated" format (single file with ":VERSION nnn" sections).
         /// In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
         /// that must be sent to the server separately.  The old-style migrations are loaded each in one piece
         /// and don't support the ':GO' feature.
@@ -301,12 +301,12 @@ namespace OpenSim.Data
             {
                 /* The filename should be '<StoreName>.migrations[.NNN]' where NNN
                  * is the last version number defined in the file. If the '.NNN' part is recognized, the code can skip
-                 * the file without looking inside if we have a higher version already. Without the suffix we read 
+                 * the file without looking inside if we have a higher version already. Without the suffix we read
                  * the file anyway and use the version numbers inside.  Any unrecognized suffix (such as '.sql')
                  * is valid but ignored.
-                 * 
-                 *  NOTE that we expect only one 'merged' migration file. If there are several, we take the last one. 
-                 *  If you are numbering them, leave only the latest one in the project or at least make sure they numbered 
+                 *
+                 *  NOTE that we expect only one 'merged' migration file. If there are several, we take the last one.
+                 *  If you are numbering them, leave only the latest one in the project or at least make sure they numbered
                  *  to come up in the correct order (e.g. 'SomeStore.migrations.001' rather than 'SomeStore.migrations.1')
                  */
 
@@ -351,7 +351,7 @@ namespace OpenSim.Data
                         if (sLine.Trim().Equals(":GO", StringComparison.InvariantCultureIgnoreCase))
                         {
                             if (sb.Length == 0) continue;
-                            if (nVersion > after) 
+                            if (nVersion > after)
                                 script.Add(sb.ToString());
                             sb.Length = 0;
                             continue;
@@ -405,10 +405,10 @@ scan_old_style:
                     }
                 }
             }
-            
-            if (migrations.Count < 1) 
+
+            if (migrations.Count < 1)
                 m_log.DebugFormat("[MIGRATIONS]: {0} data tables already up to date at revision {1}", _type, after);
-            
+
             return migrations;
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 1488e1a..f16cd91 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -329,8 +329,8 @@ namespace OpenSim.Data.MySQL
                     {
                         m_log.Error(
                             string.Format(
-                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ", 
-                                start, count), 
+                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ",
+                                start, count),
                             e);
                     }
                 }
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index 7627497..af6be75 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -77,21 +77,21 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
                     IDataReader result = cmd.ExecuteReader();
-    
+
                     if (result.Read())
                     {
                         ret.PrincipalID = principalID;
-    
+
                         CheckColumnNames(result);
-    
+
                         foreach (string s in m_ColumnNames)
                         {
                             if (s == "UUID")
                                 continue;
-    
+
                             ret.Data[s] = result[s].ToString();
                         }
-    
+
                         return ret;
                     }
                     else
@@ -132,25 +132,25 @@ namespace OpenSim.Data.MySQL
                     if (!first)
                         update += ", ";
                     update += "`" + field + "` = ?"+field;
-    
+
                     first = false;
-    
+
                     cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
                 }
-    
+
                 update += " where UUID = ?principalID";
-    
+
                 cmd.CommandText = update;
                 cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) < 1)
                 {
                     string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
                             String.Join("`, `", fields) +
                             "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
-    
+
                     cmd.CommandText = insert;
-    
+
                     if (ExecuteNonQuery(cmd) < 1)
                         return false;
                 }
@@ -166,7 +166,7 @@ namespace OpenSim.Data.MySQL
             {
                 cmd.Parameters.AddWithValue("?"+item, value);
                 cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
@@ -186,7 +186,7 @@ namespace OpenSim.Data.MySQL
                 cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
                 cmd.Parameters.AddWithValue("?token", token);
                 cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
index 6a2f5d8..63e8020 100644
--- a/OpenSim/Data/MySQL/MySQLAvatarData.cs
+++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Data.MySQL
                 cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
                 cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
                 cmd.Parameters.AddWithValue("?Name", name);
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index fe1487b..a5c8d24 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -403,19 +403,19 @@ namespace OpenSim.Data.MySQL
                 return e;
             }
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
-            List<EstateSettings> allEstateSettings = new List<EstateSettings>();            
-            
+            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
+
             List<int> allEstateIds = GetEstatesAll();
-            
+
             foreach (int estateId in allEstateIds)
                 allEstateSettings.Add(LoadEstateSettings(estateId));
-            
+
             return allEstateSettings;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
@@ -441,7 +441,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Close();
             }
 
-            return result;            
+            return result;
         }
 
         public List<int> GetEstates(string search)
diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
index 4ed2de6..2837ce3 100644
--- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL
         {
             get { return GetType().Assembly; }
         }
-        
+
         public MySQLFSAssetData()
         {
         }
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index dc657c8..6aae9c6 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Data.MySQL
     public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Dictionary<string, FieldInfo> m_Fields =
                 new Dictionary<string, FieldInfo>();
 
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MySQL
         {
             m_Realm = realm;
             m_connectionString = connectionString;
-            
+
             if (storeName != String.Empty)
             {
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
@@ -130,7 +130,7 @@ namespace OpenSim.Data.MySQL
                                              m_Realm, where);
 
                 cmd.CommandText = query;
-                
+
                 return DoQuery(cmd);
             }
         }
@@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL
                                 m_Fields[name].SetValue(row, reader[name]);
                             }
                         }
-                
+
                         if (m_DataField != null)
                         {
                             Dictionary<string, string> data =
@@ -215,9 +215,9 @@ namespace OpenSim.Data.MySQL
             {
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
-                
+
                 cmd.CommandText = query;
-                
+
                 return DoQuery(cmd);
             }
         }
@@ -236,16 +236,16 @@ namespace OpenSim.Data.MySQL
                 {
                     names.Add(fi.Name);
                     values.Add("?" + fi.Name);
-                    
+
                     // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the
                     // InventoryTransferModule or we may be required to substitute a DBNull here.
                     if (fi.GetValue(row) == null)
                         throw new NullReferenceException(
                             string.Format(
-                                "[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null", 
+                                "[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
                                 fi.Name, row));
-                    
+
                     cmd.Parameters.AddWithValue(fi.Name, fi.GetValue(row).ToString());
                 }
 
diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs
index 5734d19..4e73ee7 100644
--- a/OpenSim/Data/MySQL/MySQLGroupsData.cs
+++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs
@@ -133,10 +133,10 @@ namespace OpenSim.Data.MySQL
 
         public bool DeleteMember(UUID groupID, string pricipalID)
         {
-            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" },
                                        new string[] { groupID.ToString(), pricipalID });
         }
-        
+
         public int MemberCount(UUID groupID)
         {
             return (int)m_Membership.GetCount("GroupID", groupID.ToString());
@@ -168,7 +168,7 @@ namespace OpenSim.Data.MySQL
 
         public bool DeleteRole(UUID groupID, UUID roleID)
         {
-            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" },
                                   new string[] { groupID.ToString(), roleID.ToString() });
         }
 
@@ -360,7 +360,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+        public MySqlGroupsGroupsHandler(string connectionString, string realm, string store)
             : base(connectionString, realm, store)
         {
         }
@@ -375,7 +375,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsMembershipHandler(string connectionString, string realm) 
+        public MySqlGroupsMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -390,7 +390,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsRolesHandler(string connectionString, string realm) 
+        public MySqlGroupsRolesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -405,7 +405,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+        public MySqlGroupsRoleMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -420,7 +420,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsInvitesHandler(string connectionString, string realm) 
+        public MySqlGroupsInvitesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -447,7 +447,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsNoticesHandler(string connectionString, string realm) 
+        public MySqlGroupsNoticesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsPrincipalsHandler(string connectionString, string realm) 
+        public MySqlGroupsPrincipalsHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index e9b10f3..382d4a5 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Data.MySQL
                 // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy.  It would be nice to live fix these.
                 // (DBGuid.FromDB() reads db NULLs as well, returns UUID.Zero)
                 item.CreatorId = reader["creatorID"].ToString();
-                
+
                 // Be a bit safer in parsing these because the
                 // database doesn't enforce them to be not null, and
                 // the inventory still works if these are weird in the
@@ -453,7 +453,7 @@ namespace OpenSim.Data.MySQL
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length + " to " + itemName.Length + " characters on add item");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
@@ -490,10 +490,10 @@ namespace OpenSim.Data.MySQL
                         result.Parameters.AddWithValue("?groupID", item.GroupID);
                         result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
                         result.Parameters.AddWithValue("?flags", item.Flags);
-    
+
                         lock (m_dbLock)
                             result.ExecuteNonQuery();
-    
+
                         result.Dispose();
                     }
 
@@ -630,7 +630,7 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
                     cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-    
+
                     try
                     {
                         lock (m_dbLock)
@@ -860,7 +860,7 @@ namespace OpenSim.Data.MySQL
             deleteOneFolder(folderID);
             deleteItemsInFolder(folderID);
         }
-        
+
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
         {
             lock (m_dbLock)
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
index 81a0e83..2043dae 100644
--- a/OpenSim/Data/MySQL/MySQLMigrations.cs
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Data.MySQL
 {
     /// <summary>This is a MySQL-customized migration processor.  The only difference is in how
     /// it executes SQL scripts (using MySqlScript instead of MyCommand)
-    /// 
+    ///
     /// </summary>
     public class MySqlMigration : Migration
     {
         public MySqlMigration()
             : base()
-        { 
+        {
         }
 
-        public MySqlMigration(DbConnection conn, Assembly assem, string subtype, string type) : 
+        public MySqlMigration(DbConnection conn, Assembly assem, string subtype, string type) :
             base(conn, assem, subtype, type)
         {
         }
diff --git a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index bafd204..7608858 100644
--- a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
-         
+
                 ExecuteNonQuery(cmd);
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 3f90639..70aca5f 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -66,9 +66,9 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 ExecuteNonQuery(cmd);
             }
         }
@@ -85,10 +85,10 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) == 0)
                     return false;
             }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 99d4944..0e55285 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -410,7 +410,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand(command))
             {
                 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-    
+
                 return RunCommand(cmd);
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 2aaa2ff..8278c0e 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MySQL
         /// <summary>
         /// This lock was being used to serialize database operations when the connection was shared, but this has
         /// been unnecessary for a long time after we switched to using MySQL's underlying connection pooling instead.
-        /// FIXME: However, the locks remain in many places since they are effectively providing a level of 
+        /// FIXME: However, the locks remain in many places since they are effectively providing a level of
         /// transactionality.  This should be replaced by more efficient database transactions which would not require
         /// unrelated operations to block each other or unrelated operations on the same tables from blocking each
         /// other.
@@ -268,7 +268,7 @@ namespace OpenSim.Data.MySQL
         public virtual void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
-            
+
             List<UUID> uuids = new List<UUID>();
 
             // Formerly, this used to check the region UUID.
@@ -509,7 +509,7 @@ namespace OpenSim.Data.MySQL
             #region Prim Inventory Loading
 
             // Instead of attempting to LoadItems on every prim,
-            // most of which probably have no items... get a 
+            // most of which probably have no items... get a
             // list from DB of all prims which have items and
             // LoadItems only on those
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
@@ -807,7 +807,7 @@ namespace OpenSim.Data.MySQL
                             "UserLocationX, UserLocationY, UserLocationZ, " +
                             "UserLookAtX, UserLookAtY, UserLookAtZ, " +
                             "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " +
-                            "MediaSize, MediaLoop, ObscureMusic, ObscureMedia, " + 
+                            "MediaSize, MediaLoop, ObscureMusic, ObscureMedia, " +
                             "SeeAVs, AnyAVSounds, GroupAVSounds) values (" +
                             "?UUID, ?RegionUUID, " +
                             "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
@@ -1081,7 +1081,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
                     cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
                     cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
-                    
+
                     ExecuteNonQuery(cmd);
                 }
             }
@@ -1273,7 +1273,7 @@ namespace OpenSim.Data.MySQL
         {
             SceneObjectPart prim = new SceneObjectPart();
 
-            // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! 
+            // depending on the MySQL connector version, CHAR(36) may be already converted to Guid!
             prim.UUID = DBGuid.FromDB(row["UUID"]);
             prim.CreatorIdentification = (string)row["CreatorID"];
             prim.OwnerID = DBGuid.FromDB(row["OwnerID"]);
@@ -1401,11 +1401,11 @@ namespace OpenSim.Data.MySQL
 
             prim.CollisionSound = DBGuid.FromDB(row["CollisionSound"]);
             prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
-            
+
             prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
             prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
-            
+
             if (!(row["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)row["MediaURL"];
 
@@ -1421,7 +1421,7 @@ namespace OpenSim.Data.MySQL
             if (!(row["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();        
+                prim.DynAttrs = new DAMap();
 
             if (!(row["KeyframeMotion"] is DBNull))
             {
@@ -1543,10 +1543,10 @@ namespace OpenSim.Data.MySQL
             newSettings.Covenant = DBGuid.FromDB(row["covenant"]);
             newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
-            
+
             if (row["loaded_creation_id"] is DBNull)
                 newSettings.LoadedCreationID = "";
-            else 
+            else
                 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
 
             newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
@@ -2023,7 +2023,7 @@ namespace OpenSim.Data.MySQL
 
             s.State = (byte)(int)row["State"];
             s.LastAttachPoint = (byte)(int)row["LastAttachPoint"];
-            
+
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
 
@@ -2103,13 +2103,13 @@ namespace OpenSim.Data.MySQL
                                 "?flags, ?itemID, ?primID, ?assetID, " +
                                 "?parentFolderID, ?creatorID, ?ownerID, " +
                                 "?groupID, ?lastOwnerID)";
-    
+
                         foreach (TaskInventoryItem item in items)
                         {
                             cmd.Parameters.Clear();
-    
+
                             FillItemCommand(cmd, item);
-    
+
                             ExecuteNonQuery(cmd);
                         }
                     }
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index c389ae4..8af2a3e 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -40,39 +40,39 @@ namespace OpenSim.Data.MySQL
     public class UserProfilesData: IProfilesData
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         #region Properites
         string ConnectionString
         {
             get; set;
         }
-        
+
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
-        
+
         #endregion Properties
-        
+
         #region class Member Functions
         public UserProfilesData(string connectionString)
         {
             ConnectionString = connectionString;
             Init();
         }
-        
+
         void Init()
         {
             using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
             {
                 dbcon.Open();
-                
+
                 Migration m = new Migration(dbcon, Assembly, "UserProfiles");
                 m.Update();
             }
         }
         #endregion Member Functions
-        
+
         #region Classifieds Queries
         /// <summary>
         /// Gets the classified records.
@@ -86,7 +86,7 @@ namespace OpenSim.Data.MySQL
         public OSDArray GetClassifiedRecords(UUID creatorId)
         {
             OSDArray data = new OSDArray();
-            
+
             using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
             {
                 string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 OSDMap n = new OSDMap();
                                 UUID Id = UUID.Zero;
-                                
+
                                 string Name = null;
                                 try
                                 {
@@ -124,12 +124,12 @@ namespace OpenSim.Data.MySQL
             }
             return data;
         }
-        
+
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
         {
             string query = string.Empty;
-            
-            
+
+
             query += "INSERT INTO classifieds (";
             query += "`classifieduuid`,";
             query += "`creatoruuid`,";
@@ -173,21 +173,21 @@ namespace OpenSim.Data.MySQL
             query += "classifiedflags=?Flags, ";
             query += "priceforlisting=?ListingPrice, ";
             query += "snapshotuuid=?SnapshotId";
-            
+
             if(string.IsNullOrEmpty(ad.ParcelName))
                 ad.ParcelName = "Unknown";
             if(ad.ParcelId == null)
                 ad.ParcelId = UUID.Zero;
             if(string.IsNullOrEmpty(ad.Description))
                 ad.Description = "No Description";
-            
+
             DateTime epoch = new DateTime(1970, 1, 1);
             DateTime now = DateTime.Now;
             TimeSpan epochnow = now - epoch;
             TimeSpan duration;
             DateTime expiration;
             TimeSpan epochexp;
-            
+
             if(ad.Flags == 2)
             {
                 duration = new TimeSpan(7,0,0,0);
@@ -202,7 +202,7 @@ namespace OpenSim.Data.MySQL
             }
             ad.CreationDate = (int)epochnow.TotalSeconds;
             ad.ExpirationDate = (int)epochexp.TotalSeconds;
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -225,7 +225,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?ParcelName", ad.ParcelName.ToString());
                         cmd.Parameters.AddWithValue("?Flags", ad.Flags.ToString());
                         cmd.Parameters.AddWithValue("?ListingPrice", ad.Price.ToString ());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -239,20 +239,20 @@ namespace OpenSim.Data.MySQL
             }
             return true;
         }
-        
+
         public bool DeleteClassifiedRecord(UUID recordId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM classifieds WHERE ";
             query += "classifieduuid = ?recordId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
@@ -268,14 +268,14 @@ namespace OpenSim.Data.MySQL
             }
             return true;
         }
-        
+
         public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM classifieds WHERE ";
             query += "classifieduuid = ?AdId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?AdId", ad.ClassifiedId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.Read ())
@@ -303,7 +303,7 @@ namespace OpenSim.Data.MySQL
                                 ad.SimName = reader.GetString("simname");
                                 ad.GlobalPos = reader.GetString("posglobal");
                                 ad.ParcelName = reader.GetString("parcelname");
-                                
+
                             }
                         }
                     }
@@ -318,16 +318,16 @@ namespace OpenSim.Data.MySQL
             return true;
         }
         #endregion Classifieds Queries
-        
+
         #region Picks Queries
         public OSDArray GetAvatarPicks(UUID avatarId)
         {
             string query = string.Empty;
-            
+
             query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
             query += "creatoruuid = ?Id";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -336,7 +336,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
@@ -344,7 +344,7 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                 {
                                     OSDMap record = new OSDMap();
-                                    
+
                                     record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
                                     record.Add("name",OSD.FromString((string)reader["name"]));
                                     data.Add(record);
@@ -361,16 +361,16 @@ namespace OpenSim.Data.MySQL
             }
             return data;
         }
-        
+
         public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
         {
             string query = string.Empty;
             UserProfilePick pick = new UserProfilePick();
-            
+
             query += "SELECT * FROM userpicks WHERE ";
             query += "creatoruuid = ?CreatorId AND ";
             query += "pickuuid =  ?PickId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -380,18 +380,18 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?CreatorId", avatarId.ToString());
                         cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                
+
                                 string description = (string)reader["description"];
-                                
+
                                 if (string.IsNullOrEmpty(description))
                                     description = "No description given.";
-                                
+
                                 UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
                                 UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
                                 UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
@@ -419,11 +419,11 @@ namespace OpenSim.Data.MySQL
             }
             return pick;
         }
-        
+
         public bool UpdatePicksRecord(UserProfilePick pick)
-        {       
+        {
             string query = string.Empty;
-            
+
             query += "INSERT INTO userpicks VALUES (";
             query += "?PickId,";
             query += "?CreatorId,";
@@ -449,7 +449,7 @@ namespace OpenSim.Data.MySQL
             query += "pickuuid=?PickId,";
             query += "posglobal=?GlobalPos,";
             query += "gatekeeper=?Gatekeeper";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -471,7 +471,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?Gatekeeper",pick.Gatekeeper);
                         cmd.Parameters.AddWithValue("?SortOrder", pick.SortOrder.ToString ());
                         cmd.Parameters.AddWithValue("?Enabled", pick.Enabled.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -484,24 +484,24 @@ namespace OpenSim.Data.MySQL
             }
             return true;
         }
-        
+
         public bool DeletePicksRecord(UUID pickId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM userpicks WHERE ";
             query += "pickuuid = ?PickId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -515,12 +515,12 @@ namespace OpenSim.Data.MySQL
             return true;
         }
         #endregion Picks Queries
-        
+
         #region Avatar Notes Queries
         public bool GetAvatarNotes(ref UserProfileNotes notes)
         {  // WIP
             string query = string.Empty;
-            
+
             query += "SELECT `notes` FROM usernotes WHERE ";
             query += "useruuid = ?Id AND ";
             query += "targetuuid = ?TargetId";
@@ -534,7 +534,7 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?Id", notes.UserId.ToString());
                         cmd.Parameters.AddWithValue("?TargetId", notes.TargetId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -557,12 +557,12 @@ namespace OpenSim.Data.MySQL
             }
             return true;
         }
-        
+
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
-        {          
+        {
             string query = string.Empty;
             bool remove;
-            
+
             if(string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
@@ -581,7 +581,7 @@ namespace OpenSim.Data.MySQL
                 query += "UPDATE ";
                 query += "notes=?Notes";
             }
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -593,7 +593,7 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?Notes", note.Notes);
                         cmd.Parameters.AddWithValue("?TargetId", note.TargetId.ToString ());
                         cmd.Parameters.AddWithValue("?UserId", note.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -605,18 +605,18 @@ namespace OpenSim.Data.MySQL
                 return false;
             }
             return true;
-            
+
         }
         #endregion Avatar Notes Queries
-        
+
         #region Avatar Properties
         public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM userprofile WHERE ";
             query += "useruuid = ?Id";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -625,7 +625,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -649,7 +649,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 m_log.DebugFormat("[PROFILES_DATA]" +
                                                  ": No data for {0}", props.UserId);
-                               
+
                                 props.WebUrl = string.Empty;
                                 props.ImageId = UUID.Zero;
                                 props.AboutText = string.Empty;
@@ -730,11 +730,11 @@ namespace OpenSim.Data.MySQL
             }
             return true;
         }
-        
+
         public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
-        {            
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileURL=?profileURL, ";
             query += "profileImage=?image, ";
@@ -742,7 +742,7 @@ namespace OpenSim.Data.MySQL
             query += "profileFirstImage=?firstlifeimage,";
             query += "profileFirstText=?firstlifetext ";
             query += "WHERE useruuid=?uuid";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -756,7 +756,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString());
                         cmd.Parameters.AddWithValue("?firstlifetext", props.FirstLifeText);
                         cmd.Parameters.AddWithValue("?uuid", props.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -765,18 +765,18 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+
                 return false;
             }
             return true;
         }
         #endregion Avatar Properties
-        
+
         #region Avatar Interests
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
-        {           
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileWantToMask=?WantMask, ";
             query += "profileWantToText=?WantText,";
@@ -784,7 +784,7 @@ namespace OpenSim.Data.MySQL
             query += "profileSkillsText=?SkillsText, ";
             query += "profileLanguages=?Languages ";
             query += "WHERE useruuid=?uuid";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -798,7 +798,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?SkillsText", up.SkillsText);
                         cmd.Parameters.AddWithValue("?Languages", up.Language);
                         cmd.Parameters.AddWithValue("?uuid", up.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -820,8 +820,8 @@ namespace OpenSim.Data.MySQL
             string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
 
             // Get classified image assets
-            
-            
+
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -831,7 +831,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`classifieds`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -850,7 +850,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -862,7 +862,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    
+
                     dbcon.Close();
                     dbcon.Open();
 
@@ -871,7 +871,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -893,7 +893,7 @@ namespace OpenSim.Data.MySQL
             }
             return data;
         }
-        
+
         #region User Preferences
         public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
@@ -987,16 +987,16 @@ namespace OpenSim.Data.MySQL
             return true;
         }
         #endregion User Preferences
-        
+
         #region Integration
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM `userdata` WHERE ";
             query += "UserId = ?Id AND ";
             query += "TagId = ?TagId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -1006,7 +1006,7 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
                         cmd.Parameters.AddWithValue ("?TagId", props.TagId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -1022,7 +1022,7 @@ namespace OpenSim.Data.MySQL
                                 query += "?TagId,";
                                 query += "?DataKey,";
                                 query +=  "?DataVal) ";
-                                
+
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
                                     put.Parameters.AddWithValue("?UserId", props.UserId.ToString());
@@ -1048,16 +1048,16 @@ namespace OpenSim.Data.MySQL
         }
 
         public bool SetUserAppData(UserAppData props, ref string result)
-        {         
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userdata SET ";
             query += "TagId = ?TagId, ";
             query += "DataKey = ?DataKey, ";
             query += "DataVal = ?DataVal WHERE ";
             query += "UserId = ?UserId AND ";
             query += "TagId = ?TagId";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index ec2bcc6..2c6acde 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -209,7 +209,7 @@ namespace OpenSim.Data.MySQL
                     {
                         assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                         m_log.WarnFormat(
-                            "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                             asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                     }
 
@@ -218,7 +218,7 @@ namespace OpenSim.Data.MySQL
                     {
                         assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                         m_log.WarnFormat(
-                            "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                             asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                     }
 
@@ -341,7 +341,7 @@ namespace OpenSim.Data.MySQL
                 catch (Exception)
                 {
                     m_log.ErrorFormat(
-                        "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 
+                        "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}",
                         assetMetadata.ID, assetMetadata.Name);
                 }
             }
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index 9a0044e..4e41fec 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Data.MySQL
 
             return m_Items.Store(item);
         }
-        
+
         public bool DeleteFolders(string field, string val)
         {
             return m_Folders.Delete(field, val);
@@ -220,12 +220,12 @@ namespace OpenSim.Data.MySQL
 
                     cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
                     cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
-                
+
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
 
                         int perms = 0;
-                    
+
                         if (reader.Read())
                         {
                             perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 57592f1..9f22896 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -102,19 +102,19 @@ namespace OpenSim.Data.Null
         {
             return new EstateSettings();
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> allEstateSettings = new List<EstateSettings>();
             allEstateSettings.Add(GetEstate());
             return allEstateSettings;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
             result.Add((int)GetEstate().EstateID);
-            return result;            
+            return result;
         }
 
         public List<int> GetEstates(string search)
diff --git a/OpenSim/Data/Null/NullFriendsData.cs b/OpenSim/Data/Null/NullFriendsData.cs
index 473999f..dc9cd38 100644
--- a/OpenSim/Data/Null/NullFriendsData.cs
+++ b/OpenSim/Data/Null/NullFriendsData.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Data.Null
                 {
                     return fdata.PrincipalID == userID.ToString();
                 });
-    
+
                 if (lst != null)
                 {
                     lst.ForEach(f =>
@@ -87,14 +87,14 @@ namespace OpenSim.Data.Null
                         FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
                         if (f2 != null)
                             f.Data["TheirFlags"] = f2.Data["Flags"];
-    
+
     //                    m_log.DebugFormat(
     //                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
     //                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
                     });
-    
+
     //                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
-    
+
                     return lst.ToArray();
                 }
             }
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Null
     //                    m_log.DebugFormat(
     //                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
     //                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
-    
+
                         m_Data.Remove(friend);
                         return true;
                     }
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index aff0b0b..8c442c9 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Null
     public class NullPresenceData : IPresenceData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public static NullPresenceData Instance;
 
         Dictionary<UUID, PresenceData> m_presenceData = new Dictionary<UUID, PresenceData>();
@@ -100,7 +100,7 @@ namespace OpenSim.Data.Null
         {
             if (Instance != this)
                 return Instance.ReportAgent(sessionID, regionID);
-            
+
             if (m_presenceData.ContainsKey(sessionID))
             {
                 m_presenceData[sessionID].RegionID = regionID;
@@ -129,7 +129,7 @@ namespace OpenSim.Data.Null
 //                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
                     }
                 }
-                
+
                 return presences.ToArray();
             }
             else if (field == "SessionID")
@@ -172,7 +172,7 @@ namespace OpenSim.Data.Null
         {
 //            m_log.DebugFormat(
 //                "[NULL PRESENCE DATA]: Deleting presence data for field {0} with parameter {1}", field, data);
-            
+
             if (Instance != this)
                 return Instance.Delete(field, data);
 
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index 241616b..6d2e05a 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Data.Null
     public class NullUserAccountData : IUserAccountData
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Dictionary<UUID, UserAccountData> m_DataByUUID = new Dictionary<UUID, UserAccountData>();
         private Dictionary<string, UserAccountData> m_DataByName = new Dictionary<string, UserAccountData>();
         private Dictionary<string, UserAccountData> m_DataByEmail = new Dictionary<string, UserAccountData>();
@@ -48,7 +48,7 @@ namespace OpenSim.Data.Null
         public NullUserAccountData(string connectionString, string realm)
         {
 //            m_log.DebugFormat(
-//                "[NULL USER ACCOUNT DATA]: Initializing new NullUserAccountData with connectionString [{0}], realm [{1}]", 
+//                "[NULL USER ACCOUNT DATA]: Initializing new NullUserAccountData with connectionString [{0}], realm [{1}]",
 //                connectionString, realm);
         }
 
@@ -65,12 +65,12 @@ namespace OpenSim.Data.Null
 //            if (m_log.IsDebugEnabled)
 //            {
 //                m_log.DebugFormat(
-//                    "[NULL USER ACCOUNT DATA]: Called Get with fields [{0}], values [{1}]", 
+//                    "[NULL USER ACCOUNT DATA]: Called Get with fields [{0}], values [{1}]",
 //                    string.Join(", ", fields), string.Join(", ", values));
 //            }
-            
+
             UserAccountData[] userAccounts = new UserAccountData[0];
-            
+
             List<string> fieldsLst = new List<string>(fields);
             if (fieldsLst.Contains("PrincipalID"))
             {
@@ -79,33 +79,33 @@ namespace OpenSim.Data.Null
                 if (UUID.TryParse(values[i], out id))
                     if (m_DataByUUID.ContainsKey(id))
                         userAccounts = new UserAccountData[] { m_DataByUUID[id] };
-            }            
+            }
             else if (fieldsLst.Contains("FirstName") && fieldsLst.Contains("LastName"))
             {
                 int findex = fieldsLst.IndexOf("FirstName");
                 int lindex = fieldsLst.IndexOf("LastName");
                 if (m_DataByName.ContainsKey(values[findex] + " " + values[lindex]))
-                {                                       
+                {
                     userAccounts = new UserAccountData[] { m_DataByName[values[findex] + " " + values[lindex]] };
                 }
-            }            
+            }
             else if (fieldsLst.Contains("Email"))
             {
                 int i = fieldsLst.IndexOf("Email");
                 if (m_DataByEmail.ContainsKey(values[i]))
                     userAccounts = new UserAccountData[] { m_DataByEmail[values[i]] };
             }
-            
+
 //            if (m_log.IsDebugEnabled)
 //            {
 //                StringBuilder sb = new StringBuilder();
 //                foreach (UserAccountData uad in userAccounts)
 //                    sb.AppendFormat("({0} {1} {2}) ", uad.FirstName, uad.LastName, uad.PrincipalID);
-//                    
+//
 //                m_log.DebugFormat(
 //                    "[NULL USER ACCOUNT DATA]: Returning {0} user accounts out of {1}: [{2}]", userAccounts.Length, m_DataByName.Count, sb);
 //            }
-            
+
             return userAccounts;
         }
 
@@ -113,16 +113,16 @@ namespace OpenSim.Data.Null
         {
             if (data == null)
                 return false;
-                       
+
             m_log.DebugFormat(
-                "[NULL USER ACCOUNT DATA]: Storing user account {0} {1} {2} {3}", 
+                "[NULL USER ACCOUNT DATA]: Storing user account {0} {1} {2} {3}",
                 data.FirstName, data.LastName, data.PrincipalID, this.GetHashCode());
-            
+
             m_DataByUUID[data.PrincipalID] = data;
             m_DataByName[data.FirstName + " " + data.LastName] = data;
             if (data.Data.ContainsKey("Email") && data.Data["Email"] != null && data.Data["Email"] != string.Empty)
                 m_DataByEmail[data.Data["Email"]] = data;
-            
+
 //            m_log.DebugFormat("m_DataByUUID count is {0}, m_DataByName count is {1}", m_DataByUUID.Count, m_DataByName.Count);
 
             return true;
@@ -132,7 +132,7 @@ namespace OpenSim.Data.Null
         {
 //            m_log.DebugFormat(
 //                "[NULL USER ACCOUNT DATA]: Called GetUsers with scope [{0}], query [{1}]", scopeID, query);
-            
+
             string[] words = query.Split(new char[] { ' ' });
 
             for (int i = 0; i < words.Length; i++)
diff --git a/OpenSim/Data/PGSQL/PGSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
index 81adb03..7b79521 100644
--- a/OpenSim/Data/PGSQL/PGSQLAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -151,35 +151,35 @@ namespace OpenSim.Data.PGSQL
         /// <param name="asset">the asset</param>
         override public bool StoreAsset(AssetBase asset)
         {
-           
+
             string sql =
                 @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType,
                          local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
                     WHERE id=:id;
 
                   INSERT INTO assets
-                    (id, name, description, " + "\"assetType\" " + @", local, 
+                    (id, name, description, " + "\"assetType\" " + @", local,
                      temporary, create_time, access_time, creatorid, asset_flags, data)
-                  Select :id, :name, :description, :assetType, :local, 
+                  Select :id, :name, :description, :assetType, :local,
                          :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
-                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id)
                 ";
-            
+
             string assetName = asset.Name;
             if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
             {
                 assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Name, asset.ID, asset.Name.Length, assetName.Length);
             }
-            
+
             string assetDescription = asset.Description;
             if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
             {
                 assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
 
@@ -278,7 +278,7 @@ namespace OpenSim.Data.PGSQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
             string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid
-                              FROM assets 
+                              FROM assets
                              order by id
                              limit :stop
                             offset :start;";
diff --git a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
index d174112..8f83309 100644
--- a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Data.PGSQL
                     updateBuilder.AppendFormat("\"{0}\" = :{0}",field);
 
                     first = false;
-                    
+
                     cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
                 }
 
@@ -154,7 +154,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.CommandText = updateBuilder.ToString();
                 cmd.Connection = conn;
                 cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
-                
+
                 conn.Open();
                 if (cmd.ExecuteNonQuery() < 1)
                 {
@@ -195,7 +195,7 @@ namespace OpenSim.Data.PGSQL
         {
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
-            
+
             string sql = "insert into tokens (uuid, token, validity) values (:principalID, :token, :lifetime)";
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
diff --git a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
index d9c4905..3d56d4d 100644
--- a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.PGSQL
             IAvatarData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public PGSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
         {
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index b5ca235..9489d6c 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -594,7 +594,7 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteEstate(int estateID)
         {
-            // TODO: Implementation!            
+            // TODO: Implementation!
             return false;
         }
         #endregion
diff --git a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
index a841353..58dffed 100644
--- a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
-        
+
         public override bool Delete(string principalID, string friend)
         {
             UUID princUUID = UUID.Zero;
@@ -97,7 +97,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
 
-                cmd.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " + 
+                cmd.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " +
                                                 " left join {0} as b on a.\"PrincipalID\" = b.\"Friend\" and a.\"Friend\" = b.\"PrincipalID\" " +
                                                 " where a.\"PrincipalID\" = :PrincipalID", m_Realm);
                 cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
@@ -111,6 +111,6 @@ namespace OpenSim.Data.PGSQL
         {
             return GetFriends(principalID);
         }
- 
+
     }
 }
diff --git a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
index 061de22..5b24720 100644
--- a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Data.PGSQL
             : base(connectionString)
         {
             m_Realm = realm;
-            
+
             m_ConnectionString = connectionString;
 
             if (storeName != String.Empty)
@@ -104,7 +104,7 @@ namespace OpenSim.Data.PGSQL
             m_FieldTypes = new Dictionary<string, string>();
 
             string query = string.Format(@"select column_name,data_type
-                        from INFORMATION_SCHEMA.COLUMNS 
+                        from INFORMATION_SCHEMA.COLUMNS
                        where table_name = lower('{0}');
 
                 ", m_Realm);
@@ -232,7 +232,7 @@ namespace OpenSim.Data.PGSQL
                 if (reader == null)
                     return new T[0];
 
-                CheckColumnNames(reader);                
+                CheckColumnNames(reader);
 
                 while (reader.Read())
                 {
@@ -339,7 +339,7 @@ namespace OpenSim.Data.PGSQL
                     names.Add(fi.Name);
                     values.Add(":" + fi.Name);
                     // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the
                     // InventoryTransferModule or we may be required to substitute a DBNull here.
                     if (fi.GetValue(row) == null)
                         throw new NullReferenceException(
@@ -395,11 +395,11 @@ namespace OpenSim.Data.PGSQL
                     }
                     string where = String.Join(" AND ", terms.ToArray());
                     query.AppendFormat(" WHERE {0} ", where);
-                    
+
                 }
                 cmd.Connection = conn;
                 cmd.CommandText = query.ToString();
-                
+
                 conn.Open();
                 if (cmd.ExecuteNonQuery() > 0)
                 {
@@ -416,7 +416,7 @@ namespace OpenSim.Data.PGSQL
                     query.Append("\") values (" + String.Join(",", values.ToArray()) + ")");
                     cmd.Connection = conn;
                     cmd.CommandText = query.ToString();
-                    
+
                     // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText);
 
                     if (conn.State != ConnectionState.Open)
diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
index e257e7c..6ef576b 100755
--- a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
@@ -37,7 +37,7 @@ using Npgsql;
 namespace OpenSim.Data.PGSQL
 {
     public class PGSQLGroupsData : IGroupsData
-    {        
+    {
         private PGSqlGroupsGroupsHandler m_Groups;
         private PGSqlGroupsMembershipHandler m_Membership;
         private PGSqlGroupsRolesHandler m_Roles;
@@ -83,17 +83,17 @@ namespace OpenSim.Data.PGSQL
 
         public GroupData[] RetrieveGroups(string pattern)
         {
-                       
+
             if (string.IsNullOrEmpty(pattern)) // True for where clause
             {
                 pattern = " 1 ORDER BY lower(\"Name\") LIMIT 100";
-                
+
                 return m_Groups.Get(pattern);
             }
-            else   
-            {             
+            else
+            {
                 pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100";
-        
+
                 return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern));
             }
         }
@@ -138,10 +138,10 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteMember(UUID groupID, string pricipalID)
         {
-            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" },
                                        new string[] { groupID.ToString(), pricipalID });
         }
-        
+
         public int MemberCount(UUID groupID)
         {
             return (int)m_Membership.GetCount("GroupID", groupID.ToString());
@@ -173,7 +173,7 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteRole(UUID groupID, UUID roleID)
         {
-            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" },
                                   new string[] { groupID.ToString(), roleID.ToString() });
         }
 
@@ -365,7 +365,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store)
             : base(connectionString, realm, store)
         {
         }
@@ -380,7 +380,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsMembershipHandler(string connectionString, string realm) 
+        public PGSqlGroupsMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -395,7 +395,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsRolesHandler(string connectionString, string realm) 
+        public PGSqlGroupsRolesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -410,7 +410,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -425,7 +425,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsInvitesHandler(string connectionString, string realm) 
+        public PGSqlGroupsInvitesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -436,7 +436,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
-                
+
                 ExecuteNonQuery(cmd);
             }
 
@@ -451,7 +451,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsNoticesHandler(string connectionString, string realm) 
+        public PGSqlGroupsNoticesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -462,7 +462,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
-                
+
                 ExecuteNonQuery(cmd);
             }
 
@@ -477,7 +477,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm) 
+        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
diff --git a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
index c999433..30fc5ea 100644
--- a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Data.PGSQL
         {
             m_connectionString = connectionString;
             database = new PGSQLManager(connectionString);
-          
+
             //New migrations check of store
             database.CheckMigration(_migrationStore);
         }
@@ -190,8 +190,8 @@ namespace OpenSim.Data.PGSQL
             /*  NOTE: the implementation below is very inefficient (makes a separate request to get subfolders for
              * every found folder, recursively).  Inventory code for other DBs has been already rewritten to get ALL
              * inventory for a specific user at once.
-             * 
-             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never 
+             *
+             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never
              * be used, so check for that and return an empty list.
              */
 
@@ -264,11 +264,11 @@ namespace OpenSim.Data.PGSQL
         /// <param name="folder">Folder to update</param>
         public void updateInventoryFolder(InventoryFolderBase folder)
         {
-            string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID, 
+            string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID,
                                                        ""parentFolderID"" = :parentFolderID,
                                                        ""folderName"" = :folderName,
                                                        type = :type,
-                                                       version = :version 
+                                                       version = :version
                            WHERE folderID = :folderID";
 
             string folderName = folder.Name;
@@ -337,7 +337,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
                 conn.Open();
                 subFolders = getFolderHierarchy(folderID, cmd);
-                
+
 
                 //Delete all sub-folders
                 foreach (InventoryFolderBase f in subFolders)
@@ -403,7 +403,7 @@ namespace OpenSim.Data.PGSQL
                     }
                 }
             }
-            
+
             m_log.InfoFormat("[INVENTORY DB]: Found no inventory item with ID : {0}", itemID);
             return null;
         }
@@ -420,24 +420,24 @@ namespace OpenSim.Data.PGSQL
                 return;
             }
 
-            string sql = @"INSERT INTO inventoryitems 
-                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", 
+            string sql = @"INSERT INTO inventoryitems
+                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"",
                              ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"",
                              ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"",
-                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) 
+                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags)
                         VALUES
                             (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
                              :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
                              :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType,
                              :creationDate, :groupID, :groupOwned, :flags)";
-            
+
             string itemName = item.Name;
             if (item.Name.Length > 64)
             {
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
@@ -502,25 +502,25 @@ namespace OpenSim.Data.PGSQL
         /// <param name="item">Inventory item to update</param>
         public void updateInventoryItem(InventoryItemBase item)
         {
-            string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID, 
+            string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID,
                                                 ""assetType"" = :assetType,
                                                 ""parentFolderID"" = :parentFolderID,
                                                 ""avatarID"" = :avatarID,
-                                                ""inventoryName"" = :inventoryName, 
-                                                ""inventoryDescription"" = :inventoryDescription, 
-                                                ""inventoryNextPermissions"" = :inventoryNextPermissions, 
-                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, 
-                                                ""invType"" = :invType, 
-                                                ""creatorID"" = :creatorID, 
-                                                ""inventoryBasePermissions"" = :inventoryBasePermissions, 
-                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, 
-                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions, 
-                                                ""salePrice"" = :SalePrice, 
-                                                ""saleType"" = :SaleType, 
-                                                ""creationDate"" = :creationDate, 
-                                                ""groupID"" = :groupID, 
-                                                ""groupOwned"" = :groupOwned, 
-                                                flags = :flags 
+                                                ""inventoryName"" = :inventoryName,
+                                                ""inventoryDescription"" = :inventoryDescription,
+                                                ""inventoryNextPermissions"" = :inventoryNextPermissions,
+                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions,
+                                                ""invType"" = :invType,
+                                                ""creatorID"" = :creatorID,
+                                                ""inventoryBasePermissions"" = :inventoryBasePermissions,
+                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions,
+                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions,
+                                                ""salePrice"" = :SalePrice,
+                                                ""saleType"" = :SaleType,
+                                                ""creationDate"" = :creationDate,
+                                                ""groupID"" = :groupID,
+                                                ""groupOwned"" = :groupOwned,
+                                                flags = :flags
                                         WHERE ""inventoryID"" = :inventoryID";
 
             string itemName = item.Name;
@@ -529,7 +529,7 @@ namespace OpenSim.Data.PGSQL
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters on update");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index af5a7cd..276a37c 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Data.PGSQL
         /// <param name="migrationStore">migrationStore.</param>
         public void CheckMigration(string migrationStore)
         {
-            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) 
+            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString))
             {
                 connection.Open();
                 Assembly assem = GetType().Assembly;
diff --git a/OpenSim/Data/PGSQL/PGSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs
index 709fde0..749a3f2 100644
--- a/OpenSim/Data/PGSQL/PGSQLMigration.cs
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Data.PGSQL
             {
                 try
                 {
-                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
-                                      " order by version desc limit 1"; //Must be 
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " +
+                                      " order by version desc limit 1"; //Must be
                     using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
                         if (reader.Read())
diff --git a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
index 82e5ed8..a0c3542 100644
--- a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
-         
+
                 ExecuteNonQuery(cmd);
             }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLPresenceData.cs b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
index 0376585..ebbe8d3 100755
--- a/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Data.PGSQL
             PresenceData[] pd = Get("SessionID", sessionID.ToString());
             if (pd.Length == 0)
                 return false;
-                
+
             if (regionID == UUID.Zero)
                 return false;
 
@@ -103,7 +103,7 @@ namespace OpenSim.Data.PGSQL
         public bool VerifyAgent(UUID agentId, UUID secureSessionID)
         {
             PresenceData[] ret = Get("SecureSessionID", secureSessionID.ToString());
-            
+
             if (ret.Length == 0)
                 return false;
 
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index fc352c3..1272e37 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSQLRegionData(string connectionString, string realm) 
+        public PGSQLRegionData(string connectionString, string realm)
         {
             m_Realm = realm;
             m_ConnectionString = connectionString;
@@ -77,7 +77,7 @@ namespace OpenSim.Data.PGSQL
             m_FieldTypes = new Dictionary<string, string>();
 
             string query = string.Format(@"select column_name,data_type
-                        from INFORMATION_SCHEMA.COLUMNS 
+                        from INFORMATION_SCHEMA.COLUMNS
                        where table_name = lower('{0}');
 
                 ", m_Realm);
@@ -107,7 +107,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("regionName", regionName));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
                 return RunCommand(cmd);
@@ -134,7 +134,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
                 cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
                 cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
                 ret = RunCommand(cmd);
@@ -167,7 +167,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("regionID", regionID));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
                 List<RegionData> ret = RunCommand(cmd);
@@ -196,7 +196,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.Parameters.Add(m_database.CreateParameter("startY", qstartY));
                 cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
                 cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
 
@@ -298,7 +298,7 @@ namespace OpenSim.Data.PGSQL
             {
 
                 string update = "update " + m_Realm + " set \"locX\"=:posX, \"locY\"=:posY, \"sizeX\"=:sizeX, \"sizeY\"=:sizeY ";
-                
+
                 foreach (string field in fields)
                 {
 
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 902aae0..33d12bd 100755
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -110,11 +110,11 @@ namespace OpenSim.Data.PGSQL
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
             SceneObjectGroup grp = null;
 
-            string sql = @"SELECT *, 
-                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort 
-                            FROM prims 
-                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID"" 
-                            WHERE ""RegionUUID"" = :RegionUUID 
+            string sql = @"SELECT *,
+                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort
+                            FROM prims
+                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID""
+                            WHERE ""RegionUUID"" = :RegionUUID
                             ORDER BY ""SceneGroupID"" asc, sort asc, ""LinkNumber"" asc";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -146,7 +146,7 @@ namespace OpenSim.Data.PGSQL
                             // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
                             // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
                             // this case, force the UUID to be the same as the group UUID so that at least these can be
-                            // deleted (we need to change the UUID so that any other prims in the linkset can also be 
+                            // deleted (we need to change the UUID so that any other prims in the linkset can also be
                             // deleted).
                             if (sceneObjectPart.UUID != groupID && groupID != UUID.Zero)
                             {
@@ -178,7 +178,7 @@ namespace OpenSim.Data.PGSQL
                 objects[grp.UUID] = grp;
 
             // Instead of attempting to LoadItems on every prim,
-            // most of which probably have no items... get a 
+            // most of which probably have no items... get a
             // list from DB of all prims which have items and
             // LoadItems only on those
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
@@ -331,52 +331,52 @@ namespace OpenSim.Data.PGSQL
         private void StoreSceneObjectPrim(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
         {
             //Big query to update or insert a new prim.
-            
+
             string queryPrims = @"
-        UPDATE prims SET 
-            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName, 
-            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask, 
-            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ, 
-            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX, 
-            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY, 
-            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY, 
-            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW, 
-            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ, 
-            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY, 
-            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID, 
-            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2, 
-            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain, 
-            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX, 
-            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX, 
-            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook, 
-            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice, 
-            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem, 
+        UPDATE prims SET
+            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName,
+            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask,
+            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ,
+            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX,
+            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY,
+            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY,
+            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW,
+            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ,
+            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY,
+            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID,
+            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2,
+            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain,
+            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX,
+            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX,
+            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook,
+            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice,
+            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem,
             ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
             ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
             ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution
         WHERE ""UUID"" = :UUID ;
 
-        INSERT INTO 
+        INSERT INTO
             prims (
             ""UUID"", ""CreationDate"", ""Name"", ""Text"", ""Description"", ""SitName"", ""TouchName"", ""ObjectFlags"", ""OwnerMask"", ""NextOwnerMask"", ""GroupMask"",
-            ""EveryoneMask"", ""BaseMask"", ""PositionX"", ""PositionY"", ""PositionZ"", ""GroupPositionX"", ""GroupPositionY"", ""GroupPositionZ"", ""VelocityX"", 
-            ""VelocityY"", ""VelocityZ"", ""AngularVelocityX"", ""AngularVelocityY"", ""AngularVelocityZ"", ""AccelerationX"", ""AccelerationY"", ""AccelerationZ"", 
-            ""RotationX"", ""RotationY"", ""RotationZ"", ""RotationW"", ""SitTargetOffsetX"", ""SitTargetOffsetY"", ""SitTargetOffsetZ"", ""SitTargetOrientW"", 
-            ""SitTargetOrientX"", ""SitTargetOrientY"", ""SitTargetOrientZ"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"", 
-            ""PayPrice"", ""PayButton1"", ""PayButton2"", ""PayButton3"", ""PayButton4"", ""LoopedSound"", ""LoopedSoundGain"", ""TextureAnimation"", ""OmegaX"", 
-            ""OmegaY"", ""OmegaZ"", ""CameraEyeOffsetX"", ""CameraEyeOffsetY"", ""CameraEyeOffsetZ"", ""CameraAtOffsetX"", ""CameraAtOffsetY"", ""CameraAtOffsetZ"", 
-            ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"", 
+            ""EveryoneMask"", ""BaseMask"", ""PositionX"", ""PositionY"", ""PositionZ"", ""GroupPositionX"", ""GroupPositionY"", ""GroupPositionZ"", ""VelocityX"",
+            ""VelocityY"", ""VelocityZ"", ""AngularVelocityX"", ""AngularVelocityY"", ""AngularVelocityZ"", ""AccelerationX"", ""AccelerationY"", ""AccelerationZ"",
+            ""RotationX"", ""RotationY"", ""RotationZ"", ""RotationW"", ""SitTargetOffsetX"", ""SitTargetOffsetY"", ""SitTargetOffsetZ"", ""SitTargetOrientW"",
+            ""SitTargetOrientX"", ""SitTargetOrientY"", ""SitTargetOrientZ"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"",
+            ""PayPrice"", ""PayButton1"", ""PayButton2"", ""PayButton3"", ""PayButton4"", ""LoopedSound"", ""LoopedSoundGain"", ""TextureAnimation"", ""OmegaX"",
+            ""OmegaY"", ""OmegaZ"", ""CameraEyeOffsetX"", ""CameraEyeOffsetY"", ""CameraEyeOffsetZ"", ""CameraAtOffsetX"", ""CameraAtOffsetY"", ""CameraAtOffsetZ"",
+            ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"",
             ""ParticleSystem"", ""ClickAction"", ""Material"", ""CollisionSound"", ""CollisionSoundVolume"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
             ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution""
-            ) Select 
-            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask, 
-            :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX, 
-            :VelocityY, :VelocityZ, :AngularVelocityX, :AngularVelocityY, :AngularVelocityZ, :AccelerationX, :AccelerationY, :AccelerationZ, 
-            :RotationX, :RotationY, :RotationZ, :RotationW, :SitTargetOffsetX, :SitTargetOffsetY, :SitTargetOffsetZ, :SitTargetOrientW, 
-            :SitTargetOrientX, :SitTargetOrientY, :SitTargetOrientZ, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID, 
-            :PayPrice, :PayButton1, :PayButton2, :PayButton3, :PayButton4, :LoopedSound, :LoopedSoundGain, :TextureAnimation, :OmegaX, 
-            :OmegaY, :OmegaZ, :CameraEyeOffsetX, :CameraEyeOffsetY, :CameraEyeOffsetZ, :CameraAtOffsetX, :CameraAtOffsetY, :CameraAtOffsetZ, 
-            :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA, 
+            ) Select
+            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask,
+            :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX,
+            :VelocityY, :VelocityZ, :AngularVelocityX, :AngularVelocityY, :AngularVelocityZ, :AccelerationX, :AccelerationY, :AccelerationZ,
+            :RotationX, :RotationY, :RotationZ, :RotationW, :SitTargetOffsetX, :SitTargetOffsetY, :SitTargetOffsetZ, :SitTargetOrientW,
+            :SitTargetOrientX, :SitTargetOrientY, :SitTargetOrientZ, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID,
+            :PayPrice, :PayButton1, :PayButton2, :PayButton3, :PayButton4, :LoopedSound, :LoopedSoundGain, :TextureAnimation, :OmegaX,
+            :OmegaY, :OmegaZ, :CameraEyeOffsetX, :CameraEyeOffsetY, :CameraEyeOffsetZ, :CameraAtOffsetX, :CameraAtOffsetY, :CameraAtOffsetZ,
+            :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA,
             :ParticleSystem, :ClickAction, :Material, :CollisionSound, :CollisionSoundVolume, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
             :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution
             where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
@@ -401,26 +401,26 @@ namespace OpenSim.Data.PGSQL
         private void StoreSceneObjectPrimShapes(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
         {
             //Big query to or insert or update primshapes
-            
+
             string queryPrimShapes = @"
-        UPDATE primshapes SET 
-            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin, 
-            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY, 
-            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions, 
-            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin, 
-            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow, 
+        UPDATE primshapes SET
+            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin,
+            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY,
+            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions,
+            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin,
+            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow,
             ""Texture"" = :Texture, ""ExtraParams"" = :ExtraParams, ""State"" = :State, ""Media"" = :Media
         WHERE ""UUID"" = :UUID ;
 
-        INSERT INTO 
+        INSERT INTO
             primshapes (
-            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"", 
-            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"", 
+            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"",
+            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"",
             ""ProfileEnd"", ""ProfileCurve"", ""ProfileHollow"", ""Texture"", ""ExtraParams"", ""State"", ""Media""
-            ) 
+            )
             Select
-            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY, 
-            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin, 
+            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY,
+            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin,
             :ProfileEnd, :ProfileCurve, :ProfileHollow, :Texture, :ExtraParams, :State, :Media
         where not EXISTS (SELECT ""UUID"" FROM primshapes WHERE ""UUID"" = :UUID);
         ";
@@ -500,7 +500,7 @@ namespace OpenSim.Data.PGSQL
             sql =
                 @"INSERT INTO primitems (
             ""itemID"",""primID"",""assetID"",""parentFolderID"",""invType"",""assetType"",""name"",""description"",""creationDate"",""creatorID"",""ownerID"",""lastOwnerID"",""groupID"",
-            ""nextPermissions"",""currentPermissions"",""basePermissions"",""everyonePermissions"",""groupPermissions"",""flags"") 
+            ""nextPermissions"",""currentPermissions"",""basePermissions"",""everyonePermissions"",""groupPermissions"",""flags"")
             VALUES (:itemID,:primID,:assetID,:parentFolderID,:invType,:assetType,:name,:description,:creationDate,:creatorID,:ownerID,
             :lastOwnerID,:groupID,:nextPermissions,:currentPermissions,:basePermissions,:everyonePermissions,:groupPermissions,:flags)";
 
@@ -538,7 +538,7 @@ namespace OpenSim.Data.PGSQL
         {
             TerrainData terrData = null;
 
-            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain 
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain
                             where ""RegionUUID"" = :RegionUUID order by ""Revision"" desc limit 1; ";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -577,7 +577,7 @@ namespace OpenSim.Data.PGSQL
         {
             TerrainData terrData = null;
 
-            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from bakedterrain 
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from bakedterrain
                             where ""RegionUUID"" = :RegionUUID; ";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -1319,7 +1319,7 @@ namespace OpenSim.Data.PGSQL
         {
             {
                 string sql = "DELETE FROM regionenvironment WHERE region_id = :region_id ;";
-                
+
                 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
@@ -1420,17 +1420,17 @@ namespace OpenSim.Data.PGSQL
             {
                 //This method only updates region settings!!! First call LoadRegionSettings to create new region settings in DB
                 sql =
-                   @"UPDATE regionsettings SET block_terraform = :block_terraform ,block_fly = :block_fly ,allow_damage = :allow_damage 
-,restrict_pushing = :restrict_pushing ,allow_land_resell = :allow_land_resell ,allow_land_join_divide = :allow_land_join_divide 
-,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity 
-,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics 
-,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3 
-,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw 
-,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se 
-,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit 
-,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position 
-,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,  
-""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID, 
+                   @"UPDATE regionsettings SET block_terraform = :block_terraform ,block_fly = :block_fly ,allow_damage = :allow_damage
+,restrict_pushing = :restrict_pushing ,allow_land_resell = :allow_land_resell ,allow_land_join_divide = :allow_land_join_divide
+,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity
+,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics
+,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3
+,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
+,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se
+,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit
+,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position
+,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,
+""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID,
 ""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID
  WHERE ""regionUUID"" = :regionUUID";
 
@@ -1465,13 +1465,13 @@ namespace OpenSim.Data.PGSQL
                                 elevation_2_ne,elevation_1_se,elevation_2_se,elevation_1_sw,elevation_2_sw,water_height,terrain_raise_limit,
                                 terrain_lower_limit,use_estate_sun,fixed_sun,sun_position,covenant,covenant_datetime,sunvectorx, sunvectory, sunvectorz,
                                 ""Sandbox"", loaded_creation_datetime, loaded_creation_id
-                                ) 
+                                )
                             VALUES
                                 (:regionUUID,:block_terraform,:block_fly,:allow_damage,:restrict_pushing,:allow_land_resell,:allow_land_join_divide,
                                 :block_show_in_search,:agent_limit,:object_bonus,:maturity,:disable_scripts,:disable_collisions,:disable_physics,
                                 :terrain_texture_1,:terrain_texture_2,:terrain_texture_3,:terrain_texture_4,:elevation_1_nw,:elevation_2_nw,:elevation_1_ne,
                                 :elevation_2_ne,:elevation_1_se,:elevation_2_se,:elevation_1_sw,:elevation_2_sw,:water_height,:terrain_raise_limit,
-                                :terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory, 
+                                :terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory,
                                 :sunvectorz, :Sandbox, :loaded_creation_datetime, :loaded_creation_id )";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -1626,7 +1626,7 @@ namespace OpenSim.Data.PGSQL
             newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
             newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
             newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
-            
+
             newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]);
             newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]);
             newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]);
@@ -1789,7 +1789,7 @@ namespace OpenSim.Data.PGSQL
             if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();             
+                prim.DynAttrs = new DAMap();
 
             prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
             prim.Density = Convert.ToSingle(primRow["Density"]);
@@ -2195,17 +2195,17 @@ namespace OpenSim.Data.PGSQL
 
             parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
             parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
-            
+
             parameters.Add(_Database.CreateParameter("PassTouches", prim.PassTouches));
 
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
-            
+
             if (prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
                 parameters.Add(_Database.CreateParameter("DynAttrs", null));
-            
+
             parameters.Add(_Database.CreateParameter("PhysicsShapeType", prim.PhysicsShapeType));
             parameters.Add(_Database.CreateParameter("Density", (double)prim.Density));
             parameters.Add(_Database.CreateParameter("GravityModifier", (double)prim.GravityModifier));
diff --git a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
index a2b5a2a..64cfff0 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
@@ -42,13 +42,13 @@ namespace OpenSim.Data.PGSQL
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        
+
         public PGSQLUserAccountData(string connectionString, string realm) :
             base(connectionString, realm, "UserAccount")
         {
         }
-        
-        /* 
+
+        /*
         private string m_Realm;
         private List<string> m_ColumnNames = null;
         private PGSQLManager m_database;
@@ -122,7 +122,7 @@ namespace OpenSim.Data.PGSQL
             {
                 cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
                 cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
-                
+
                 conn.Open();
                 using (NpgsqlDataReader result = cmd.ExecuteReader())
                 {
@@ -158,8 +158,8 @@ namespace OpenSim.Data.PGSQL
             }
             return null;
         }
-        
-        
+
+
         public override bool Store(UserAccountData data)
         {
             if (data.Data.ContainsKey("PrincipalID"))
@@ -214,7 +214,7 @@ namespace OpenSim.Data.PGSQL
                 catch (Exception e){
                     m_log.ErrorFormat("[USER]: ERROR opened update user {0} ", e.Message);
                 }
-                
+
 
                 if (conta < 1)
                 {
@@ -242,14 +242,14 @@ namespace OpenSim.Data.PGSQL
             }
             return true;
         }
-        
+
 
         public bool Store(UserAccountData data, UUID principalID, string token)
         {
             return false;
         }
 
-        
+
         public bool SetDataItem(UUID principalID, string item, string value)
         {
             string sql = string.Format(@"update {0} set {1} = :{1} where ""UUID"" = :UUID", m_Realm, item);
@@ -299,7 +299,7 @@ namespace OpenSim.Data.PGSQL
 
             string sql = "";
             UUID scope_id;
-            UUID.TryParse(scopeID.ToString(), out scope_id); 
+            UUID.TryParse(scopeID.ToString(), out scope_id);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand())
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index f166976..75a51e2 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -412,15 +412,15 @@ namespace OpenSim.Data.PGSQL
             query = @"WITH upsert AS (
                         UPDATE userpicks SET
                             pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId,
-                            name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, 
-                            originalname = :Original, simname = :SimName, posglobal = :GlobalPos, 
-                            sortorder = :SortOrder, enabled = :Enabled 
-                        RETURNING * ) 
+                            name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User,
+                            originalname = :Original, simname = :SimName, posglobal = :GlobalPos,
+                            sortorder = :SortOrder, enabled = :Enabled
+                        RETURNING * )
                       INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description,
-                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) 
+                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled)
                       SELECT
                             :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User,
-                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled 
+                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled
                       WHERE NOT EXISTS (
                         SELECT * FROM upsert )";
 
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
index d3518cf..6e88489 100644
--- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(
                         @"SELECT name, description, access_time, ""AssetType"", local, temporary, asset_flags, creatorid, data
-                            FROM XAssetsMeta 
+                            FROM XAssetsMeta
                             JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
                         dbcon))
                     {
@@ -179,7 +179,7 @@ namespace OpenSim.Data.PGSQL
                                             WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
     //                                        int compressedLength = asset.Data.Length;
                                             asset.Data = outputStream.ToArray();
-    
+
     //                                        m_log.DebugFormat(
     //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
     //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
@@ -223,16 +223,16 @@ namespace OpenSim.Data.PGSQL
                         {
                             assetName = asset.Name.Substring(0, 64);
                             m_log.WarnFormat(
-                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                                 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                         }
-    
+
                         string assetDescription = asset.Description;
                         if (asset.Description.Length > 64)
                         {
                             assetDescription = asset.Description.Substring(0, 64);
                             m_log.WarnFormat(
-                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                                 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                         }
 
@@ -268,8 +268,8 @@ namespace OpenSim.Data.PGSQL
                                         where not exists( Select id from XAssetsMeta where id = :ID);
 
                                       update XAssetsMeta
-                                          set id = :ID, hash = :Hash, name = :Name, description = :Description, 
-                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime, 
+                                          set id = :ID, hash = :Hash, name = :Name, description = :Description,
+                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime,
                                               access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID
                                         where id = :ID;
                                      ",
@@ -321,13 +321,13 @@ namespace OpenSim.Data.PGSQL
                             {
                                 m_log.ErrorFormat("[XASSET DB]: PGSQL failure creating asset data {0} with name \"{1}\". Error: {2}",
                                     asset.FullID, asset.Name, e.Message);
-    
+
                                 transaction.Rollback();
-    
+
                                 return;
                             }
                         }
-    
+
                         transaction.Commit();
                     }
                 }
@@ -374,7 +374,7 @@ namespace OpenSim.Data.PGSQL
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}", 
+                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}",
                             assetMetadata.ID, assetMetadata.Name, e.Message);
                     }
                 }
@@ -519,7 +519,7 @@ namespace OpenSim.Data.PGSQL
                 {
                     dbcon.Open();
                     using(NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
-                                            FROM XAssetsMeta 
+                                            FROM XAssetsMeta
                                             LIMIT :start, :count",dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("start",start));
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index 959c2cf..55a1996 100644
--- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -197,16 +197,16 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
 /*
-                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
-                                 from inventoryitems 
-                                 where ""avatarID"" = :PrincipalID 
-                                   and ""assetID"" = :AssetID 
+                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions""
+                                 from inventoryitems
+                                 where ""avatarID"" = :PrincipalID
+                                   and ""assetID"" = :AssetID
                                  group by ""assetID"" ", m_Realm);
 */
-                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
-                                 from inventoryitems 
+                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions""
+                                 from inventoryitems
                                  where ""avatarID""::uuid = :PrincipalID
-                                   and ""assetID"" = :AssetID 
+                                   and ""assetID"" = :AssetID
                                  group by ""assetID"" ");
 
                     cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 9c2bd2e..966d0b8 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Data.SQLite
             {
                 assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Name, asset.ID, asset.Name.Length, assetName.Length);
             }
 
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
             {
                 assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
 
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 0428c11..8fb955c 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.SQLite
     public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private string m_Realm;
         private List<string> m_ColumnNames;
         private int m_LastExpire;
@@ -223,7 +223,7 @@ namespace OpenSim.Data.SQLite
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
+            using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() +
                 "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))"))
             {
                 if (ExecuteNonQuery(cmd, m_Connection) > 0)
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
+            using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() +
                 " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"))
             {
                 if (ExecuteNonQuery(cmd, m_Connection) > 0)
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index d51f2d4..0fcab21 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
             IDataReader r = null;
 
             using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {            
+            {
                 names.Remove("EstateID");
 
                 string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
@@ -386,15 +386,15 @@ namespace OpenSim.Data.SQLite
                 return DoLoad(cmd, UUID.Zero, false);
             }
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> estateSettings = new List<EstateSettings>();
-            
+
             List<int> estateIds = GetEstatesAll();
             foreach (int estateId in estateIds)
                 estateSettings.Add(LoadEstateSettings(estateId));
-            
+
             return estateSettings;
         }
 
@@ -421,7 +421,7 @@ namespace OpenSim.Data.SQLite
 
             return result;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
@@ -442,7 +442,7 @@ namespace OpenSim.Data.SQLite
             }
             r.Close();
 
-            return result;            
+            return result;
         }
 
         public List<int> GetEstatesByOwner(UUID ownerID)
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 9fbeb10..a4b84b1 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Data.SQLite
                         m_Fields[name].SetValue(row, reader[name]);
                     }
                 }
-                
+
                 if (m_DataField != null)
                 {
                     Dictionary<string, string> data =
@@ -268,7 +268,7 @@ namespace OpenSim.Data.SQLite
         public virtual bool Delete(string field, string key)
         {
             return Delete(new string[] { field }, new string[] { key });
-        }        
+        }
 
         public virtual bool Delete(string[] fields, string[] keys)
         {
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index d8c52f8..987240c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.SQLite
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public SQLiteGridUserData(string connectionString, string realm) 
+        public SQLiteGridUserData(string connectionString, string realm)
             : base(connectionString, realm, "GridUserStore") {}
 
         public new GridUserData Get(string userID)
diff --git a/OpenSim/Data/SQLite/SQLiteHGTravelData.cs b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
index db288b2..dd34710 100644
--- a/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
+++ b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public SQLiteHGTravelData(string connectionString, string realm) 
+        public SQLiteHGTravelData(string connectionString, string realm)
             : base(connectionString, realm, "HGTravelStore") {}
 
         public HGTravelingData Get(UUID sessionID)
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 5cfc202..eec386f 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -707,7 +707,7 @@ namespace OpenSim.Data.SQLite
                 DataRow[] primsForRegion = prims.Select(byRegion);
 //                m_log.Info("[SQLITE REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
 
-                // First, create all groups 
+                // First, create all groups
                 foreach (DataRow primRow in primsForRegion)
                 {
                     try
@@ -733,12 +733,12 @@ namespace OpenSim.Data.SQLite
                             }
 
                             SceneObjectGroup group = new SceneObjectGroup(prim);
-                            
+
                             createdObjects.Add(group.UUID, group);
                             retvals.Add(group);
                             LoadItems(prim);
 
-                           
+
                         }
                     }
                     catch (Exception e)
@@ -1298,7 +1298,7 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "VolumeDetect", typeof(Int16));
 
             createCol(prims, "MediaURL", typeof(String));
-            
+
             createCol(prims, "AttachedPosX", typeof(Double));
             createCol(prims, "AttachedPosY", typeof(Double));
             createCol(prims, "AttachedPosZ", typeof(Double));
@@ -1795,7 +1795,7 @@ namespace OpenSim.Data.SQLite
 //                m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
                 prim.MediaUrl = (string)row["MediaURL"];
             }
-            
+
             prim.AttachedPos = new Vector3(
                 Convert.ToSingle(row["AttachedPosX"]),
                 Convert.ToSingle(row["AttachedPosY"]),
@@ -1806,7 +1806,7 @@ namespace OpenSim.Data.SQLite
             {
                 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
-            }   
+            }
             else
             {
                 prim.DynAttrs = new DAMap();
@@ -1818,7 +1818,7 @@ namespace OpenSim.Data.SQLite
             prim.Friction = Convert.ToSingle(row["Friction"]);
             prim.Restitution = Convert.ToSingle(row["Restitution"]);
 
-            
+
             if (!(row["KeyframeMotion"] is DBNull))
             {
                 Byte[] data = (byte[])row["KeyframeMotion"];
@@ -2532,7 +2532,7 @@ namespace OpenSim.Data.SQLite
 
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
-                        
+
             return s;
         }
 
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index 91d62ce..1b79185 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Data.SQLite
                 }
                 else
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')",
                         m_Realm, scopeID.ToString(), words[0], words[1]);
                 }
 
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 2dfdba3..13aac79 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -46,43 +46,43 @@ namespace OpenSim.Data.SQLite
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private SqliteConnection m_connection;
         private string m_connectionString;
-        
+
         private Dictionary<string, FieldInfo> m_FieldMap =
             new Dictionary<string, FieldInfo>();
-        
+
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
-        
+
         public SQLiteUserProfilesData()
         {
         }
-        
+
         public SQLiteUserProfilesData(string connectionString)
         {
             Initialise(connectionString);
         }
-        
+
         public void Initialise(string connectionString)
         {
             if (Util.IsWindows())
                 Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-            
+
             m_connectionString = connectionString;
-            
+
             m_log.Info("[PROFILES_DATA]: Sqlite - connecting: "+m_connectionString);
-            
+
             m_connection = new SqliteConnection(m_connectionString);
             m_connection.Open();
-            
+
             Migration m = new Migration(m_connection, Assembly, "UserProfiles");
             m.Update();
         }
-        
+
         private string[] FieldList
         {
             get { return new List<string>(m_FieldMap.Keys).ToArray(); }
@@ -123,7 +123,7 @@ namespace OpenSim.Data.SQLite
             }
 
             reader.Close();
-            
+
             return data;
         }
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
@@ -162,21 +162,21 @@ namespace OpenSim.Data.SQLite
             query += ":ParcelName,";
             query += ":Flags,";
             query += ":ListingPrice ) ";
-            
+
             if(string.IsNullOrEmpty(ad.ParcelName))
                 ad.ParcelName = "Unknown";
             if(ad.ParcelId == null)
                 ad.ParcelId = UUID.Zero;
             if(string.IsNullOrEmpty(ad.Description))
                 ad.Description = "No Description";
-            
+
             DateTime epoch = new DateTime(1970, 1, 1);
             DateTime now = DateTime.Now;
             TimeSpan epochnow = now - epoch;
             TimeSpan duration;
             DateTime expiration;
             TimeSpan epochexp;
-            
+
             if(ad.Flags == 2)
             {
                 duration = new TimeSpan(7,0,0,0);
@@ -211,7 +211,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":ParcelName", ad.ParcelName.ToString());
                     cmd.Parameters.AddWithValue(":Flags", ad.Flags.ToString());
                     cmd.Parameters.AddWithValue(":ListingPrice", ad.Price.ToString ());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -227,17 +227,17 @@ namespace OpenSim.Data.SQLite
         public bool DeleteClassifiedRecord(UUID recordId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM classifieds WHERE ";
             query += "classifieduuid = :ClasifiedId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":ClassifiedId", recordId.ToString());
- 
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -254,17 +254,17 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM classifieds WHERE ";
             query += "classifieduuid = :AdId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":AdId", ad.ClassifiedId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
                         if(reader.Read ())
@@ -299,24 +299,24 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
             query += "creatoruuid = :Id";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
                         while (reader.Read())
                         {
                             OSDMap record = new OSDMap();
-                            
+
                             record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
                             record.Add("name",OSD.FromString((string)reader["name"]));
                             data.Add(record);
@@ -336,11 +336,11 @@ namespace OpenSim.Data.SQLite
             IDataReader reader = null;
             string query = string.Empty;
             UserProfilePick pick = new UserProfilePick();
-            
+
             query += "SELECT * FROM userpicks WHERE ";
             query += "creatoruuid = :CreatorId AND ";
             query += "pickuuid =  :PickId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -348,17 +348,17 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":CreatorId", avatarId.ToString());
                     cmd.Parameters.AddWithValue(":PickId", pickId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
-                        
+
                         while (reader.Read())
                         {
                             string description = (string)reader["description"];
-                            
+
                             if (string.IsNullOrEmpty(description))
                                 description = "No description given.";
-                            
+
                             UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
                             UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
                             UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
@@ -385,7 +385,7 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdatePicksRecord(UserProfilePick pick)
-        {      
+        {
             string query = string.Empty;
 
             query += "INSERT OR REPLACE INTO userpicks (";
@@ -416,7 +416,7 @@ namespace OpenSim.Data.SQLite
             query += ":GlobalPos,";
             query += ":SortOrder,";
             query += ":Enabled) ";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -456,10 +456,10 @@ namespace OpenSim.Data.SQLite
         public bool DeletePicksRecord(UUID pickId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM userpicks WHERE ";
             query += "pickuuid = :PickId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -479,15 +479,15 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool GetAvatarNotes(ref UserProfileNotes notes)
-        {  
+        {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT `notes` FROM usernotes WHERE ";
             query += "useruuid = :Id AND ";
             query += "targetuuid = :TargetId";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -495,7 +495,7 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", notes.UserId.ToString());
                     cmd.Parameters.AddWithValue(":TargetId", notes.TargetId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         while (reader.Read())
@@ -514,10 +514,10 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
-        {          
+        {
             string query = string.Empty;
             bool remove;
-            
+
             if(string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
                 query += ":TargetId,";
                 query += ":Notes )";
             }
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -544,7 +544,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.AddWithValue(":Notes", note.Notes);
                     cmd.Parameters.AddWithValue(":TargetId", note.TargetId.ToString ());
                     cmd.Parameters.AddWithValue(":UserId", note.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -561,7 +561,7 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM userprofile WHERE ";
             query += "useruuid = :Id";
 
@@ -569,7 +569,7 @@ namespace OpenSim.Data.SQLite
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
-                    
+
 
                     try
                     {
@@ -611,7 +611,7 @@ namespace OpenSim.Data.SQLite
                             props.Language = string.Empty;
                             props.PublishProfile = false;
                             props.PublishMature = false;
-                            
+
                             query = "INSERT INTO userprofile (";
                             query += "useruuid, ";
                             query += "profilePartner, ";
@@ -659,7 +659,7 @@ namespace OpenSim.Data.SQLite
                                 put.Parameters.AddWithValue(":profileAboutText", props.AboutText);
                                 put.Parameters.AddWithValue(":profileFirstImage", props.FirstLifeImageId.ToString());
                                 put.Parameters.AddWithValue(":profileFirstText", props.FirstLifeText);
-                                
+
                                 put.ExecuteNonQuery();
                             }
                         }
@@ -668,9 +668,9 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
-        {           
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileURL=:profileURL, ";
             query += "profileImage=:image, ";
@@ -678,7 +678,7 @@ namespace OpenSim.Data.SQLite
             query += "profileFirstImage=:firstlifeimage,";
             query += "profileFirstText=:firstlifetext ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -690,7 +690,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":firstlifeimage", props.FirstLifeImageId.ToString());
                     cmd.Parameters.AddWithValue(":firstlifetext", props.FirstLifeText);
                     cmd.Parameters.AddWithValue(":uuid", props.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -698,16 +698,16 @@ namespace OpenSim.Data.SQLite
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+
                 return false;
             }
             return true;
         }
 
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
-        {         
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileWantToMask=:WantMask, ";
             query += "profileWantToText=:WantText,";
@@ -715,7 +715,7 @@ namespace OpenSim.Data.SQLite
             query += "profileSkillsText=:SkillsText, ";
             query += "profileLanguages=:Languages ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -727,7 +727,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":SkillsText", up.SkillsText);
                     cmd.Parameters.AddWithValue(":Languages", up.Language);
                     cmd.Parameters.AddWithValue(":uuid", up.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -741,17 +741,17 @@ namespace OpenSim.Data.SQLite
             return true;
         }
 
- 
+
         public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
-        {           
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible, ";
             query += "email=:EMail ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -761,7 +761,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":Visible", pref.Visible);
                     cmd.Parameters.AddWithValue(":EMail", pref.EMail);
                     cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
-                        
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -779,20 +779,20 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT imviaemail,visible,email FROM ";
             query += "usersettings WHERE ";
             query += "useruuid = :Id";
-            
+
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
-                        
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -805,13 +805,13 @@ namespace OpenSim.Data.SQLite
                          {
                             query = "INSERT INTO usersettings VALUES ";
                             query += "(:Id,'false','false', :Email)";
-                            
+
                             using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
                             {
                                 put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
                                 put.Parameters.AddWithValue(":Email", pref.EMail);
                                 put.ExecuteNonQuery();
-                                    
+
                             }
                         }
                     }
@@ -831,11 +831,11 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM `userdata` WHERE ";
             query += "UserId = :Id AND ";
             query += "TagId = :TagId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -843,7 +843,7 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
                     cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -858,7 +858,7 @@ namespace OpenSim.Data.SQLite
                             query += ":TagId,";
                             query += ":DataKey,";
                             query +=  ":DataVal) ";
-                            
+
                             using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
                             {
                                 put.Parameters.AddWithValue(":Id", props.UserId.ToString());
@@ -882,16 +882,16 @@ namespace OpenSim.Data.SQLite
             return true;
         }
         public bool SetUserAppData(UserAppData props, ref string result)
-        {         
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userdata SET ";
             query += "TagId = :TagId, ";
             query += "DataKey = :DataKey, ";
             query += "DataVal = :DataVal WHERE ";
             query += "UserId = :UserId AND ";
             query += "TagId = :TagId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -918,17 +918,17 @@ namespace OpenSim.Data.SQLite
             IDataReader reader = null;
             OSDArray data = new OSDArray();
             string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = :Id";
-            
+
             // Get classified image assets
-            
-            
+
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         while(reader.Read())
@@ -942,7 +942,7 @@ namespace OpenSim.Data.SQLite
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -951,14 +951,14 @@ namespace OpenSim.Data.SQLite
                         }
                     }
                 }
-                    
+
                 query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = :Id";
-                
+
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index ca5861f..1218ebb 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.SQLite
          **********************************************************************/
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="dt"></param>
         /// <param name="name"></param>
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="dt">Data Table</param>
         /// <returns></returns>
@@ -191,7 +191,7 @@ namespace OpenSim.Data.SQLite
         /// lines for defining SqliteParameters to 2 parameters:
         /// column name and database type.
         /// </para>
-        /// 
+        ///
         /// <para>
         /// It assumes certain conventions like :param as the param
         /// name to replace in parametrized queries, and that source
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 2a0a8f6..7f44a65 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Data.SQLite
         public bool DeleteItems(string[] fields, string[] vals)
         {
             return m_Items.Delete(fields, vals);
-        }        
+        }
 
         public bool MoveItem(string id, string newParent)
         {
@@ -302,7 +302,7 @@ namespace OpenSim.Data.SQLite
         {
 //            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
-            
+
             using (SqliteCommand cmd = new SqliteCommand())
             {
                 cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = ?folderID";
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index 5982a09..70880cf 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.Tests
         public void T010_StoreReadVerifyAssets()
         {
             TestHelpers.InMethod();
-            
+
             AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
             AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
             AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3.ToString());
@@ -128,7 +128,7 @@ namespace OpenSim.Data.Tests
             a1.UploadAttempts = 0;
             a2.UploadAttempts = 0;
             a3.UploadAttempts = 0;
-            
+
             AssetBase a1a = m_db.GetAsset(uuid1);
             a1a.UploadAttempts = 0;
             Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
@@ -190,7 +190,7 @@ namespace OpenSim.Data.Tests
         public void T020_CheckForWeirdCreatorID()
         {
             TestHelpers.InMethod();
-            
+
             // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
             // rather than a valid UUID (?).  This test is to make sure that the database layer does not
             // attempt to convert CreatorID to GUID, but just passes it both ways as a string.
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index acfebd0..79691e4 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -41,11 +41,11 @@ using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
-    /// <summary>This is a base class for testing any Data service for any DBMS. 
+    /// <summary>This is a base class for testing any Data service for any DBMS.
     /// Requires NUnit 2.5 or better (to support the generics).
     /// </summary>
     /// <remarks>
-    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with 
+    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with
     /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
     /// and similar on EstateTests, InventoryTests and RegionTests.
     /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts.
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests
         private TService m_service;
         private string m_file;
 
-        // TODO: Is this in the right place here? 
+        // TODO: Is this in the right place here?
         // Later:  apparently it's not, but does it matter here?
 //        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -68,7 +68,7 @@ namespace OpenSim.Data.Tests
 
         public BasicDataServiceTest()
             : this("")
-        { 
+        {
         }
 
         public BasicDataServiceTest(string conn)
@@ -226,7 +226,7 @@ namespace OpenSim.Data.Tests
             }
         }
 
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
         /// </summary>
         /// <param name="tables"></param>
         protected virtual void ResetMigrations(params string[] stores)
@@ -251,7 +251,7 @@ namespace OpenSim.Data.Tests
             }
         }
 
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
         /// </summary>
         /// <param name="tables"></param>
         protected virtual void ClearTables(params string[] tables)
diff --git a/OpenSim/Data/Tests/DefaultTestConns.cs b/OpenSim/Data/Tests/DefaultTestConns.cs
index 7c47bdd..5ad238b 100644
--- a/OpenSim/Data/Tests/DefaultTestConns.cs
+++ b/OpenSim/Data/Tests/DefaultTestConns.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Data.Tests
     /// a connection string for testing one of the supported databases.
     /// The connections must be in the section [TestConnections] with names matching the connection class
     /// name for the specific database, e.g.:
-    /// 
+    ///
     /// [TestConnections]
     /// MySqlConnection="..."
     /// SqlConnection="..."
     /// SqliteConnection="..."
-    /// 
+    ///
     /// Note that the conn string may also be set explicitly in the [TestCase()] attribute of test classes
     /// based on BasicDataServiceTest.cs.
     /// </summary>
-    
+
     static class DefaultTestConns
     {
         private static Dictionary<Type, string> conns = new Dictionary<Type, string>();
@@ -63,8 +63,8 @@ namespace OpenSim.Data.Tests
             Assembly asm = Assembly.GetExecutingAssembly();
             string sType = connType.Name;
 
-            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get 
-            // to the INI file? Ok, so put it into the resources! 
+            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get
+            // to the INI file? Ok, so put it into the resources!
             // string iniName = Path.Combine(Path.GetDirectoryName(asm.Location), "TestDataConnections.ini");
 
             string[] allres = asm.GetManifestResourceNames();
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index e2b2d12..cf3f2b4 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Data.Tests
         public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MIN,
@@ -133,7 +133,7 @@ namespace OpenSim.Data.Tests
         public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MAX(64),
@@ -166,7 +166,7 @@ namespace OpenSim.Data.Tests
         public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MAX(1),
@@ -199,7 +199,7 @@ namespace OpenSim.Data.Tests
         public void T012_EstateSettingsRandomStorage()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
             new PropertyScrambler<EstateSettings>()
@@ -220,7 +220,7 @@ namespace OpenSim.Data.Tests
         public void T020_EstateSettingsManagerList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -241,7 +241,7 @@ namespace OpenSim.Data.Tests
         public void T021_EstateSettingsUserList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -262,7 +262,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsGroupList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -283,7 +283,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsBanList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -310,7 +310,7 @@ namespace OpenSim.Data.Tests
 
         #endregion
 
-        #region Parametrizable Test Implementations 
+        #region Parametrizable Test Implementations
 
         private void EstateSettingsSimpleStorage(
             UUID regionId,
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index e4ec5c1..da6e7d4 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.Tests
 {
     [TestFixture(Description = "Inventory store tests (MySQL)")]
     public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData>
-    { 
+    {
     }
 
     public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
@@ -102,7 +102,7 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryFolder(folder1), Is.Null);
             Assert.That(db.getInventoryFolder(folder2), Is.Null);
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
         public void T010_FolderNonParent()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
             // the folder will go in
             db.addInventoryFolder(f1);
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Tests
         public void T011_FolderCreate()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
             // TODO: this is probably wrong behavior, but is what we have
             // db.updateInventoryFolder(f1);
@@ -159,7 +159,7 @@ namespace OpenSim.Data.Tests
         public void T012_FolderList()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
             db.addInventoryFolder(f2);
 
@@ -175,7 +175,7 @@ namespace OpenSim.Data.Tests
         public void T013_FolderHierarchy()
         {
             TestHelpers.InMethod();
-            
+
             int n = db.getFolderHierarchy(zero).Count;  // (for dbg - easier to see what's returned)
             Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
             n = db.getFolderHierarchy(folder1).Count;
@@ -190,7 +190,7 @@ namespace OpenSim.Data.Tests
         public void T014_MoveFolder()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f2 = db.getInventoryFolder(folder2);
             f2.ParentID = folder3;
             db.moveInventoryFolder(f2);
@@ -206,7 +206,7 @@ namespace OpenSim.Data.Tests
         public void T015_FolderHierarchy()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
             Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
@@ -219,7 +219,7 @@ namespace OpenSim.Data.Tests
         public void T100_NoItems()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
             Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))");
@@ -233,7 +233,7 @@ namespace OpenSim.Data.Tests
         public void T101_CreatItems()
         {
             TestHelpers.InMethod();
-            
+
             db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
             db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
             db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
@@ -244,7 +244,7 @@ namespace OpenSim.Data.Tests
         public void T102_CompareItems()
         {
             TestHelpers.InMethod();
-            
+
             InventoryItemBase i1 = db.getInventoryItem(item1);
             InventoryItemBase i2 = db.getInventoryItem(item2);
             InventoryItemBase i3 = db.getInventoryItem(item3);
@@ -263,7 +263,7 @@ namespace OpenSim.Data.Tests
         public void T103_UpdateItem()
         {
             TestHelpers.InMethod();
-            
+
             // TODO: probably shouldn't have the ability to have an
             // owner of an item in a folder not owned by the user
 
@@ -283,7 +283,7 @@ namespace OpenSim.Data.Tests
         public void T104_RandomUpdateItem()
         {
             TestHelpers.InMethod();
-            
+
             PropertyScrambler<InventoryFolderBase> folderScrambler =
                 new PropertyScrambler<InventoryFolderBase>()
                     .DontScramble(x => x.Owner)
@@ -342,7 +342,7 @@ namespace OpenSim.Data.Tests
         public void T999_StillNull()
         {
             TestHelpers.InMethod();
-            
+
             // After all tests are run, these should still return no results
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryItem(zero), Is.Null);
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs
index e0f5862..0d291df 100644
--- a/OpenSim/Data/Tests/PropertyScrambler.cs
+++ b/OpenSim/Data/Tests/PropertyScrambler.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests
     public class PropertyScrambler<T>
     {
         readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>();
-        
+
         private void AddExpressionToNotScrableList(Expression expression)
         {
             UnaryExpression unaryExpression = expression as UnaryExpression;
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index e1503d0..4f81594 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Data.Tests
         public UUID item3 = UUID.Random();
 
         public static Random random = new Random();
-        
+
         public string itemname1 = "item1";
 
         public uint localID = 1;
@@ -111,10 +111,10 @@ namespace OpenSim.Data.Tests
 
         private void ClearDB()
         {
-            string[] reg_tables = new string[] { 
-                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings" 
+            string[] reg_tables = new string[] {
+                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings"
             };
-            
+
             if (m_rebuildDB)
             {
                 DropTables(reg_tables);
@@ -145,7 +145,7 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
             List<LandData> land = db.LoadLandObjects(region1);
@@ -154,21 +154,21 @@ namespace OpenSim.Data.Tests
             Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
             Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
         }
-        
+
         // SOG round trips
         //  * store objects, make sure they save
-        //  * update 
+        //  * update
 
         [Test]
         public void T010_StoreSimpleObject()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = NewSOG("object1", prim1, region1);
             SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
 
             // in case the objects don't store
-            try 
+            try
             {
                 db.StoreObject(sog, region1);
             }
@@ -177,8 +177,8 @@ namespace OpenSim.Data.Tests
                 m_log.Error(e.ToString());
                 Assert.Fail();
             }
-                    
-            try 
+
+            try
             {
                 db.StoreObject(sog2, region1);
             }
@@ -190,15 +190,15 @@ namespace OpenSim.Data.Tests
 
             // This tests the ADO.NET driver
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
-            
+
             Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
         }
-        
+
         [Test]
         public void T011_ObjectNames()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             foreach (SceneObjectGroup sog in objs)
             {
@@ -207,12 +207,12 @@ namespace OpenSim.Data.Tests
                 Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
             }
         }
-        
+
         [Test]
         public void T012_SceneParts()
         {
             TestHelpers.InMethod();
-            
+
             UUID tmp0 = UUID.Random();
             UUID tmp1 = UUID.Random();
             UUID tmp2 = UUID.Random();
@@ -225,10 +225,10 @@ namespace OpenSim.Data.Tests
             sog.AddPart(p1);
             sog.AddPart(p2);
             sog.AddPart(p3);
-            
+
             SceneObjectPart[] parts = sog.Parts;
             Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
-            
+
             db.StoreObject(sog, newregion);
             List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
             Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
@@ -236,18 +236,18 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
-            
+
             Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
             Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
             Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
             Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
         }
-        
+
         [Test]
         public void T013_DatabasePersistency()
         {
             TestHelpers.InMethod();
-            
+
             // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
             // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
             // The ObjectFlags is an exception, if it is entered incorrectly, the object IS REJECTED on the database silently.
@@ -298,7 +298,7 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart sop = new SceneObjectPart();
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            
+
             sop.RegionHandle = regionh;
             sop.UUID = uuid;
             sop.LocalId = localid;
@@ -360,10 +360,10 @@ namespace OpenSim.Data.Tests
             Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
             Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
             Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
-            
+
             // This is necessary or object will not be inserted in DB
             sop.Flags = PrimFlags.None;
-            
+
             // Inserts group in DB
             db.StoreObject(sog,region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
@@ -372,7 +372,7 @@ namespace OpenSim.Data.Tests
             db.StoreObject(sog,region3);
             sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-                
+
 
             // Tests if the parameters were inserted correctly
             SceneObjectPart p = sogs[0].RootPart;
@@ -414,12 +414,12 @@ namespace OpenSim.Data.Tests
             Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
             Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
         }
-        
+
         [Test]
         public void T014_UpdateObject()
         {
             TestHelpers.InMethod();
-            
+
             string text1 = "object1 text";
             SceneObjectGroup sog = FindSOG("object1", region1);
             sog.RootPart.Text = text1;
@@ -459,7 +459,7 @@ namespace OpenSim.Data.Tests
             PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
             pbshap = PrimitiveBaseShape.Default;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            
+
             // Updates the region with new values
             SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
             Assert.That(sog2,Is.Not.Null);
@@ -488,11 +488,11 @@ namespace OpenSim.Data.Tests
             sog2.RootPart.LinkNum = linknum;
             sog2.RootPart.ClickAction = clickaction;
             sog2.RootPart.Scale = scale;
-            
+
             db.StoreObject(sog2, region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-            
+
             SceneObjectGroup retsog = FindSOG("West  Adam", region3);
             Assert.That(retsog,Is.Not.Null);
             SceneObjectPart p = retsog.RootPart;
@@ -519,7 +519,7 @@ namespace OpenSim.Data.Tests
             Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
             Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
         }
-                
+
         /// <summary>
         /// Test storage and retrieval of a scene object with a large number of parts.
         /// </summary>
@@ -527,12 +527,12 @@ namespace OpenSim.Data.Tests
         public void T015_LargeSceneObjects()
         {
             TestHelpers.InMethod();
-            
+
             UUID id = UUID.Random();
             Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
             SceneObjectGroup sog = NewSOG("Test SOG", id, region4);
             mydic.Add(sog.RootPart.UUID,sog.RootPart);
-            for (int i = 0; i < 30; i++) 
+            for (int i = 0; i < 30; i++)
             {
                 UUID tmp = UUID.Random();
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
@@ -542,20 +542,20 @@ namespace OpenSim.Data.Tests
                 Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
-                
+
                 sop.GroupPosition = groupos;
                 sop.RotationOffset = rotoff;
                 sop.OffsetPosition = offset;
                 sop.Velocity = velocity;
                 sop.AngularVelocity = angvelo;
                 sop.Acceleration = accel;
-                
+
                 mydic.Add(tmp,sop);
-                sog.AddPart(sop);                
+                sog.AddPart(sop);
             }
-            
+
             db.StoreObject(sog, region4);
-            
+
             SceneObjectGroup retsog = FindSOG("Test SOG", region4);
             SceneObjectPart[] parts = retsog.Parts;
             for (int i = 0; i < 30; i++)
@@ -574,7 +574,7 @@ namespace OpenSim.Data.Tests
         public void T016_RandomSogWithSceneParts()
         {
             TestHelpers.InMethod();
-            
+
             PropertyScrambler<SceneObjectPart> scrambler =
                 new PropertyScrambler<SceneObjectPart>()
                     .DontScramble(x => x.UUID);
@@ -634,22 +634,22 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = FindSOG(name, region1);
             if (sog == null)
             {
-                sog = NewSOG(name, prim1, region1); 
+                sog = NewSOG(name, prim1, region1);
                 db.StoreObject(sog, region1);
             }
             return sog;
         }
-        
+
         // NOTE: it is a bad practice to rely on some of the previous tests having been run before.
         // If the tests are run manually, one at a time, each starts with full class init (DB cleared).
         // Even when all tests are run, NUnit 2.5+ no longer guarantee a specific test order.
         // We shouldn't expect to find anything in the DB if we haven't put it there *in the same test*!
-        
+
         [Test]
         public void T020_PrimInventoryEmpty()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
@@ -673,14 +673,14 @@ namespace OpenSim.Data.Tests
         public void T021_PrimInventoryBasic()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
-            
+
             StoreInventory(sog);
 
             SceneObjectGroup sog1 = FindSOG("object1", region1);
@@ -708,12 +708,12 @@ namespace OpenSim.Data.Tests
             t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
         }
-        
+
         [Test]
         public void T025_PrimInventoryPersistency()
         {
             TestHelpers.InMethod();
-            
+
             InventoryItemBase i = new InventoryItemBase();
             UUID id = UUID.Random();
             i.ID = id;
@@ -752,11 +752,11 @@ namespace OpenSim.Data.Tests
             i.Flags = flags;
             int creationd = random.Next();
             i.CreationDate = creationd;
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
-            
+
             Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
             Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
             Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
@@ -780,13 +780,13 @@ namespace OpenSim.Data.Tests
             Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
             Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
         }
-        
+
         [Test]
         [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
             TestHelpers.InMethod();
-            
+
             UUID i1,i2,i3,i4;
             i1 = UUID.Random();
             i2 = UUID.Random();
@@ -796,14 +796,14 @@ namespace OpenSim.Data.Tests
             InventoryItemBase ib2 = NewItem(i2, zero, zero, RandomName(), zero);
             InventoryItemBase ib3 = NewItem(i3, zero, zero, RandomName(), zero);
             InventoryItemBase ib4 = NewItem(i4, zero, zero, RandomName(), zero);
-            
+
             SceneObjectGroup sog = FindSOG("object1", region1);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib1, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib2, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib3, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib4, zero), Is.True);
-            
+
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
             Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
             TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
@@ -818,7 +818,7 @@ namespace OpenSim.Data.Tests
         public void T052_RemoveObject()
         {
             TestHelpers.InMethod();
-            
+
             db.RemoveObject(prim1, region1);
             SceneObjectGroup sog = FindSOG("object1", region1);
             Assert.That(sog, Is.Null);
@@ -828,7 +828,7 @@ namespace OpenSim.Data.Tests
         public void T100_DefaultRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             RegionSettings r1 = db.LoadRegionSettings(region1);
             Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
 
@@ -840,7 +840,7 @@ namespace OpenSim.Data.Tests
         public void T101_UpdateRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             int agentlimit = random.Next();
             double objectbonus = random.Next();
             int maturity = random.Next();
@@ -900,9 +900,9 @@ namespace OpenSim.Data.Tests
             r1.FixedSun = true;
             r1.SunPosition = sunpos;
             r1.Covenant = cov;
-            
+
             db.StoreRegionSettings(r1);
-            
+
             RegionSettings r1a = db.LoadRegionSettings(region1);
             Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
             Assert.That(r1a.BlockTerraform,Is.True);
@@ -939,14 +939,14 @@ namespace OpenSim.Data.Tests
             //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
             Assert.That(r1a.FixedSun,Is.True);
             Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
-            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");            
+            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
         }
 
         [Test]
         public void T300_NoTerrain()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -957,13 +957,13 @@ namespace OpenSim.Data.Tests
         public void T301_CreateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] t1 = GenTerrain(height1);
             db.StoreTerrain(t1, region1);
-            
+
             // store terrain is async
             Thread.Sleep(1000);
-              
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Not.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -974,7 +974,7 @@ namespace OpenSim.Data.Tests
         public void T302_FetchTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             double[,] t1 = db.LoadTerrain(region1);
@@ -986,7 +986,7 @@ namespace OpenSim.Data.Tests
         public void T303_UpdateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             db.StoreTerrain(baseterrain2, region1);
@@ -1003,7 +1003,7 @@ namespace OpenSim.Data.Tests
         public void T400_EmptyLand()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
@@ -1025,15 +1025,15 @@ namespace OpenSim.Data.Tests
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
                     terret[x,y] = value;
-            
+
             return terret;
         }
-        
+
         private bool CompareTerrain(double[,] one, double[,] two)
         {
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
-                    if (one[x,y] != two[x,y]) 
+                    if (one[x,y] != two[x,y])
                         return false;
 
             return true;
@@ -1053,12 +1053,12 @@ namespace OpenSim.Data.Tests
         // common failure case is people adding new fields that aren't
         // initialized, but have non-null db constraints.  We should
         // honestly be passing more and more null things in here.
-        // 
-        // Please note that in Sqlite.BuildPrim there is a commented out inline version 
+        //
+        // Please note that in Sqlite.BuildPrim there is a commented out inline version
         // of this so you can debug and step through the build process and check the fields
-        // 
+        //
         // Real World Value: Tests for situation where extending a SceneObjectGroup/SceneObjectPart
-        //                   causes the application to crash at the database layer because of null values 
+        //                   causes the application to crash at the database layer because of null values
         //                   in NOT NULL fields
         //
         private SceneObjectGroup NewSOG(string name, UUID uuid, UUID regionId)
@@ -1082,7 +1082,7 @@ namespace OpenSim.Data.Tests
 
             return sog;
         }
-        
+
         private SceneObjectPart NewSOP(string name, UUID uuid)
         {
             SceneObjectPart sop = new SceneObjectPart();
@@ -1096,7 +1096,7 @@ namespace OpenSim.Data.Tests
             return sop;
         }
 
-        // These are copied from the Inventory Item tests 
+        // These are copied from the Inventory Item tests
 
         private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
         {
@@ -1114,7 +1114,7 @@ namespace OpenSim.Data.Tests
         private static string RandomName()
         {
             StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12); 
+            int size = random.Next(5,12);
             char ch ;
             for (int i=0; i<size; i++)
             {
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 4529944..5a9eeb5 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
         public bool child;
 
         /// <summary>
-        /// Number given to the client when they log-in that they provide 
+        /// Number given to the client when they log-in that they provide
         /// as credentials to the UDP server
         /// </summary>
         public uint circuitcode;
@@ -328,7 +328,7 @@ namespace OpenSim.Framework
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
             //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
-            
+
             try
             {
                 // Unpack various appearance elements
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
             {
                 m_log.ErrorFormat("[AGENTCIRCUITDATA] failed to unpack appearance; {0}",e.Message);
             }
-            
+
             ServiceURLs = new Dictionary<string, object>();
             // Try parse the new way, OSDMap
             if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)
diff --git a/OpenSim/Framework/AnimationSet.cs b/OpenSim/Framework/AnimationSet.cs
index 6c5b15c..87c4a78 100644
--- a/OpenSim/Framework/AnimationSet.cs
+++ b/OpenSim/Framework/AnimationSet.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
             it.GroupPermissions = 0;
             it.EveryOnePermissions = 0;
         }
-        
+
         public int AnimationCount { get; private set; }
         private Dictionary<string, KeyValuePair<string, UUID>> m_animations = new Dictionary<string, KeyValuePair<string, UUID>>();
 
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 87fd04a..88edf2f 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return 
+                return
                     IsTextualAsset && (
                     Type != (sbyte)AssetType.Notecard
                     && Type != (sbyte)AssetType.CallingCard
@@ -137,7 +137,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return 
+                return
                     (Type == (sbyte)AssetType.Animation ||
                      Type == (sbyte)AssetType.Gesture ||
                      Type == (sbyte)AssetType.Simstate ||
@@ -282,7 +282,7 @@ namespace OpenSim.Framework
 
                 return m_id;
             }
-            
+
             set
             {
                 UUID uuid = UUID.Zero;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
index d269e5d..b6ea077 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Framework.AssetLoader.Filesystem")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index d602c1f..3dfbb91 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -31,10 +31,10 @@ namespace OpenSim.Framework
 {
     /// <summary>
     /// This class was created to refactor OutPacket out of AssetCache
-    /// There is a conflict between 
+    /// There is a conflict between
     /// OpenSim.Framework.Communications.Cache.AssetRequest and OpenSim.Framework.AssetRequest
-    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring 
-    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache 
+    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring
+    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache
     /// requiring OpenSim.Framework
     /// </summary>
     public class AssetRequestToClient
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 07c739d..77a7621 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework
         // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
-//        public readonly static int TEXTURE_COUNT = 21 
+//        public readonly static int TEXTURE_COUNT = 21
         // 21 bad, make it be updated as libovm gets update
         // also keeping in sync with it
         public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
@@ -121,7 +121,7 @@ namespace OpenSim.Framework
             get { return m_avatarHeight; }
             set { m_avatarHeight = value; }
         }
-        
+
         public virtual WearableCacheItem[] WearableCacheItems
         {
             get { return m_cacheitems; }
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
                     m_wearables[i] = new AvatarWearable();
                     AvatarWearable wearable = appearance.Wearables[i];
                     for (int j = 0; j < wearable.Count; j++)
-                            m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID);                       
+                            m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID);
                  }
             }
             else
@@ -291,18 +291,18 @@ namespace OpenSim.Framework
         public virtual void ResetAppearance()
         {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance");
-            
+
             m_serial = 0;
 
             SetDefaultTexture();
-            
+
             //for (int i = 0; i < BAKE_INDICES.Length; i++)
             // {
             //     int idx = BAKE_INDICES[i];
             //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
             // }
         }
-        
+
         protected virtual void SetDefaultParams()
         {
             m_visualparams = new byte[] { 33,61,85,23,58,127,63,85,63,42,0,85,63,36,85,95,153,63,34,0,63,109,88,132,63,136,81,85,103,136,127,0,150,150,150,127,0,0,0,0,0,127,0,0,255,127,114,127,99,63,127,140,127,127,0,0,0,191,0,104,0,0,0,0,0,0,0,0,0,145,216,133,0,127,0,127,170,0,0,127,127,109,85,127,127,63,85,42,150,150,150,150,150,150,150,25,150,150,150,0,127,0,0,144,85,127,132,127,85,0,127,127,127,127,127,127,59,127,85,127,127,106,47,79,127,127,204,2,141,66,0,0,127,127,0,0,0,0,127,0,159,0,0,178,127,36,85,131,127,127,127,153,95,0,140,75,27,127,127,0,150,150,198,0,0,63,30,127,165,209,198,127,127,153,204,51,51,255,255,255,204,0,255,150,150,150,150,150,150,150,150,150,150,0,150,150,150,150,150,0,127,127,150,150,150,150,150,150,150,150,0,0,150,51,132,150,150,150 };
@@ -319,14 +319,14 @@ namespace OpenSim.Framework
         public virtual void ResetBakedTextures()
         {
             SetDefaultTexture();
-            
+
             //for (int i = 0; i < BAKE_INDICES.Length; i++)
             // {
             //     int idx = BAKE_INDICES[i];
             //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
             // }
         }
-        
+
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
             }
 
             m_texture = textureEntry;
-            
+
             return changed;
         }
 
@@ -531,14 +531,14 @@ namespace OpenSim.Framework
         {
             lock (m_attachments)
             {
-                                List<AvatarAttachment> alist = new List<AvatarAttachment>();
+                List<AvatarAttachment> alist = new List<AvatarAttachment>();
                 foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                 {
                     foreach (AvatarAttachment attach in kvp.Value)
                         alist.Add(new AvatarAttachment(attach));
                 }
-                                return alist;
-                        }
+                return alist;
+            }
         }
 
         internal void AppendAttachment(AvatarAttachment attach)
@@ -551,7 +551,7 @@ namespace OpenSim.Framework
             {
                 if (!m_attachments.ContainsKey(attach.AttachPoint))
                     m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
-    
+
                 foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint])
                 {
                     if (prev.ItemID == attach.ItemID)
@@ -608,7 +608,7 @@ namespace OpenSim.Framework
                         m_attachments.Remove(attachpoint);
                         return true;
                     }
-                    
+
                     return false;
                 }
 
@@ -622,13 +622,13 @@ namespace OpenSim.Framework
                 if (existingAttachment != null)
                 {
 //                    m_log.DebugFormat(
-//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}", 
+//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}",
 //                        existingAttachment.ItemID, existingAttachment.AssetID, existingAttachment.AttachPoint);
 
                     if (existingAttachment.AssetID != UUID.Zero && existingAttachment.AttachPoint == (attachpoint & 0x7F))
                     {
                         m_log.DebugFormat(
-                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}", 
+                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}",
                             item, attachpoint);
 
                         return false;
@@ -640,7 +640,7 @@ namespace OpenSim.Framework
                         DetachAttachment(existingAttachment.ItemID);
                     }
                 }
-                
+
                 // check if this is an append or a replace, 0x80 marks it as an append
                 if ((attachpoint & 0x80) > 0)
                 {
@@ -701,16 +701,16 @@ namespace OpenSim.Framework
                     if (index >= 0)
                     {
 //                        m_log.DebugFormat(
-//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}", 
+//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}",
 //                            m_attachments[kvp.Key][index].ItemID, index, m_attachments[kvp.Key][index].AttachPoint);
 
                         // Remove it from the list of attachments at that attach point
                         m_attachments[kvp.Key].RemoveAt(index);
-    
+
                         // And remove the list if there are no more attachments here
                         if (m_attachments[kvp.Key].Count == 0)
                             m_attachments.Remove(kvp.Key);
-    
+
                         return true;
                     }
                 }
@@ -867,7 +867,7 @@ namespace OpenSim.Framework
                     {
                         AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);
                         AppendAttachment(att);
-                        
+
 //                        m_log.DebugFormat(
 //                            "[AVATAR APPEARANCE]: Unpacked attachment itemID {0}, assetID {1}, point {2}",
 //                            att.ItemID, att.AssetID, att.AttachPoint);
@@ -1644,14 +1644,14 @@ namespace OpenSim.Framework
             SHAPE_EYELID_INNER_CORNER_UP = 214,
             SKIRT_SKIRT_RED = 215,
             SKIRT_SKIRT_GREEN = 216,
-            SKIRT_SKIRT_BLUE = 217, 
+            SKIRT_SKIRT_BLUE = 217,
 
             /// <summary>
             /// Avatar Physics section.  These are 0 type visual params which get transmitted.
             /// </summary>
 
             /// <summary>
-            /// Breast Part 1 
+            /// Breast Part 1
             /// </summary>
             BREAST_PHYSICS_MASS = 218,
             BREAST_PHYSICS_GRAVITY = 219,
@@ -1697,7 +1697,7 @@ namespace OpenSim.Framework
             BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
             BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250,
 
-            // Ubit: 07/96/2013 new parameters 
+            // Ubit: 07/96/2013 new parameters
             _APPEARANCEMESSAGE_VERSION = 251,    //ID 11000
 
             SHAPE_HOVER = 252,    //ID 11001
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 7bc46ed..0e8f960 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework
 
 //        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
 //        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
- 
+
         protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
         protected List<UUID> m_ids = new List<UUID>();
 
@@ -234,10 +234,10 @@ namespace OpenSim.Framework
                 {
                     defaultWearables[i] = new AvatarWearable();
                 }
-                
+
                 // Body
                 defaultWearables[BODY].Add(DEFAULT_BODY_ITEM, DEFAULT_BODY_ASSET);
-                
+
                 // Hair
                 defaultWearables[HAIR].Add(DEFAULT_HAIR_ITEM, DEFAULT_HAIR_ASSET);
 
@@ -252,7 +252,7 @@ namespace OpenSim.Framework
 
                 // Pants
                 defaultWearables[PANTS].Add(DEFAULT_PANTS_ITEM, DEFAULT_PANTS_ASSET);
-                
+
 //                // Alpha
 //                defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);
 
diff --git a/OpenSim/Framework/BasicDOSProtector.cs b/OpenSim/Framework/BasicDOSProtector.cs
index 89bfa94..f1ff18f 100644
--- a/OpenSim/Framework/BasicDOSProtector.cs
+++ b/OpenSim/Framework/BasicDOSProtector.cs
@@ -31,7 +31,7 @@ using log4net;
 
 namespace OpenSim.Framework
 {
-   
+
     public class BasicDOSProtector
     {
         public enum ThrottleAction
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         private readonly BasicDosProtectorOptions _options;
         private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
         private readonly Dictionary<string, int> _tempBlocked;  // blocked list
-        private readonly Dictionary<string, int> _sessions; 
+        private readonly Dictionary<string, int> _sessions;
         private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly System.Threading.ReaderWriterLockSlim _blockLockSlim = new System.Threading.ReaderWriterLockSlim();
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
                 else
                     throw new System.Security.SecurityException("Throttled");
             }
-           
+
             _blockLockSlim.ExitReadLock();
 
             lock (_generalRequestTimes)
@@ -169,10 +169,10 @@ namespace OpenSim.Framework
                         _blockLockSlim.ExitWriteLock();
 
                     }
-                    
+
 
                 }
-                else 
+                else
                     ProcessConcurrency(key, endpoint);
             }
             if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
             _sessionLockSlim.EnterWriteLock();
             if (_sessions.ContainsKey(key))
                 _sessions[key] = _sessions[key] + 1;
-            else 
+            else
                 _sessions.Add(key,1);
             _sessionLockSlim.ExitWriteLock();
         }
@@ -209,7 +209,7 @@ namespace OpenSim.Framework
             }
             else
                 _sessions.Add(key, 1);
-           
+
             _sessionLockSlim.ExitWriteLock();
         }
 
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index f6861e4..2461049 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Framework
 
                 if (m_pqueue.Count > 0)
                     return m_pqueue.Dequeue();
-                
+
                 if (m_queue.Count > 0)
                     return m_queue.Dequeue();
                 return default(T);
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 80f5ff4..7ccc320 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -356,10 +356,10 @@ namespace OpenSim.Framework
                     Expire(true);
                     return null;
                 }
-    
+
                 item.hits++;
                 item.lastUsed = DateTime.UtcNow;
-    
+
                 Expire(true);
             }
 
diff --git a/OpenSim/Framework/CapsUtil.cs b/OpenSim/Framework/CapsUtil.cs
index 4baf505..020f6e2 100644
--- a/OpenSim/Framework/CapsUtil.cs
+++ b/OpenSim/Framework/CapsUtil.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         {
             return "CAPS/" + capsObjectPath + "0000/";
         }
-        
+
         /// <summary>
         /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
         /// </summary>
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 61c870e..0e5eaf2 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -332,7 +332,7 @@ namespace OpenSim.Framework
         public Vector3 UpAxis;
 
         /// <summary>
-        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the 
+        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the
         /// scene presence to become root (triggered when the viewer sends a CompleteAgentMovement UDP packet after
         /// establishing the connection triggered by it's receipt of a TeleportFinish EQ message).
         /// </summary>
@@ -434,7 +434,7 @@ namespace OpenSim.Framework
             args["active_group_name"] = OSD.FromString(ActiveGroupName);
             if(ActiveGroupTitle != null)
                 args["active_group_title"] = OSD.FromString(ActiveGroupTitle);
-           
+
             if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0)
             {
                 OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
@@ -623,7 +623,7 @@ namespace OpenSim.Framework
 
             if (args.ContainsKey("active_group_name") && args["active_group_name"] != null)
                 ActiveGroupName = args["active_group_name"].AsString();
-            
+
             if(args.ContainsKey("active_group_title") && args["active_group_title"] != null)
                 ActiveGroupTitle = args["active_group_title"].AsString();
 
@@ -843,7 +843,7 @@ namespace OpenSim.Framework
 
     public class CompleteAgentData : AgentData
     {
-        public override OSDMap Pack(EntityTransferContext ctx) 
+        public override OSDMap Pack(EntityTransferContext ctx)
         {
             return base.Pack(ctx);
         }
diff --git a/OpenSim/Framework/CircularBuffer.cs b/OpenSim/Framework/CircularBuffer.cs
index e919337..e101938 100644
--- a/OpenSim/Framework/CircularBuffer.cs
+++ b/OpenSim/Framework/CircularBuffer.cs
@@ -1,21 +1,21 @@
 /*
-Copyright (c) 2012, Alex Regueiro 
+Copyright (c) 2012, Alex Regueiro
 All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+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 
+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.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR 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 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR 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;
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index 92af331..f996cb0 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -36,14 +36,14 @@ namespace OpenSim.Framework
     /// Cenome memory based cache to store key/value pairs (elements) limited time and/or limited size.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the dictionary. 
+    /// The type of values in the dictionary.
     /// </typeparam>
     /// <remarks>
     /// <para>
-    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed 
+    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed
     /// maximal allowed size or maximal amount of allowed element count, then elements in oldest generation are deleted. Last access time
     /// is also tracked in generation level - thus it is possible that some elements are staying in cache far beyond their expiration time.
     /// If elements in older generations are accessed through <see cref="TryGetValue"/> method, they are moved to newest generation.
@@ -176,7 +176,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -201,7 +201,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -336,7 +336,7 @@ namespace OpenSim.Framework
         /// </summary>
         private void CheckExpired()
         {
-            // Do this only one in every m_operationsBetweenTimeChecks 
+            // Do this only one in every m_operationsBetweenTimeChecks
             // Fetching time is using several millisecons - it is better not to do all time.
             m_operationsBetweenTimeChecks--;
             if (m_operationsBetweenTimeChecks <= 0)
@@ -394,7 +394,7 @@ namespace OpenSim.Framework
                 new IEnumerator<KeyValuePair<TKey, TValue>>[2];
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> class. 
+            /// Initializes a new instance of the <see cref="Enumerator"/> class.
             /// </summary>
             /// <param name="cache">
             /// The cache.
@@ -456,7 +456,7 @@ namespace OpenSim.Framework
             /// <see langword="true"/>if the enumerator was successfully advanced to the next element; <see langword="false"/> if the enumerator has passed the end of the collection.
             /// </returns>
             /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             /// <filterpriority>2</filterpriority>
             public bool MoveNext()
@@ -479,7 +479,7 @@ namespace OpenSim.Framework
             /// Sets the enumerator to its initial position, which is before the first element in the collection.
             /// </summary>
             /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             /// <filterpriority>2</filterpriority>
             public void Reset()
@@ -548,7 +548,7 @@ namespace OpenSim.Framework
             private DateTime m_expirationTime1;
 
             /// <summary>
-            /// Index to first free element. 
+            /// Index to first free element.
             /// </summary>
             private int m_firstFreeElement;
 
@@ -681,8 +681,8 @@ namespace OpenSim.Framework
                 /// Next element in chain.
                 /// </summary>
                 /// <remarks>
-                /// When element have value (something is stored to it), this is index of 
-                /// next element with same bucket index. When element is free, this 
+                /// When element have value (something is stored to it), this is index of
+                /// next element with same bucket index. When element is free, this
                 /// is index of next element in free element's list.
                 /// </remarks>
                 public int Next;
@@ -696,7 +696,7 @@ namespace OpenSim.Framework
                 public long Size;
 
                 /// <summary>
-                /// Element's value. 
+                /// Element's value.
                 /// </summary>
                 /// <remarks>
                 /// It is possible that this value is <see langword="null"/> even when element
@@ -812,7 +812,7 @@ namespace OpenSim.Framework
                 /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
                 /// </returns>
                 /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                 /// </exception>
                 public bool MoveNext()
                 {
@@ -841,7 +841,7 @@ namespace OpenSim.Framework
                 /// Sets the enumerator to its initial position, which is before the first element in the collection.
                 /// </summary>
                 /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                 /// </exception>
                 /// <filterpriority>2</filterpriority>
                 public void Reset()
@@ -931,7 +931,7 @@ namespace OpenSim.Framework
             /// The key to locate in the <see cref="IGeneration"/>.
             /// </param>
             /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
             /// otherwise <see langword="false"/>.
             /// </returns>
             public bool Contains(int bucketIndex, TKey key)
@@ -1014,7 +1014,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <remarks>
             /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
             /// then it's value is replaced with new one and size information is updated. If element didn't
             /// exists in generation before, then generation must have empty space for a new element and
             /// size must fit generation's limits, before element is added to generation.
@@ -1070,7 +1070,7 @@ namespace OpenSim.Framework
                     if (Size - m_elements[ elementIndex ].Size + size > m_cache.m_generationMaxSize)
                     {
                         // Generation is full
-                        // Remove existing element, because generation is going to be recycled to 
+                        // Remove existing element, because generation is going to be recycled to
                         // old generation and element is stored to new generation
                         RemoveElement(bucketIndex, elementIndex, previousIndex);
                         return false;
@@ -1110,12 +1110,12 @@ namespace OpenSim.Framework
             /// <remarks>
             /// <para>
             /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
             /// </para>
             /// </remarks>
             public bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size)
             {
-                // Find entry index, 
+                // Find entry index,
                 int previousIndex;
                 int elementIndex = FindElementIndex(bucketIndex, key, m_newGeneration, out previousIndex);
                 if (elementIndex == -1)
@@ -1166,7 +1166,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// There are two kind generations: "new generation" and "old generation(s)". All new elements
-        /// are added to "new generation". 
+        /// are added to "new generation".
         /// </para>
         /// </remarks>
         protected interface IGeneration : IEnumerable<KeyValuePair<TKey, TValue>>
@@ -1211,7 +1211,7 @@ namespace OpenSim.Framework
             /// The key to locate in the <see cref="IGeneration"/>.
             /// </param>
             /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
             /// otherwise <see langword="false"/>.
             /// </returns>
             bool Contains(int bucketIndex, TKey key);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <remarks>
             /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
             /// then it's value is replaced with new one and size information is updated. If element didn't
             /// exists in generation before, then generation must have empty space for a new element and
             /// size must fit generation's limits, before element is added to generation.
@@ -1288,7 +1288,7 @@ namespace OpenSim.Framework
             /// <remarks>
             /// <para>
             /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
             /// </para>
             /// </remarks>
             bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size);
@@ -1303,8 +1303,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -1324,13 +1324,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
         /// </para>
         /// <para>
@@ -1375,17 +1375,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsCountLimited
@@ -1397,13 +1397,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1420,12 +1420,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -1441,13 +1441,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -1463,13 +1463,13 @@ namespace OpenSim.Framework
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         public int MaxCount
@@ -1496,7 +1496,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -1522,8 +1522,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1556,11 +1556,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1581,8 +1581,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -1735,7 +1735,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -1748,7 +1748,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -1759,17 +1759,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -1809,15 +1809,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index 2bafbe9..b33f4f7 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -36,10 +36,10 @@ namespace OpenSim.Framework
     /// Synchronized Cenome cache wrapper.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
     /// </typeparam>
     /// <remarks>
     /// <para>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
         private readonly object m_syncRoot;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
         /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="cache">
@@ -73,13 +73,13 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
         /// </summary>
         /// <param name="cache">
         /// The <see cref="ICnmCache{TKey,TValue}"/> to synchronize.
         /// </param>
         /// <returns>
-        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
         /// </returns>
         /// <exception cref="ArgumentNullException">
         /// <paramref name="cache"/>is null.
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
             }
 
             /// <summary>
-            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class. 
+            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class.
             /// </summary>
             ~SynchronizedEnumerator()
             {
@@ -184,7 +184,7 @@ namespace OpenSim.Framework
             /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
             /// </returns>
             /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             public bool MoveNext()
             {
@@ -195,7 +195,7 @@ namespace OpenSim.Framework
             /// Sets the enumerator to its initial position, which is before the first element in the collection.
             /// </summary>
             /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             public void Reset()
             {
@@ -214,8 +214,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -241,13 +241,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
         /// </para>
         /// <para>
@@ -291,17 +291,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsCountLimited
@@ -319,13 +319,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -348,12 +348,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -369,13 +369,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -397,13 +397,13 @@ namespace OpenSim.Framework
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         public int MaxCount
@@ -433,7 +433,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -463,8 +463,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -501,11 +501,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -532,8 +532,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -647,7 +647,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -660,7 +660,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -671,17 +671,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -703,15 +703,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 6b7cdf8..52360b4 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -52,27 +52,27 @@ namespace OpenSim.Framework.Console
             /// The module from which this command comes
             /// </value>
             public string module;
-            
+
             /// <value>
             /// Whether the module is shared
             /// </value>
             public bool shared;
-            
+
             /// <value>
             /// Very short BNF description
             /// </value>
             public string help_text;
-            
+
             /// <value>
             /// Longer one line help text
             /// </value>
             public string long_help;
-            
+
             /// <value>
             /// Full descriptive help for this command
             /// </value>
             public string descriptive_help;
-            
+
             /// <value>
             /// The method to invoke for this command
             /// </value>
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Console
         {
             List<string> help = new List<string>();
             List<string> helpParts = new List<string>(cmd);
-            
+
             // Remove initial help keyword
             helpParts.RemoveAt(0);
 
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Console
 
             return help;
         }
-        
+
         /// <summary>
         /// See if we can find the requested command in order to display longer help
         /// </summary>
@@ -171,23 +171,23 @@ namespace OpenSim.Framework.Console
                 help.Insert(0, ItemHelpText);
                 return help;
             }
-            
+
             Dictionary<string, object> dict = tree;
             while (helpParts.Count > 0)
             {
                 string helpPart = helpParts[0];
-                
+
                 if (!dict.ContainsKey(helpPart))
                     break;
-                
+
                 //m_log.Debug("Found {0}", helpParts[0]);
-                
+
                 if (dict[helpPart] is Dictionary<string, Object>)
-                    dict = (Dictionary<string, object>)dict[helpPart]; 
-                
+                    dict = (Dictionary<string, object>)dict[helpPart];
+
                 helpParts.RemoveAt(0);
             }
-        
+
             // There was a command for the given help string
             if (dict.ContainsKey(String.Empty))
             {
@@ -200,14 +200,14 @@ namespace OpenSim.Framework.Console
                 // If we do have some descriptive help then insert a spacing line before for readability.
                 if (descriptiveHelp != string.Empty)
                     help.Add(string.Empty);
-                
+
                 help.Add(commandInfo.descriptive_help);
             }
             else
             {
                 help.Add(string.Format("No help is available for {0}", originalHelpRequest));
             }
-            
+
             return help;
         }
 
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Console
 //            }
 //            return result;
 //        }
-        
+
         /// <summary>
         /// Add a command to those which can be invoked from the console.
         /// </summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Console
             string[] parts = Parser.Parse(command);
 
             Dictionary<string, Object> current = tree;
-            
+
             foreach (string part in parts)
             {
                 if (current.ContainsKey(part))
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.Console
 
                 return;
             }
-            
+
             info = new CommandInfo();
             info.module = module;
             info.shared = shared;
@@ -471,7 +471,7 @@ namespace OpenSim.Framework.Console
 
             return null;
         }
-                
+
         public bool HasCommand(string command)
         {
             string[] result;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 2d8e723..64cddea 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Console
         {
             System.Console.WriteLine(text);
         }
-        
+
         public virtual void OutputFormat(string format, params object[] components)
         {
             Output(string.Format(format, components));
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Console
 
             return ret;
         }
-                
+
         public string CmdPrompt(string p, List<char> excludedCharacters)
         {
             bool itisdone = false;
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p);
-                
+
                 foreach (char c in excludedCharacters)
                 {
                     if (ret.Contains(c.ToString()))
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p, def);
-                
+
                 if (ret == String.Empty)
                 {
                     ret = def;
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 44f6dc1..bfa05a2 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Console
     //    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public const int LocalIdNotFound = 0;
-    
+
         /// <summary>
         /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
         /// rather than in each help summary.
@@ -57,10 +57,10 @@ namespace OpenSim.Framework.Console
     show object pos ,20,20 to ,40,40
     delete object pos ,,30 to ,,~
     show object pos ,,-~ to ,,30";
-    
+
         public const string MinRawConsoleVectorValue = "-~";
         public const string MaxRawConsoleVectorValue = "~";
-    
+
         public const string VectorSeparator = ",";
         public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
 
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Console
 
             return true;
         }
-    
+
         /// <summary>
         /// Try to parse a console UUID from the console.
         /// </summary>
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Console
 
                 return false;
             }
-    
+
             return true;
         }
 
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Console
 
             return false;
         }
-    
+
         /// <summary>
         /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -354,10 +354,10 @@ namespace OpenSim.Framework.Console
             string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc)
         {
             List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
-    
+
             if (components.Count < 1 || components.Count > dimensions)
                 return null;
-    
+
             if (components.Count < dimensions)
             {
                 if (blankComponentFunc == null)
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Console
                         else
                             return c;
                     });
-    
+
             return string.Join(VectorSeparator, cookedComponents.ToArray());
         }
     }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 28293c0..73f0323 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Console
         private const string LOGLEVEL_NONE = "(none)";
 
         // Used to extract categories for colourization.
-        private Regex m_categoryRegex 
+        private Regex m_categoryRegex
             = new Regex(
                 @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)", RegexOptions.Singleline | RegexOptions.Compiled);
 
@@ -167,15 +167,15 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorLeft = 0;
             }
-            else 
+            else
             {
                 int bufferWidth = System.Console.BufferWidth;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferWidth > 0 && left >= bufferWidth)
                     System.Console.CursorLeft = bufferWidth - 1;
             }
-            
+
             if (top < 0)
             {
                 top = 0;
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
             else
             {
                 int bufferHeight = System.Console.BufferHeight;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     top = bufferHeight - 1;
@@ -216,14 +216,14 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorTop = 0;
             }
-            else 
+            else
             {
                 int bufferHeight = System.Console.BufferHeight;
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     System.Console.CursorTop = bufferHeight - 1;
             }
-            
+
             if (left < 0)
             {
                 left = 0;
@@ -339,7 +339,7 @@ namespace OpenSim.Framework.Console
             string outText = text;
 
             if (level != LOGLEVEL_NONE)
-            {               
+            {
                 MatchCollection matches = m_categoryRegex.Matches(text);
 
                 if (matches.Count == 1)
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Console
                 WriteColorText(ConsoleColor.Yellow, outText);
             else
                 System.Console.Write(outText);
-        
+
             System.Console.WriteLine();
         }
 
@@ -551,7 +551,7 @@ namespace OpenSim.Framework.Console
                         }
 
                         string commandLine = m_commandLine.ToString();
-                        
+
                         if (isCommand)
                         {
                             string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Console
                         // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
                         if (m_echo && commandLine != "")
                             AddToHistory(commandLine);
-                        
+
                         return commandLine;
                     default:
                         break;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index 1a142df..e1ff720 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Console
 {
     /// <summary>
     /// This is a Fake console that's used when setting up the Scene in Unit Tests
-    /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
+    /// Don't use this except for Unit Testing or you're in for a world of hurt when the
     /// sim gets to ReadLine
     /// </summary>
     public class MockConsole : ICommandConsole
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console
 
         public string ReadLine(string p, bool isCommand, bool e) { return ""; }
 
-        public object ConsoleScene { 
+        public object ConsoleScene {
             get { return null; }
             set {}
         }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 9049b4b..f59c902 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -46,93 +46,93 @@ namespace OpenSim.Framework.Console
     //
     public class RemoteConsole : CommandConsole
     {
-                // Connection specific data, indexed by a session ID
-                // we create when a client connects.
-                protected class ConsoleConnection
-                {
-                        // Last activity from the client
-                        public int last;
-
-                        // Last line of scrollback posted to this client
-                        public long lastLineSeen;
-
-                        // True if this is a new connection, e.g. has never
-                        // displayed a prompt to the user.
-                        public bool newConnection = true;
-                }
-
-                // A line in the scrollback buffer. 
-                protected class ScrollbackEntry
-                {
-                        // The line number of this entry
-                        public long lineNumber;
-
-                        // The text to send to the client
-                        public string text;
-
-                        // The level this should be logged as. Omitted for
-                        // prompts and input echo.
-                        public string level;
-
-                        // True if the text above is a prompt, e.g. the
-                        // client should turn on the cursor / accept input
-                        public bool isPrompt;
-
-                        // True if the requested input is a command. A
-                        // client may offer help or validate input if
-                        // this is set. If false, input should be sent
-                        // as typed.
-                        public bool isCommand;
-
-                        // True if this text represents a line of text that
-                        // was input in response to a prompt. A client should
-                        // turn off the cursor and refrain from sending commands
-                        // until a new prompt is received.
-                        public bool isInput;
-                }
-
-                // Data that is relevant to all connections
-
-                // The scrollback buffer
+        // Connection specific data, indexed by a session ID
+        // we create when a client connects.
+        protected class ConsoleConnection
+        {
+            // Last activity from the client
+            public int last;
+
+            // Last line of scrollback posted to this client
+            public long lastLineSeen;
+
+            // True if this is a new connection, e.g. has never
+            // displayed a prompt to the user.
+            public bool newConnection = true;
+        }
+
+        // A line in the scrollback buffer.
+        protected class ScrollbackEntry
+        {
+            // The line number of this entry
+            public long lineNumber;
+
+            // The text to send to the client
+            public string text;
+
+            // The level this should be logged as. Omitted for
+            // prompts and input echo.
+            public string level;
+
+            // True if the text above is a prompt, e.g. the
+            // client should turn on the cursor / accept input
+            public bool isPrompt;
+
+            // True if the requested input is a command. A
+            // client may offer help or validate input if
+            // this is set. If false, input should be sent
+            // as typed.
+            public bool isCommand;
+
+            // True if this text represents a line of text that
+            // was input in response to a prompt. A client should
+            // turn off the cursor and refrain from sending commands
+            // until a new prompt is received.
+            public bool isInput;
+        }
+
+        // Data that is relevant to all connections
+
+        // The scrollback buffer
         protected List<ScrollbackEntry> m_Scrollback = new List<ScrollbackEntry>();
 
-                // Monotonously incrementing line number. This may eventually
-                // wrap. No provision is made for that case because 64 bits
-                // is a long, long time.
+        // Monotonously incrementing line number. This may eventually
+        // wrap. No provision is made for that case because 64 bits
+        // is a long, long time.
         protected long m_lineNumber = 0;
 
-                // These two variables allow us to send the correct
-                // information about the prompt status to the client,
-                // irrespective of what may have run off the top of the
-                // scrollback buffer;
-                protected bool m_expectingInput = false;
-                protected bool m_expectingCommand = true;
-                protected string m_lastPromptUsed;
-                
-                // This is the list of things received from clients.
-                // Note: Race conditions can happen. If a client sends
-                // something while nothing is expected, it will be
-                // intepreted as input to the next prompt. For
-                // commands this is largely correct. For other prompts,
-                // YMMV.
-                // TODO: Find a better way to fix this
+        // These two variables allow us to send the correct
+        // information about the prompt status to the client,
+        // irrespective of what may have run off the top of the
+        // scrollback buffer;
+        protected bool m_expectingInput = false;
+        protected bool m_expectingCommand = true;
+        protected string m_lastPromptUsed;
+
+        // This is the list of things received from clients.
+        // Note: Race conditions can happen. If a client sends
+        // something while nothing is expected, it will be
+        // intepreted as input to the next prompt. For
+        // commands this is largely correct. For other prompts,
+        // YMMV.
+        // TODO: Find a better way to fix this
         protected List<string> m_InputData = new List<string>();
 
-                // Event to allow ReadLine to wait synchronously even though
-                // everthing else is asynchronous here.
+        // Event to allow ReadLine to wait synchronously even though
+        // everthing else is asynchronous here.
         protected ManualResetEvent m_DataEvent = new ManualResetEvent(false);
 
-                // The list of sessions we maintain. Unlike other console types,
-                // multiple users on the same console are explicitly allowed.
+        // The list of sessions we maintain. Unlike other console types,
+        // multiple users on the same console are explicitly allowed.
         protected Dictionary<UUID, ConsoleConnection> m_Connections =
                 new Dictionary<UUID, ConsoleConnection>();
 
-                // Timer to control expiration of sessions that have been
-                // disconnected.
-                protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
+        // Timer to control expiration of sessions that have been
+        // disconnected.
+        protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
 
-                // The less interesting stuff that makes the actual server
-                // work.
+        // The less interesting stuff that makes the actual server
+        // work.
         protected IHttpServer m_Server = null;
         protected IConfigSource m_Config = null;
 
@@ -143,130 +143,130 @@ namespace OpenSim.Framework.Console
 
         public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
         {
-                        // There is something wrong with this architecture.
-                        // A prompt is sent on every single input, so why have this?
-                        // TODO: Investigate and fix.
-                        m_lastPromptUsed = defaultPrompt;
-
-                        // Start expiration of sesssions.
-                        m_expireTimer.Elapsed += DoExpire;
-                        m_expireTimer.Start();
+            // There is something wrong with this architecture.
+            // A prompt is sent on every single input, so why have this?
+            // TODO: Investigate and fix.
+            m_lastPromptUsed = defaultPrompt;
+
+            // Start expiration of sesssions.
+            m_expireTimer.Elapsed += DoExpire;
+            m_expireTimer.Start();
         }
 
         public void ReadConfig(IConfigSource config)
         {
             m_Config = config;
 
-                        // We're pulling this from the 'Network' section for legacy
-                        // compatibility. However, this is so essentially insecure
-                        // that TLS and client certs should be used instead of
-                        // a username / password.
+            // We're pulling this from the 'Network' section for legacy
+            // compatibility. However, this is so essentially insecure
+            // that TLS and client certs should be used instead of
+            // a username / password.
             IConfig netConfig = m_Config.Configs["Network"];
 
             if (netConfig == null)
                 return;
 
-                        // Get the username and password.
+            // Get the username and password.
             m_UserName = netConfig.GetString("ConsoleUser", String.Empty);
             m_Password = netConfig.GetString("ConsolePass", String.Empty);
 
-                        // Woefully underdocumented, this is what makes javascript
-                        // console clients work. Set to "*" for anywhere or (better)
-                        // to specific addresses.
+            // Woefully underdocumented, this is what makes javascript
+            // console clients work. Set to "*" for anywhere or (better)
+            // to specific addresses.
             m_AllowedOrigin = netConfig.GetString("ConsoleAllowedOrigin", String.Empty);
         }
 
         public void SetServer(IHttpServer server)
         {
-                        // This is called by the framework to give us the server
-                        // instance (means: port) to work with.
+            // This is called by the framework to give us the server
+            // instance (means: port) to work with.
             m_Server = server;
 
-                        // Add our handlers
+            // Add our handlers
             m_Server.AddHTTPHandler("/StartSession/", HandleHttpStartSession);
             m_Server.AddHTTPHandler("/CloseSession/", HandleHttpCloseSession);
             m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
         }
 
         public override void Output(string text, string level)
-                {
-                        Output(text, level, false, false, false);
-                }
+        {
+            Output(text, level, false, false, false);
+        }
 
         protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
         {
-                        // Increment the line number. It was 0 and they start at 1
-                        // so we need to pre-increment.
-                        m_lineNumber++;
-
-                        // Create and populate the new entry.
-                        ScrollbackEntry newEntry = new ScrollbackEntry();
-
-                        newEntry.lineNumber = m_lineNumber;
-                        newEntry.text = text;
-                        newEntry.level = level;
-                        newEntry.isPrompt = isPrompt;
-                        newEntry.isCommand = isCommand;
-                        newEntry.isInput = isInput;
-
-                        // Add a line to the scrollback. In some cases, that may not
-                        // actually be a line of text.
+            // Increment the line number. It was 0 and they start at 1
+            // so we need to pre-increment.
+            m_lineNumber++;
+
+            // Create and populate the new entry.
+            ScrollbackEntry newEntry = new ScrollbackEntry();
+
+            newEntry.lineNumber = m_lineNumber;
+            newEntry.text = text;
+            newEntry.level = level;
+            newEntry.isPrompt = isPrompt;
+            newEntry.isCommand = isCommand;
+            newEntry.isInput = isInput;
+
+            // Add a line to the scrollback. In some cases, that may not
+            // actually be a line of text.
             lock (m_Scrollback)
             {
-                                // Prune the scrollback to the length se send as connect
-                                // burst to give the user some context.
+                // Prune the scrollback to the length se send as connect
+                // burst to give the user some context.
                 while (m_Scrollback.Count >= 1000)
                     m_Scrollback.RemoveAt(0);
 
                 m_Scrollback.Add(newEntry);
             }
 
-                        // Let the rest of the system know we have output something.
+            // Let the rest of the system know we have output something.
             FireOnOutput(text.Trim());
 
-                        // Also display it for debugging.
+            // Also display it for debugging.
             System.Console.WriteLine(text.Trim());
         }
 
         public override void Output(string text)
         {
-                        // Output plain (non-logging style) text.
+            // Output plain (non-logging style) text.
             Output(text, String.Empty, false, false, false);
         }
 
         public override string ReadLine(string p, bool isCommand, bool e)
         {
-                        // Output the prompt an prepare to wait. This
-                        // is called on a dedicated console thread and
-                        // needs to be synchronous. Old architecture but
-                        // not worth upgrading.
-                        if (isCommand)
-                        {
-                                m_expectingInput = true;
-                                m_expectingCommand = true;
+            // Output the prompt an prepare to wait. This
+            // is called on a dedicated console thread and
+            // needs to be synchronous. Old architecture but
+            // not worth upgrading.
+            if (isCommand)
+            {
+                m_expectingInput = true;
+                m_expectingCommand = true;
                 Output(p, String.Empty, true, true, false);
-                                m_lastPromptUsed = p;
-                        }
-                        else
-                        {
-                                m_expectingInput = true;
+                m_lastPromptUsed = p;
+            }
+            else
+            {
+                m_expectingInput = true;
                 Output(p, String.Empty, true, false, false);
-                        }
+            }
 
 
-                        // Here is where we wait for the user to input something.
+            // Here is where we wait for the user to input something.
             m_DataEvent.WaitOne();
 
             string cmdinput;
 
-                        // Check for empty input. Read input if not empty.
+            // Check for empty input. Read input if not empty.
             lock (m_InputData)
             {
                 if (m_InputData.Count == 0)
                 {
                     m_DataEvent.Reset();
-                                        m_expectingInput = false;
-                                        m_expectingCommand = false;
+                    m_expectingInput = false;
+                    m_expectingCommand = false;
 
                     return "";
                 }
@@ -278,19 +278,19 @@ namespace OpenSim.Framework.Console
 
             }
 
-                        m_expectingInput = false;
-                        m_expectingCommand = false;
+            m_expectingInput = false;
+            m_expectingCommand = false;
 
-                        // Echo to all the other users what we have done. This
-                        // will also go to ourselves.
-                        Output (cmdinput, String.Empty, false, false, true);
+            // Echo to all the other users what we have done. This
+            // will also go to ourselves.
+            Output (cmdinput, String.Empty, false, false, true);
 
-                        // If this is a command, we need to resolve and execute it.
+            // If this is a command, we need to resolve and execute it.
             if (isCommand)
             {
-                                // This call will actually execute the command and create
-                                // any output associated with it. The core just gets an
-                                // empty string so it will call again immediately.
+                // This call will actually execute the command and create
+                // any output associated with it. The core just gets an
+                // empty string so it will call again immediately.
                 string[] cmd = Commands.Resolve(Parser.Parse(cmdinput));
 
                 if (cmd.Length != 0)
@@ -306,11 +306,11 @@ namespace OpenSim.Framework.Console
                 }
             }
 
-                        // Return the raw input string if not a command.
+            // Return the raw input string if not a command.
             return cmdinput;
         }
 
-                // Very simplistic static access control header.
+        // Very simplistic static access control header.
         protected Hashtable CheckOrigin(Hashtable result)
         {
             if (!string.IsNullOrEmpty(m_AllowedOrigin))
@@ -338,21 +338,21 @@ namespace OpenSim.Framework.Console
 
         protected void DoExpire(Object sender, ElapsedEventArgs e)
         {
-                        // Iterate the list of console connections and find those we
-                        // haven't heard from for longer then the longpoll interval.
-                        // Remove them.
+            // Iterate the list of console connections and find those we
+            // haven't heard from for longer then the longpoll interval.
+            // Remove them.
             List<UUID> expired = new List<UUID>();
 
             lock (m_Connections)
             {
-                                // Mark the expired ones
+                // Mark the expired ones
                 foreach (KeyValuePair<UUID, ConsoleConnection> kvp in m_Connections)
                 {
                     if (System.Environment.TickCount - kvp.Value.last > 500000)
                         expired.Add(kvp.Key);
                 }
 
-                                // Delete them
+                // Delete them
                 foreach (UUID id in expired)
                 {
                     m_Connections.Remove(id);
@@ -361,10 +361,10 @@ namespace OpenSim.Framework.Console
             }
         }
 
-                // Start a new session.
+        // Start a new session.
         protected Hashtable HandleHttpStartSession(Hashtable request)
         {
-                        // The login is in the form of a http form post
+            // The login is in the form of a http form post
             Hashtable post = DecodePostString(request["body"].ToString());
             Hashtable reply = new Hashtable();
 
@@ -372,7 +372,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 401;
             reply["content_type"] = "text/plain";
 
-                        // Check user name and password
+            // Check user name and password
             if (m_UserName == String.Empty)
                 return reply;
 
@@ -385,28 +385,28 @@ namespace OpenSim.Framework.Console
                 return reply;
             }
 
-                        // Set up the new console connection record
+            // Set up the new console connection record
             ConsoleConnection c = new ConsoleConnection();
             c.last = System.Environment.TickCount;
             c.lastLineSeen = 0;
 
-                        // Assign session ID
+            // Assign session ID
             UUID sessionID = UUID.Random();
 
-                        // Add connection to list.
+            // Add connection to list.
             lock (m_Connections)
             {
                 m_Connections[sessionID] = c;
             }
 
-                        // This call is a CAP. The URL is the authentication.
+            // This call is a CAP. The URL is the authentication.
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(
                 uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
-                        // Our reply is an XML document.
-                        // TODO: Change this to Linq.Xml
+            // Our reply is an XML document.
+            // TODO: Change this to Linq.Xml
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -429,7 +429,7 @@ namespace OpenSim.Framework.Console
 
             rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
 
-                        // Set up the response and check origin
+            // Set up the response and check origin
             reply["str_response_string"] = xmldoc.InnerXml;
             reply["int_response_code"] = 200;
             reply["content_type"] = "text/xml";
@@ -438,7 +438,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Client closes session. Clean up.
+        // Client closes session. Clean up.
         protected Hashtable HandleHttpCloseSession(Hashtable request)
         {
             Hashtable post = DecodePostString(request["body"].ToString());
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Command received from the client.
+        // Command received from the client.
         protected Hashtable HandleHttpSessionCommand(Hashtable request)
         {
             Hashtable post = DecodePostString(request["body"].ToString());
@@ -497,7 +497,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 404;
             reply["content_type"] = "text/plain";
 
-                        // Check the ID
+            // Check the ID
             if (post["ID"] == null)
                 return reply;
 
@@ -505,25 +505,25 @@ namespace OpenSim.Framework.Console
             if (!UUID.TryParse(post["ID"].ToString(), out id))
                 return reply;
 
-                        // Find the connection for that ID.
+            // Find the connection for that ID.
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(id))
                     return reply;
             }
 
-                        // Empty post. Just error out.
+            // Empty post. Just error out.
             if (post["COMMAND"] == null)
                 return reply;
 
-                        // Place the input data in the buffer.
+            // Place the input data in the buffer.
             lock (m_InputData)
             {
                 m_DataEvent.Set();
                 m_InputData.Add(post["COMMAND"].ToString());
             }
 
-                        // Create the XML reply document.
+            // Create the XML reply document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -547,7 +547,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Decode a HTTP form post to a Hashtable
+        // Decode a HTTP form post to a Hashtable
         protected Hashtable DecodePostString(string data)
         {
             Hashtable result = new Hashtable();
@@ -565,14 +565,14 @@ namespace OpenSim.Framework.Console
 
                 if (elems.Length > 1)
                     value = System.Web.HttpUtility.UrlDecode(elems[1]);
-                
+
                 result[name] = value;
             }
 
             return result;
         }
 
-                // Close the CAP receiver for the responses for a given client.
+        // Close the CAP receiver for the responses for a given client.
         public void CloseConnection(UUID id)
         {
             try
@@ -586,8 +586,8 @@ namespace OpenSim.Framework.Console
             }
         }
 
-                // Check if there is anything to send. Return true if this client has
-                // lines pending.
+        // Check if there is anything to send. Return true if this client has
+        // lines pending.
         protected bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
@@ -604,10 +604,10 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-                // Send all pending output to the client.
+        // Send all pending output to the client.
         protected Hashtable GetEvents(UUID RequestID, UUID sessionID)
         {
-                        // Find the connection that goes with this client.
+            // Find the connection that goes with this client.
             ConsoleConnection c = null;
 
             lock (m_Connections)
@@ -617,14 +617,14 @@ namespace OpenSim.Framework.Console
                 c = m_Connections[sessionID];
             }
 
-                        // If we have nothing to send, send the no events response.
+            // If we have nothing to send, send the no events response.
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_lineNumber)
                 return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
-                        // Create the response document.
+            // Create the response document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -648,29 +648,29 @@ namespace OpenSim.Framework.Console
 
                 for (long i = sendStart ; i < m_lineNumber ; i++)
                 {
-                                        ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
+                    ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
 
                     XmlElement res = xmldoc.CreateElement("", "Line", "");
                     res.SetAttribute("Number", e.lineNumber.ToString());
                     res.SetAttribute("Level", e.level);
-                                        // Don't include these for the scrollback, we'll send the
-                                        // real state later.
-                                        if (!c.newConnection)
-                                        {
-                                                res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
-                                                res.SetAttribute("Command", e.isCommand ? "true" : "false");
-                                                res.SetAttribute("Input", e.isInput ? "true" : "false");
-                                        }
-                                        else if (i == m_lineNumber - 1) // Last line for a new connection
-                                        {
-                                                res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
-                                                res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
-                                                res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
-                                        }
-                                        else
-                                        {
-                                                res.SetAttribute("Input", e.isInput ? "true" : "false");
-                                        }
+                    // Don't include these for the scrollback, we'll send the
+                    // real state later.
+                    if (!c.newConnection)
+                    {
+                        res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
+                        res.SetAttribute("Command", e.isCommand ? "true" : "false");
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+                    else if (i == m_lineNumber - 1) // Last line for a new connection
+                    {
+                        res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
+                        res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
+                        res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
+                    }
+                    else
+                    {
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
 
                     res.AppendChild(xmldoc.CreateTextNode(e.text));
 
@@ -679,7 +679,7 @@ namespace OpenSim.Framework.Console
             }
 
             c.lastLineSeen = m_lineNumber;
-                        c.newConnection = false;
+            c.newConnection = false;
 
             xmldoc.AppendChild(rootElement);
 
@@ -693,8 +693,8 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-                // This is really just a no-op. It generates what is sent
-                // to the client if the poll times out without any events.
+        // This is really just a no-op. It generates what is sent
+        // to the client if the poll times out without any events.
         protected Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 4995a92..1915fa5 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -63,9 +63,9 @@ namespace OpenSim.Framework
         {
             get { return m_map; }
             set { m_map = value; }
-        }        
-        
-        public XmlSchema GetSchema() { return null; } 
+        }
+
+        public XmlSchema GetSchema() { return null; }
 
         public static DAMap FromXml(string rawXml)
         {
@@ -73,19 +73,19 @@ namespace OpenSim.Framework
             map.ReadXml(rawXml);
             return map;
         }
-       
+
         public void ReadXml(XmlReader reader)
-        { 
-            ReadXml(reader.ReadInnerXml());            
+        {
+            ReadXml(reader.ReadInnerXml());
         }
 
         public void ReadXml(string rawXml)
-        {            
+        {
             // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
-            
+
             lock (this)
             {
-                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);         
+                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
                 SanitiseMap(this);
             }
         }
@@ -104,7 +104,7 @@ namespace OpenSim.Framework
         public void CopyFrom(DAMap other)
         {
             // Deep copy
-            
+
             string data = null;
             lock (other)
             {
@@ -113,7 +113,7 @@ namespace OpenSim.Framework
                     data = OSDParser.SerializeLLSDXmlString(other.m_map);
                 }
             }
-            
+
             lock (this)
             {
                 if (data == null)
@@ -185,9 +185,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Get the number of stores.
         /// </summary>
-        public int CountStores 
+        public int CountStores
         {
-            get 
+            get
             {
                 int count = 0;
 
@@ -263,8 +263,8 @@ namespace OpenSim.Framework
                 throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH);
         }
 
-        public bool ContainsStore(string ns, string storeName) 
-        {    
+        public bool ContainsStore(string ns, string storeName)
+        {
             OSD namespaceOsd;
 
             lock (this)
@@ -276,7 +276,7 @@ namespace OpenSim.Framework
             }
 
             return false;
-        }     
+        }
 
         public bool TryGetStore(string ns, string storeName, out OSDMap store)
         {
@@ -297,17 +297,17 @@ namespace OpenSim.Framework
 
             store = null;
             return false;
-        }    
+        }
 
         public void Clear()
         {
             lock (this)
                 m_map.Clear();
-        }  
+        }
 
         public bool RemoveStore(string ns, string storeName)
         {
-            OSD namespaceOsd; 
+            OSD namespaceOsd;
 
             lock (this)
             {
@@ -323,6 +323,6 @@ namespace OpenSim.Framework
             }
 
             return false;
-        }     
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/DOMap.cs b/OpenSim/Framework/DOMap.cs
index f5b650b..033cbf9 100644
--- a/OpenSim/Framework/DOMap.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
     public class DOMap
     {
         private IDictionary<string, object> m_map;
-        
+
         public void Add(string ns, string objName, object dynObj)
         {
             DAMap.ValidateNamespace(ns);
diff --git a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
index 4ff8cba..55ec13e 100644
--- a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
+++ b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -90,10 +90,10 @@ namespace OpenSim.Framework
                 Dictionary1[key1] = value;
                 Dictionary2[key2] = value;
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
         }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -117,10 +117,10 @@ namespace OpenSim.Framework
                 Dictionary1.Remove(key1);
                 success = Dictionary2.Remove(key2);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return success;
@@ -136,7 +136,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -159,10 +159,10 @@ namespace OpenSim.Framework
                     }
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return found;
@@ -178,7 +178,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -201,10 +201,10 @@ namespace OpenSim.Framework
                     }
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return found;
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -229,10 +229,10 @@ namespace OpenSim.Framework
                 Dictionary1.Clear();
                 Dictionary2.Clear();
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
         }
 
@@ -256,24 +256,24 @@ namespace OpenSim.Framework
             bool success;
             bool gotLock = false;
 
-            try 
-            { 
+            try
+            {
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
                     gotLock = true;
                 }
 
-                success = Dictionary1.TryGetValue(key, out value); 
+                success = Dictionary1.TryGetValue(key, out value);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return success;
@@ -284,24 +284,24 @@ namespace OpenSim.Framework
             bool success;
             bool gotLock = false;
 
-            try 
-            { 
+            try
+            {
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
                     gotLock = true;
                 }
 
-                success = Dictionary2.TryGetValue(key, out value); 
+                success = Dictionary2.TryGetValue(key, out value);
             }
-            finally 
-            {   
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return success;
@@ -316,7 +316,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -326,10 +326,10 @@ namespace OpenSim.Framework
                 foreach (TValue value in Dictionary1.Values)
                     action(value);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -352,10 +352,10 @@ namespace OpenSim.Framework
                 foreach (KeyValuePair<TKey1, TValue> entry in Dictionary1)
                     action(entry);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -378,10 +378,10 @@ namespace OpenSim.Framework
                 foreach (KeyValuePair<TKey2, TValue> entry in Dictionary2)
                     action(entry);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -394,7 +394,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -407,10 +407,10 @@ namespace OpenSim.Framework
                         return value;
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return default(TValue);
@@ -426,7 +426,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -439,10 +439,10 @@ namespace OpenSim.Framework
                         list.Add(value);
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return list;
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterUpgradeableReadLock();
@@ -482,7 +482,7 @@ namespace OpenSim.Framework
 
                 try
                 {
-                    try {}            
+                    try {}
                     finally
                     {
                         rwLock.EnterUpgradeableReadLock();
@@ -495,16 +495,16 @@ namespace OpenSim.Framework
                     for (int i = 0; i < list2.Count; i++)
                         Dictionary2.Remove(list2[i]);
                 }
-                finally 
-                { 
+                finally
+                {
                     if (gotWriteLock)
-                        rwLock.ExitWriteLock(); 
+                        rwLock.ExitWriteLock();
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotUpgradeableLock)
-                    rwLock.ExitUpgradeableReadLock(); 
+                    rwLock.ExitUpgradeableReadLock();
             }
 
             return list.Count;
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index ebed794..12a92bb 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return m_estateID; 
+                return m_estateID;
             }
             set
             {
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 844230b..7134cbf 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -430,7 +430,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID, 32) && 
+            if (!IsBanned(ban.BannedUserID, 32) &&
                 (l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans
                 l_EstateBans.Add(ban);
         }
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 6954c64..1605005 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
             binaryBucket = im.binaryBucket;
             RegionID = im.RegionID;
             ParentEstateID = im.ParentEstateID;
- 
+
             if (addTimestamp)
                 timestamp = (uint)Util.UnixTimeSinceEpoch();
         }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1541b3a..1267993 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
     public delegate void ObjectAttach(
         IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
 
-    public delegate void ModifyTerrain(UUID user, 
+    public delegate void ModifyTerrain(UUID user,
         float height, float seconds, byte size, byte action, float north, float west, float south, float east,
         UUID agentId);
 
@@ -473,46 +473,46 @@ namespace OpenSim.Framework
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
-    
+
     public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
-    
+
     public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
-    
+
     public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
-    
+
     public delegate void FindAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
+
     public delegate void TrackAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
+
     public delegate void FreezeUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
+
     public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
+
     public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string Summary, UUID reporter);
-    
+
     public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY);
-    
+
     public delegate void GodlikeMessage(IClientAPI client, UUID requester, byte[] Method, byte[] Parameter);
-    
+
     public delegate void SaveStateHandler(IClientAPI client,UUID agentID);
-    
+
     public delegate void GroupAccountSummaryRequest(IClientAPI client,UUID agentID, UUID groupID);
-    
+
     public delegate void GroupAccountDetailsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void GroupAccountTransactionsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void ParcelBuyPass(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
+
     public delegate void ParcelGodMark(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
+
     public delegate void GroupActiveProposalsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void GroupVoteHistoryRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
-    
+
+
     public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
-    
+
     public delegate void SendPostcard(IClientAPI client);
     public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags);
 
@@ -763,7 +763,7 @@ namespace OpenSim.Framework
         /// Only set for root agents.
         /// </remarks>
         bool IsLoggingOut { get; set; }
-        
+
         bool SendLogoutPacketWhenClosing { set; }
 
         // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
@@ -1034,7 +1034,7 @@ namespace OpenSim.Framework
         event MuteListRequest OnMuteListRequest;
 
         event PlacesQuery OnPlacesQuery;
-        
+
         event FindAgentUpdate OnFindAgent;
         event TrackAgentUpdate OnTrackAgent;
         event NewUserReport OnUserReport;
@@ -1079,12 +1079,12 @@ namespace OpenSim.Framework
         void Close(bool sendStop, bool force);
 
         void Kick(string message);
-        
+
         /// <summary>
         /// Start processing for this client.
         /// </summary>
         void Start();
-        
+
         void Stop();
 
         //     void ActivateGesture(UUID assetId, UUID gestureId);
@@ -1155,7 +1155,7 @@ namespace OpenSim.Framework
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
 
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
-        
+
         /// <summary>
         /// Return circuit information for this client.
         /// </summary>
@@ -1223,10 +1223,10 @@ namespace OpenSim.Framework
         /// <summary>
         /// Used by the server to inform the client of new inventory items and folders.
         /// </summary>
-        /// 
+        ///
         /// If the node is a folder then the contents will be transferred
         /// (including all descendent folders) as well as the folder itself.
-        /// 
+        ///
         /// <param name="node"></param>
         void SendBulkUpdateInventory(InventoryNodeBase node);
 
@@ -1289,7 +1289,7 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-        
+
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
 
@@ -1357,7 +1357,7 @@ namespace OpenSim.Framework
         void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
 
         /// <summary>
-        /// Send the next packet for a series of packets making up a single texture, 
+        /// Send the next packet for a series of packets making up a single texture,
         /// as established by SendImageFirstPart()
         /// </summary>
         /// <param name="partNumber"></param>
@@ -1481,7 +1481,7 @@ namespace OpenSim.Framework
         void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
 
         void SendUserInfoReply(bool imViaEmail, bool visible, string email);
-        
+
         void SendUseCachedMuteList();
 
         void SendMuteListUpdate(string filename);
@@ -1495,13 +1495,13 @@ namespace OpenSim.Framework
         void SendRebakeAvatarTextures(UUID textureID);
 
         void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
-        
+
         void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt);
-        
+
         void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier);
-        
+
         void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
-        
+
         void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
         void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
 
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index 27b9c56..69b5b42 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
     /// Represent generic cache to store key/value pairs (elements) limited by time, size and count of elements.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
     /// </typeparam>
     /// <remarks>
     /// <para>
@@ -51,8 +51,8 @@ namespace OpenSim.Framework
     /// <item>
     /// <term>Time</term>
     /// <description>
-    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are 
-    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache. 
+    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are
+    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache.
     /// <see cref="IsTimeLimited"/> returns <see langword="true"/>, if cache is limited by time.
     /// </description>
     /// </item>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
     /// <term>Count</term>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxCount"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
+    /// used element(s) from the cache, until element fits to cache.
     /// <see cref="IsCountLimited"/> returns <see langword="true"/>, if cache is limiting element count.
     /// </description>
     /// </item>
@@ -69,8 +69,8 @@ namespace OpenSim.Framework
     /// <description>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxSize"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
-    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements. 
+    /// used element(s) from the cache, until element fits to cache.
+    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements.
     /// Normally size is bytes used by element in the cache. But it can be any other suitable unit of measure.
     /// </description>
     /// </description>
@@ -84,8 +84,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxCount"/>
@@ -102,13 +102,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/> 
-        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/>
+        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="MaxSize"/> or <see cref="MaxCount"/>.
         /// </para>
         /// <para>
@@ -135,12 +135,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -153,17 +153,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="Count"/>
-        /// <seealso cref="MaxCount"/> 
+        /// <seealso cref="MaxCount"/>
         /// <seealso cref="IsSizeLimited"/>
         /// <seealso cref="IsTimeLimited"/>
         bool IsCountLimited { get; }
@@ -172,13 +172,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -192,13 +192,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="Set"/>
-        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ExpirationTime"/>
@@ -206,18 +206,18 @@ namespace OpenSim.Framework
         /// <seealso cref="IsCountLimited"/>
         /// <seealso cref="IsSizeLimited"/>
         bool IsTimeLimited { get; }
-        
+
         /// <summary>
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         int MaxCount { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -251,8 +251,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -272,11 +272,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -294,8 +294,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
         void RemoveRange(IEnumerable<TKey> keys);
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -391,17 +391,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="IsSizeLimited"/>
@@ -417,15 +417,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 63cc7eb..44a24b9 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <returns></returns>
         List<ILandObject> AllParcels();
-             
+
         /// <summary>
         /// Get the parcel at the specified point
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="localID"></param>
         /// <returns></returns>
         ILandObject GetLandObject(int localID);
-        
+
         /// <summary>
         /// Clear the land channel of all parcels.
         /// </summary>
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If true, set up a default parcel covering the whole region owned by the estate owner.
         /// </param>
         void Clear(bool setupDefaultParcel);
-        
+
         bool IsForcefulBansAllowed();
         void UpdateLandObject(int localID, LandData data);
         void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index af072fe..f3b850d 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -43,33 +43,33 @@ namespace OpenSim.Framework
         LandData LandData { get; set; }
         bool[,] LandBitmap { get; set; }
         UUID RegionUUID { get; }
-        
+
         /// <summary>
         /// Prim counts for this land object.
         /// </summary>
         IPrimCounts PrimCounts { get; set; }
-        
+
         /// <summary>
-        /// The start point for the land object.  This is the northern-most point as one scans land working from 
+        /// The start point for the land object.  This is the northern-most point as one scans land working from
         /// west to east.
         /// </summary>
         Vector2 StartPoint { get; }
-        
+
         /// <summary>
-        /// The end point for the land object.  This is the southern-most point as one scans land working from 
+        /// The end point for the land object.  This is the southern-most point as one scans land working from
         /// west to east.
-        /// </summary>        
+        /// </summary>
         Vector2 EndPoint { get; }
 
-        // a estimation of a parcel center. 
+        // a estimation of a parcel center.
         Vector2 CenterPoint { get; }
-        
+
         // get positions
         Vector2? GetNearestPoint(Vector3 pos);
         Vector2? GetNearestPointAlongDirection(Vector3 pos, Vector3 pdirection);
 
         bool ContainsPoint(int x, int y);
-        
+
         ILandObject Copy();
 
         void SendLandUpdateToAvatarsOverMe();
@@ -97,16 +97,16 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>The bitmap created.</returns>
         bool[,] BasicFullRegionLandBitmap();
-        
+
         /// <summary>
         /// Create a square land bitmap.
         /// </summary>
         /// <remarks>
         /// Land co-ordinates are zero indexed.  The inputs are treated as points.  So if you want to create a bitmap
-        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to 
+        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to
         /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 255.
-        /// 
-        /// At the moment, the smallest parcel of land is 4m x 4m, so if the 
+        ///
+        /// At the moment, the smallest parcel of land is 4m x 4m, so if the
         /// region is 256 x 256m (the SL size), the bitmap returned will start at (0,0) and end at (63,63).
         /// The value of the set_value needs to be true to define an active parcel of the given size.
         /// </remarks>
@@ -117,7 +117,7 @@ namespace OpenSim.Framework
         /// <param name="set_value"></param>
         /// <returns>The bitmap created.</returns>
         bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true);
-        
+
         bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
 
         /// <summary>
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
         /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
         /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt;</param>
         /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
-        /// <returns>New parcel bitmap</returns>       
+        /// <returns>New parcel bitmap</returns>
         bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax);
 
         byte[] ConvertLandBitmapToBytes();
@@ -177,7 +177,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="url"></param>
         void SetMediaUrl(string url);
-        
+
         /// <summary>
         /// Set the music url for this land parcel
         /// </summary>
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
index 3e12348..3b62ad3 100644
--- a/OpenSim/Framework/IPrimCounts.cs
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -35,12 +35,12 @@ namespace OpenSim.Framework
         /// Parcel owner owned prims
         /// </summary>
         int Owner { get; }
-        
+
         /// <summary>
         /// Parcel group owned prims
         /// </summary>
         int Group { get; }
-        
+
         /// <summary>
         /// Prims owned by others (not parcel owner or parcel group).
         /// </summary>
@@ -48,19 +48,19 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Selected prims
-        /// </summary>        
-        int Selected { get; }        
-        
+        /// </summary>
+        int Selected { get; }
+
         /// <summary>
         /// Total prims on the parcel.
         /// </summary>
         int Total { get; }
-        
+
         /// <summary>
         /// Prims on the simulator that are owned by the parcel owner, even if they are in other parcels.
         /// </summary>
         int Simulator { get; }
-        
+
         /// <summary>
         /// Prims per individual users.
         /// </summary>
diff --git a/OpenSim/Framework/IRegistryCore.cs b/OpenSim/Framework/IRegistryCore.cs
index a94b65d..cf3ecc0 100644
--- a/OpenSim/Framework/IRegistryCore.cs
+++ b/OpenSim/Framework/IRegistryCore.cs
@@ -31,7 +31,7 @@ using System.Text;
 
 namespace OpenSim.Framework
 {
-    public interface IRegistryCore 
+    public interface IRegistryCore
     {
         T Get<T>();
         void RegisterInterface<T>(T iface);
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index e1b6d1e..37a064f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         Crashed = 2,
         Starting = 3,
     };
-            
+
     /// <value>
     /// Indicate what action to take on an object derez request
     /// </value>
@@ -118,7 +118,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="mod"></param>
         void RegisterModuleInterface<M>(M mod);
-        
+
         void StackModuleInterface<M>(M mod);
 
         /// <summary>
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index c8424e3..5534e24 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -81,6 +81,6 @@ namespace OpenSim.Framework
         /// Direction in which the scene presence is looking.
         /// </summary>
         /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
-        Vector3 Lookat { get; }        
+        Vector3 Lookat { get; }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 139776b..d14f3be 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
         /// XPath like expression
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
-        /// 
+        ///
         /// <param name="path">
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index f9fd752..c359a0c 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,17 +34,17 @@ namespace OpenSim.Framework
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
     /// </summary>
     public class InventoryItemBase : InventoryNodeBase, ICloneable
-    {        
+    {
         /// <value>
         /// The inventory type of the item.  This is slightly different from the asset type in some situations.
         /// </value>
-        public int InvType 
-        { 
+        public int InvType
+        {
             get
             {
                 return m_invType;
             }
-            
+
             set
             {
                 m_invType = value;
@@ -55,13 +55,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The folder this item is contained in
         /// </value>
-        public UUID Folder 
-        { 
+        public UUID Folder
+        {
             get
             {
                 return m_folder;
             }
-            
+
             set
             {
                 m_folder = value;
@@ -72,17 +72,17 @@ namespace OpenSim.Framework
         /// <value>
         /// The creator of this item
         /// </value>
-        public string CreatorId 
-        { 
+        public string CreatorId
+        {
             get
             {
-                return m_creatorId; 
+                return m_creatorId;
             }
-            
+
             set
             {
                 m_creatorId = value;
-                
+
                 if ((m_creatorId == null) || !UUID.TryParse(m_creatorId, out m_creatorIdAsUuid))
                     m_creatorIdAsUuid = UUID.Zero;
             }
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
         /// <value>
         /// The CreatorId expressed as a UUID.
         /// </value>
-        public UUID CreatorIdAsUuid 
+        public UUID CreatorIdAsUuid
         {
             get
             {
@@ -161,13 +161,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The description of the inventory item (must be less than 64 characters)
         /// </value>
-        public string Description 
-        { 
+        public string Description
+        {
             get
             {
                 return m_description;
             }
-            
+
             set
             {
                 m_description = value;
@@ -178,13 +178,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint NextPermissions 
-        { 
+        public uint NextPermissions
+        {
             get
             {
                 return m_nextPermissions;
             }
-            
+
             set
             {
                 m_nextPermissions = value;
@@ -195,13 +195,13 @@ namespace OpenSim.Framework
         /// <value>
         /// A mask containing permissions for the current owner (cannot be enforced)
         /// </value>
-        public uint CurrentPermissions 
-        { 
+        public uint CurrentPermissions
+        {
             get
             {
                 return m_currentPermissions;
             }
-            
+
             set
             {
                 m_currentPermissions = value;
@@ -212,13 +212,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint BasePermissions 
-        { 
+        public uint BasePermissions
+        {
             get
             {
                 return m_basePermissions;
             }
-            
+
             set
             {
                 m_basePermissions = value;
@@ -229,13 +229,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint EveryOnePermissions 
-        { 
+        public uint EveryOnePermissions
+        {
             get
             {
                 return m_everyonePermissions;
             }
-            
+
             set
             {
                 m_everyonePermissions = value;
@@ -246,13 +246,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint GroupPermissions 
-        { 
+        public uint GroupPermissions
+        {
             get
             {
                 return m_groupPermissions;
             }
-            
+
             set
             {
                 m_groupPermissions = value;
@@ -263,13 +263,13 @@ namespace OpenSim.Framework
         /// <value>
         /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
         /// </value>
-        public int AssetType 
-        { 
+        public int AssetType
+        {
             get
             {
                 return m_assetType;
             }
-            
+
             set
             {
                 m_assetType = value;
@@ -280,13 +280,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The UUID of the associated asset on the asset server
         /// </value>
-        public UUID AssetID 
-        { 
+        public UUID AssetID
+        {
             get
             {
                 return m_assetID;
             }
-            
+
             set
             {
                 m_assetID = value;
@@ -297,13 +297,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public UUID GroupID 
-        { 
+        public UUID GroupID
+        {
             get
             {
                 return m_groupID;
             }
-            
+
             set
             {
                 m_groupID = value;
@@ -314,13 +314,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public bool GroupOwned 
-        { 
+        public bool GroupOwned
+        {
             get
             {
                 return m_groupOwned;
             }
-                
+
             set
             {
                 m_groupOwned = value;
@@ -331,13 +331,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public int SalePrice 
-        { 
+        public int SalePrice
+        {
             get
             {
                 return m_salePrice;
             }
-            
+
             set
             {
                 m_salePrice = value;
@@ -348,13 +348,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public byte SaleType 
-        { 
+        public byte SaleType
+        {
             get
             {
                 return m_saleType;
             }
-            
+
             set
             {
                 m_saleType = value;
@@ -365,13 +365,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint Flags 
-        { 
+        public uint Flags
+        {
             get
             {
                 return m_flags;
             }
-            
+
             set
             {
                 m_flags = value;
@@ -382,13 +382,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public int CreationDate 
-        { 
+        public int CreationDate
+        {
             get
             {
                 return m_creationDate;
             }
-            
+
             set
             {
                 m_creationDate = value;
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 31c3fd1..9ef36b7 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -41,19 +41,19 @@ namespace OpenSim.Framework
         {
             get { return m_name; }
             set { m_name = value; }
-        } 
+        }
         private string m_name = string.Empty;
-        
+
         /// <summary>
         /// A UUID containing the ID for the inventory node itself
         /// </summary>
-        public UUID ID 
+        public UUID ID
         {
             get { return m_id; }
             set { m_id = value; }
         }
         private UUID m_id;
-        
+
         /// <summary>
         /// The agent who's inventory this is contained by
         /// </summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index cfefe3e..13d2977 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Determines if people are able to teleport where they please on the parcel or if they 
+        /// Determines if people are able to teleport where they please on the parcel or if they
         /// get constrainted to a specific point on teleport within the parcel
         /// </summary>
         public byte LandingType
@@ -667,7 +667,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the location 
+        /// When teleporting is restricted to a certain point, this is the location
         /// that the user will be redirected to
         /// </summary>
         public Vector3 UserLocation
@@ -683,7 +683,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the rotation 
+        /// When teleporting is restricted to a certain point, this is the rotation
         /// that the user will be positioned
         /// </summary>
         public Vector3 UserLookAt
@@ -699,7 +699,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 
+        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
         /// the parcel and isn't set to the same 'group' as the parcel.
         /// </summary>
         public int OtherCleanTime
diff --git a/OpenSim/Framework/Lazy.cs b/OpenSim/Framework/Lazy.cs
index 91de4bd..ea07d0e 100644
--- a/OpenSim/Framework/Lazy.cs
+++ b/OpenSim/Framework/Lazy.cs
@@ -14,10 +14,10 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs
index 7ccbba7..21b8178 100644
--- a/OpenSim/Framework/LocklessQueue.cs
+++ b/OpenSim/Framework/LocklessQueue.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        item = oldHeadNext.Item;                       
+                        item = oldHeadNext.Item;
                         haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
                         if (haveAdvancedHead)
                         {
diff --git a/OpenSim/Framework/MapAndArray.cs b/OpenSim/Framework/MapAndArray.cs
index c98d3cc..32d6978 100644
--- a/OpenSim/Framework/MapAndArray.cs
+++ b/OpenSim/Framework/MapAndArray.cs
@@ -45,9 +45,9 @@ namespace OpenSim.Framework
 
         /// <summary>Number of values currently stored in the collection</summary>
         public int Count { get { return m_array.Length; } }
-        /// <summary>NOTE: This collection is thread safe. You do not need to 
-        /// acquire a lock to add, remove, or enumerate entries. This 
-        /// synchronization object should only be locked for larger 
+        /// <summary>NOTE: This collection is thread safe. You do not need to
+        /// acquire a lock to add, remove, or enumerate entries. This
+        /// synchronization object should only be locked for larger
         /// transactions</summary>
         public object SyncRoot { get { return m_syncRoot; } }
 
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Adds a key/value pair to the collection. This will throw an 
+        /// Adds a key/value pair to the collection. This will throw an
         /// exception if the key is already present in the collection
         /// </summary>
         /// <param name="key">Key to add or update</param>
@@ -166,7 +166,7 @@ namespace OpenSim.Framework
         /// Gets a reference to the immutable array of values stored in this
         /// collection. This array is thread safe for iteration
         /// </summary>
-        /// <returns>A thread safe reference ton an array of all of the stored 
+        /// <returns>A thread safe reference ton an array of all of the stored
         /// values</returns>
         public TValue[] GetArray()
         {
@@ -175,7 +175,7 @@ namespace OpenSim.Framework
 
         private void CreateArray()
         {
-            // Rebuild the array from the dictionary. This method must be 
+            // Rebuild the array from the dictionary. This method must be
             // called from inside a lock
             TValue[] array = new TValue[m_dict.Count];
             int i = 0;
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index c8693ae..348a240 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
             map["Extra2"] = OSD.FromInteger(Extra2);
             return map;
         }
-        
+
         public void FromOSD(OSDMap map)
         {
             x = (uint) map["X"].AsInteger();
diff --git a/OpenSim/Framework/MetricsCollector.cs b/OpenSim/Framework/MetricsCollector.cs
index c8f4a33..391f57e 100644
--- a/OpenSim/Framework/MetricsCollector.cs
+++ b/OpenSim/Framework/MetricsCollector.cs
@@ -42,23 +42,23 @@ namespace OpenSim.Framework
         }
     }
 
-    
+
     struct MetricsBucket<T>
     {
         public T value;
         public int count;
     }
 
-    
+
     /// <summary>
     /// Collects metrics in a sliding window.
     /// </summary>
     /// <remarks>
     /// MetricsCollector provides the current Sum of the metrics that it collects. It can easily be extended
     /// to provide the Average, too. It uses a sliding window to keep these values current.
-    /// 
+    ///
     /// This class is not thread-safe.
-    /// 
+    ///
     /// Subclass MetricsCollector to have it use a concrete value type. Override the abstract methods.
     /// </remarks>
     public abstract class MetricsCollector<T>
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 8c2bec6..e513abd 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Monitoring
 
             return sb.ToString();
         }
-        
+
         public virtual string XReport(string uptime, string version)
         {
             return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
diff --git a/OpenSim/Framework/Monitoring/Checks/Check.cs b/OpenSim/Framework/Monitoring/Checks/Check.cs
index 594386a..9a1bd45 100644
--- a/OpenSim/Framework/Monitoring/Checks/Check.cs
+++ b/OpenSim/Framework/Monitoring/Checks/Check.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
             string category,
             string container,
             Func<Check, bool> checkFunc,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
         {
             if (ChecksManager.SubCommands.Contains(category))
                 throw new Exception(
@@ -108,9 +108,9 @@ namespace OpenSim.Framework.Monitoring
         public virtual string ToConsoleString()
         {
             return string.Format(
-                "{0}.{1}.{2} - {3}", 
-                Category, 
-                Container, 
+                "{0}.{1}.{2} - {3}",
+                Category,
+                Container,
                 ShortName,
                 Description);
         }
diff --git a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
index 40df562..e326e8b 100644
--- a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Monitoring
         /// </summary>
         /// <returns></returns>
         string Report();
-         
+
         /// <summary>
         /// Report back collected statistical information in json
         /// </summary>
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index df6b806..0a39e4b 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Monitoring
         /// <summary>
         /// Is this engine running?
         /// </summary>
-        public bool IsRunning { get; private set; } 
+        public bool IsRunning { get; private set; }
 
         /// <summary>
         /// The current job that the engine is running.
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Monitoring
         /// Controls whether we need to warn in the log about exceeding the max queue size.
         /// </summary>
         /// <remarks>
-        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in 
+        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in
         /// order to avoid spamming the log with lots of warnings.
         /// </remarks>
         private bool m_warnOverMaxQueue = true;
@@ -120,7 +120,7 @@ namespace OpenSim.Framework.Monitoring
         }
 
         public void Stop()
-        {   
+        {
             lock (JobLock)
             {
                 try
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Monitoring
         /// Make a job.
         /// </summary>
         /// <remarks>
-        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to 
+        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to
         /// reduce memory churn.  Normally one would directly call QueueJob() with parameters anyway.
         /// </remarks>
         /// <returns></returns>
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Monitoring
                 CommonId = commonId;
                 Action = action;
             }
-                        
+
             /// <summary>
             /// Make a job.  It needs to be separately queued.
             /// </summary>
diff --git a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
index 756e4ed..2ff2014 100644
--- a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Framework.Monitoring")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index be4a8b4..3391240 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = workerThreads;
                 });
 
             MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = iocpThreads;
                 });
 
@@ -193,10 +193,10 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat(
-                "HTTPRequestsMade", 
-                "Number of outbound HTTP requests made", 
-                "requests", 
-                ContainerNetwork, 
+                "HTTPRequestsMade",
+                "Number of outbound HTTP requests made",
+                "requests",
+                ContainerNetwork,
                 s => s.Value = WebUtil.RequestNumber,
                 MeasuresOfInterest.AverageChangeOverTime);
 
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Monitoring
                                 });
         }
 
-        // Notes on performance counters: 
+        // Notes on performance counters:
         //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 08c2409..88a0297 100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -90,17 +90,17 @@ namespace OpenSim.Framework.Monitoring
 //        /// haven't yet been implemented...
 //        /// </summary>
 //        public long AssetsInCache { get { return assetsInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
 //        public long TexturesInCache { get { return texturesInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
 //        /// </value>
 //        public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
@@ -127,7 +127,7 @@ namespace OpenSim.Framework.Monitoring
         public float PendingUploads { get { return pendingUploads; } }
         public float ActiveScripts { get { return activeScripts; } }
         public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
-        
+
 //        /// <summary>
 //        /// This is the time it took for the last asset request made in response to a cache miss.
 //        /// </summary>
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Monitoring
 //            assetsInCache++;
 //            //assetCacheMemoryUsage += asset.Data.Length;
 //        }
-//        
+//
 //        public void RemoveAsset(UUID uuid)
 //        {
 //            assetsInCache--;
@@ -204,7 +204,7 @@ namespace OpenSim.Framework.Monitoring
 //            texturesInCache = 0;
 //            textureCacheMemoryUsage = 0;
 //        }
-//        
+//
 //        public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
 //        {
 //            assetRequestTimeAfterCacheMiss = ts;
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Monitoring
             StringBuilder sb = new StringBuilder(Environment.NewLine);
 //            sb.Append("ASSET STATISTICS");
 //            sb.Append(Environment.NewLine);
-                        
+
             /*
             sb.Append(
                 string.Format(
@@ -342,7 +342,7 @@ Asset service request failures: {3}" + Environment.NewLine,
             List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives");
 
             sb.AppendFormat(
-                "Client logouts due to no data receive timeout: {0}\n\n", 
+                "Client logouts due to no data receive timeout: {0}\n\n",
                 stats != null ? stats.Sum(s => s.Value).ToString() : "unknown");
 
 //            sb.Append(Environment.NewLine);
@@ -443,10 +443,10 @@ Asset service request failures: {3}" + Environment.NewLine,
             foreach (ProcessThread currentThread in
                 Process.GetCurrentProcess().Threads)
             {
-                // A known issue with the current process .Threads property is 
-                // that it can return null threads, thus don't count those as 
+                // A known issue with the current process .Threads property is
+                // that it can return null threads, thus don't count those as
                 // running threads and prevent the program function from failing
-                if (currentThread != null && 
+                if (currentThread != null &&
                     currentThread.ThreadState == ThreadState.Running)
                 {
                     numberThreadsRunning++;
@@ -505,7 +505,7 @@ Asset service request failures: {3}" + Environment.NewLine,
                 "{0:0.##}", numberThreadsRunning));
             args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}",
                 memUsage));
-            
+
             return args;
         }
     }
@@ -531,12 +531,12 @@ Asset service request failures: {3}" + Environment.NewLine,
         {
             return m_statsProvider.GetStats();
         }
-        
+
         public string XReport(string uptime, string version)
         {
             return "";
         }
-        
+
         public OSDMap OReport(string uptime, string version)
         {
             OSDMap ret = new OSDMap();
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 916fa53..2402acd 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -121,17 +121,17 @@ namespace OpenSim.Framework.Monitoring
             string container,
             StatType type,
             Action<Stat> pullAction,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
                 : this(
-                    shortName, 
-                    name, 
-                    description, 
-                    unitName, 
-                    category, 
-                    container, 
-                    type, 
-                    MeasuresOfInterest.None, 
-                    pullAction, 
+                    shortName,
+                    name,
+                    description,
+                    unitName,
+                    category,
+                    container,
+                    type,
+                    MeasuresOfInterest.None,
+                    pullAction,
                     verbosity)
         {
         }
@@ -227,11 +227,11 @@ namespace OpenSim.Framework.Monitoring
         {
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat(
-                "{0}.{1}.{2} : {3}{4}", 
-                Category, 
-                Container, 
-                ShortName, 
-                Value, 
+                "{0}.{1}.{2} : {3}{4}",
+                Category,
+                Container,
+                ShortName,
+                Value,
                 string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
@@ -290,7 +290,7 @@ namespace OpenSim.Framework.Monitoring
                 lock (m_samples)
                 {
                     //                    m_log.DebugFormat(
-                    //                        "[STAT]: Samples for {0} are {1}", 
+                    //                        "[STAT]: Samples for {0} are {1}",
                     //                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
 
                     foreach (double s in m_samples)
@@ -326,9 +326,9 @@ namespace OpenSim.Framework.Monitoring
             if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
             {
                 sb.AppendFormat(
-                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
-                    lastChangeOverTime, 
-                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s",
+                    lastChangeOverTime,
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName),
                     averageChangeOverTime,
                     string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
             }
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index 15a37aa..b719af9 100644
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -99,13 +99,13 @@ namespace OpenSim.Framework.Monitoring
             }
 
             string path = cmd[2];
-            
+
             using (StreamWriter sw = new StreamWriter(path, true))
             {
                 foreach (string line in GetReport())
                     sw.WriteLine(line);
-            }   
-            
+            }
+
             MainConsole.Instance.OutputFormat("Stats saved to file {0}", path);
         }
 
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 30926d8..55c3276 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Framework.Monitoring
                     {
                         if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
                             continue;
-                        
+
                         OSDMap statMap = new OSDMap();
 
                         SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
@@ -398,7 +398,7 @@ namespace OpenSim.Framework.Monitoring
             {
                 if (!TryGetStatParents(stat, out category, out container))
                     return false;
-                
+
                 if(container != null)
                 {
                     container.Remove(stat.ShortName);
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index ff439f5..9cc61ee 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Monitoring
                 FirstTick = Environment.TickCount & Int32.MaxValue;
                 LastTick = FirstTick;
 
-                Stat 
+                Stat
                     = new Stat(
                         name,
                         string.Format("Last update of thread {0}", name),
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index a7a03a0..43130f9 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -36,16 +36,16 @@ namespace OpenSim.Framework.Monitoring
     /// Manages various work items in the simulator.
     /// </summary>
     /// <remarks>
-    /// Currently, here work can be started 
+    /// Currently, here work can be started
     ///  * As a long-running and monitored thread.
     ///  * In a thread that will never timeout but where the job is expected to eventually complete.
     ///  * In a threadpool thread that will timeout if it takes a very long time to complete (> 10 mins).
     ///  * As a job which will be run in a single-threaded job engine.  Such jobs must not incorporate delays (sleeps,
     /// network waits, etc.).
-    /// 
+    ///
     /// This is an evolving approach to better manage the work that OpenSimulator is asked to do from a very diverse
     /// range of sources (client actions, incoming network, outgoing network calls, etc.).
-    /// 
+    ///
     /// Util.FireAndForget is still available to insert jobs in the threadpool, though this is equivalent to
     /// WorkManager.RunInThreadPool().
     /// </remarks>
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Monitoring
             thread.Priority = priority;
             thread.IsBackground = isBackground;
             thread.Name = name;
-            
+
             Watchdog.ThreadWatchdogInfo twi
                 = new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
             { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Monitoring
         /// <param name="name">Name of the thread</param>
         public static void RunInThread(WaitCallback callback, object obj, string name, bool log = false)
         {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 Culture.SetCurrentCulture();
                 callback(obj);
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Monitoring
         }
 
         /// <summary>
-        /// Run the callback via a threadpool thread. 
+        /// Run the callback via a threadpool thread.
         /// </summary>
         /// <remarks>
         /// Such jobs may run after some delay but must always complete.
@@ -188,17 +188,17 @@ namespace OpenSim.Framework.Monitoring
         /// <remarks>
         /// This differs from direct scheduling (e.g. Util.FireAndForget) in that a job can be run in the job
         /// engine if it is running, where all jobs are currently performed in sequence on a single thread.  This is
-        /// to prevent observed overload and server freeze problems when there are hundreds of connections which all attempt to 
+        /// to prevent observed overload and server freeze problems when there are hundreds of connections which all attempt to
         /// perform work at once (e.g. in conference situations).  With lower numbers of connections, the small
-        /// delay in performing jobs in sequence rather than concurrently has not been notiecable in testing, though a future more 
+        /// delay in performing jobs in sequence rather than concurrently has not been notiecable in testing, though a future more
         /// sophisticated implementation could perform jobs concurrently when the server is under low load.
-        /// 
+        ///
         /// However, be advised that some callers of this function rely on all jobs being performed in sequence if any
         /// jobs are performed in sequence (i.e. if jobengine is active or not).  Therefore, expanding the jobengine
         /// beyond a single thread will require considerable thought.
-        /// 
+        ///
         /// Also, any jobs submitted must be guaranteed to complete within a reasonable timeframe (e.g. they cannot
-        /// incorporate a network delay with a long timeout).  At the moment, work that could suffer such issues 
+        /// incorporate a network delay with a long timeout).  At the moment, work that could suffer such issues
         /// should still be run directly with RunInThread(), Util.FireAndForget(), etc.  This is another area where
         /// the job engine could be improved and so CPU utilization improved by better management of concurrency within
         /// OpenSimulator.
@@ -212,10 +212,10 @@ namespace OpenSim.Framework.Monitoring
         /// <param name="log">If set to true then extra logging is performed.</param>
         public static void RunJob(
             string jobType, WaitCallback callback, object obj, string name,
-            bool canRunInThisThread = false, bool mustNotTimeout = false, 
+            bool canRunInThisThread = false, bool mustNotTimeout = false,
             bool log = false)
         {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 Culture.SetCurrentCulture();
                 callback(obj);
@@ -273,16 +273,16 @@ namespace OpenSim.Framework.Monitoring
                     MainConsole.Instance.Output("Usage: debug jobengine log <level>");
                     return;
                 }
-                
+
                 //                int logLevel;
                 int logLevel = int.Parse(args[3]);
                 //                if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
-                //                {                 
+                //                {
                 JobEngine.LogLevel = logLevel;
                 MainConsole.Instance.OutputFormat("Set debug log level to {0}", JobEngine.LogLevel);
                 //                }
             }
-            else 
+            else
             {
                 MainConsole.Instance.OutputFormat("Unrecognized job engine subcommand {0}", subCommand);
             }
diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs
index 2e94b0d..93c9446 100644
--- a/OpenSim/Framework/NetworkUtil.cs
+++ b/OpenSim/Framework/NetworkUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
     /// Handles NAT translation in a 'manner of speaking'
     /// Allows you to return multiple different external
     /// hostnames depending on the requestors network
-    /// 
+    ///
     /// This enables standard port forwarding techniques
     /// to work correctly with OpenSim.
     /// </summary>
@@ -145,7 +145,7 @@ namespace OpenSim.Framework
                 byte[] subnetBytes = subnet.Value.GetAddressBytes();
                 byte[] localBytes = subnet.Key.GetAddressBytes();
                 byte[] destBytes = destination.GetAddressBytes();
-                
+
                 if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
                     return null;
 
diff --git a/OpenSim/Framework/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index baa3647..ee4707f 100644
--- a/OpenSim/Framework/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Framework
         private List<IPEndPoint> m_blacklistExceptionEndPoints;
 
         public OutboundUrlFilter(
-            string name, 
-            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints, 
+            string name,
+            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints,
             List<IPNetwork> blacklistExceptionNetworks, List<IPEndPoint> blacklistExceptionEndPoints)
         {
             Name = name;
@@ -79,7 +79,7 @@ namespace OpenSim.Framework
             if (networkConfig != null)
             {
                 configBlacklist = networkConfig.GetString("OutboundDisallowForUserScripts", configBlacklist);
-                configBlacklistExceptions 
+                configBlacklistExceptions
                     = networkConfig.GetString("OutboundDisallowForUserScriptsExcept", configBlacklistExceptions);
             }
 
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
             string fullConfigEntry, string filterName, out List<IPNetwork> networks, out List<IPEndPoint> endPoints)
         {
             // Parse blacklist
-            string[] configBlacklistEntries 
+            string[] configBlacklistEntries
                 = fullConfigEntry.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
 
             configBlacklistEntries = configBlacklistEntries.Select(e => e.Trim()).ToArray();
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
                     if (!Uri.TryCreate("http://" + configEntry, UriKind.Absolute, out configEntryUri))
                     {
                         m_log.ErrorFormat(
-                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}", 
+                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}",
                             configEntry, filterName);
 
                         continue;
@@ -184,14 +184,14 @@ namespace OpenSim.Framework
             foreach (IPEndPoint ep in endPoints)
             {
 //                m_log.DebugFormat(
-//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]", 
+//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]",
 //                    addr, port, ep);
 
                 if (addr.Equals(ep.Address) && port == ep.Port)
                 {
 //                    m_log.DebugFormat(
 //                        "[OUTBOUND URL FILTER]: Found [{0}:{1}] in endpoint [{2}]", addr, port, ep);
-                                        
+
                     return true;
                 }
             }
@@ -228,7 +228,7 @@ namespace OpenSim.Framework
 //                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Found [{0}] in blacklist for {1}", url, Name);
 
                         // Check blacklist exceptions
-                        allowed 
+                        allowed
                             = OutboundUrlFilter.IsInNetwork(
                                 addr, url.Port, m_blacklistExceptionNetworks, m_blacklistExceptionEndPoints, Name);
 
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 0117096..0c94fcb 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -44,17 +44,17 @@ namespace OpenSim.Framework
     /// <summary>
     /// Manager for registries and plugins
     /// </summary>
-        public class PluginManager : SetupService
-        {
-                public AddinRegistry PluginRegistry;
+    public class PluginManager : SetupService
+    {
+        public AddinRegistry PluginRegistry;
 
-                public PluginManager(AddinRegistry registry): base (registry)
+        public PluginManager(AddinRegistry registry): base (registry)
         {
-                        PluginRegistry = registry;
+            PluginRegistry = registry;
 
-                }
+        }
 
-                /// <summary>
+        /// <summary>
         /// Installs the plugin.
         /// </summary>
         /// <returns>
@@ -97,14 +97,14 @@ namespace OpenSim.Framework
                 Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id);
                 PluginRegistry.DisableAddin(addin.Id);
                 addin.Enabled = false;
-                
+
                 MainConsole.Instance.Output("Installation Success");
                 ListInstalledAddins(out res);
                 result = res;
                 return true;
-            } 
+            }
             else
-            {                
+            {
                 MainConsole.Instance.Output("Installation Failed");
                 result = res;
                 return false;
@@ -159,11 +159,11 @@ namespace OpenSim.Framework
         {
             Dictionary<string, object> res = new Dictionary<string, object>();
 
-                        Addin[] addins = GetSortedAddinList("RobustPlugin");
-                        if(addins.Count() < 1)
-                        {
-                                MainConsole.Instance.Output("Error!");
-                        }
+            Addin[] addins = GetSortedAddinList("RobustPlugin");
+            if(addins.Count() < 1)
+            {
+                MainConsole.Instance.Output("Error!");
+            }
             int count = 0;
             foreach (Addin addin in addins)
             {
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
                 r["enabled"] = rep.Enabled == true ? true : false;
                 r["name"] = rep.Name;
                 r["url"] = rep.Url;
-                
+
                 res.Add(count.ToString(), r);
                 count++;
             }
@@ -493,7 +493,7 @@ namespace OpenSim.Framework
         }
 
 
-                
+
         #region Util
         private void Testing()
         {
@@ -537,15 +537,15 @@ namespace OpenSim.Framework
 
             ArrayList xlist = new ArrayList();
             ArrayList list = new ArrayList();
-                        try 
-                        {
-                list.AddRange(PluginRegistry.GetAddins());
-                        }
-                        catch (Exception)
-                        {
-                                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
-                                return x;
-                        }
+            try
+            {
+                list.AddRange(PluginRegistry.GetAddins());
+            }
+            catch (Exception)
+            {
+                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
+                return x;
+            }
 
             foreach (Addin addin in list)
             {
@@ -559,5 +559,5 @@ namespace OpenSim.Framework
             return addins;
         }
         #endregion Util
-        }
+    }
 }
diff --git a/OpenSim/Framework/PrimeNumberHelper.cs b/OpenSim/Framework/PrimeNumberHelper.cs
index 477c274..5a1b3b2 100644
--- a/OpenSim/Framework/PrimeNumberHelper.cs
+++ b/OpenSim/Framework/PrimeNumberHelper.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
     public static class PrimeNumberHelper
     {
         /// <summary>
-        /// Precalculated prime numbers. 
+        /// Precalculated prime numbers.
         /// </summary>
         private static readonly int[] Primes = new int[]
                                                    {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6a12a45..29985d2 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -238,8 +238,8 @@ namespace OpenSim.Framework
                 SculptTexture = prim.Sculpt.SculptTexture;
                 SculptType = (byte)prim.Sculpt.Type;
             }
-            else 
-            {  
+            else
+            {
                 SculptType = (byte)OpenMetaverse.SculptType.None;
             }
         }
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index fec01da..5b9185e 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -57,11 +57,11 @@ namespace OpenSim.Framework
         private Dictionary<uint, LookupItem> m_lookupTable;
 
         // internal state used to ensure the deqeues are spread across the priority
-        // queues "fairly". queuecounts is the amount to pull from each queue in 
+        // queues "fairly". queuecounts is the amount to pull from each queue in
         // each pass. weighted towards the higher priority queues
         private uint m_nextQueue = 0;
         private uint m_countFromQueue = 0;
-        // first queues are imediate, so no counts 
+        // first queues are imediate, so no counts
 //        private uint[] m_queueCounts = { 0, 0,          8,  4,  4, 2,  2,   2,  2,  1,  1, 1 };
         private uint[] m_queueCounts = {0,   0,   8,      8,  5,  4, 3,  2,   1,  1,  1,  1};
         // this is                     ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
                 int count = 0;
                 for (int i = 0; i < m_heaps.Length; ++i)
                     count += m_heaps[i].Count;
-                
+
                 return count;
             }
         }
@@ -170,26 +170,26 @@ namespace OpenSim.Framework
                     return true;
                 }
             }
-            
+
             // To get the fair queing, we cycle through each of the
-            // queues when finding an element to dequeue. 
+            // queues when finding an element to dequeue.
             // We pull (NumberOfQueues - QueueIndex) items from each queue in order
             // to give lower numbered queues a higher priority and higher percentage
-            // of the bandwidth. 
-            
+            // of the bandwidth.
+
             // Check for more items to be pulled from the current queue
             if (m_heaps[m_nextQueue].Count > 0 && m_countFromQueue > 0)
             {
                 m_countFromQueue--;
-                
+
                 MinHeapItem item = m_heaps[m_nextQueue].RemoveMin();
                 m_lookupTable.Remove(item.Value.Entity.LocalId);
                 timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                 value = item.Value;
-                
+
                 return true;
             }
-            
+
             // Find the next non-immediate queue with updates in it
             for (uint i = NumberOfImmediateQueues; i < NumberOfQueues; ++i)
             {
@@ -198,7 +198,7 @@ namespace OpenSim.Framework
                     m_nextQueue = NumberOfImmediateQueues;
 
                 m_countFromQueue = m_queueCounts[m_nextQueue];
-                
+
                 if (m_heaps[m_nextQueue].Count > 0)
                 {
                     m_countFromQueue--;
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Reapply the prioritization function to each of the updates currently
-        /// stored in the priority queues. 
+        /// stored in the priority queues.
         /// </summary
         public void Reprioritize(UpdatePriorityHandler handler)
         {
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8f754a5..99e97e8 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Framework
         }
 
         public string MaptileStaticFile { get; private set; }
-        
+
         /// <summary>
         /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
         /// </summary>
@@ -389,17 +389,17 @@ namespace OpenSim.Framework
         /// <summary>
         /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
         /// </summary>
-        
+
         public string ServerURI
         {
-            get { 
+            get {
                 if ( m_serverURI != string.Empty ) {
                     return m_serverURI;
                 } else {
                     return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                 }
-            }            
-            set { 
+            }
+            set {
                 if ( value.EndsWith("/") ) {
                     m_serverURI = value;
                 } else {
@@ -749,10 +749,10 @@ namespace OpenSim.Framework
 
             m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
             allKeys.Remove("PhysicalPrimMax");
-            
+
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
             allKeys.Remove("ClampPrimSize");
-            
+
             m_objectCapacity = config.GetInt("MaxPrims", 15000);
             allKeys.Remove("MaxPrims");
 
@@ -766,12 +766,12 @@ namespace OpenSim.Framework
             string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString());
             if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID))
             {
-                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 
+                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
             }
 
             MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
             allKeys.Remove("MaptileStaticFile");
-            
+
             #endregion
 
             AgentCapacity = config.GetInt("MaxAgents", 100);
@@ -919,10 +919,10 @@ namespace OpenSim.Framework
 
             if (m_physPrimMin > 0)
                 config.Set("PhysicalPrimMax", m_physPrimMin);
-            
+
             if (m_physPrimMax > 0)
                 config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
+
             config.Set("ClampPrimSize", m_clampPrimSize.ToString());
 
             if (m_objectCapacity > 0)
@@ -1038,7 +1038,7 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Free form string describing the type of region", String.Empty, true);
-            
+
             configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                                 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
         }
@@ -1090,7 +1090,7 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Max objects this sim will hold", "15000", true);
-            
+
             configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Max avatars this sim will hold", "100", true);
 
@@ -1307,8 +1307,8 @@ namespace OpenSim.Framework
             kvp["http_port"] = HttpPort.ToString();
             kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
             kvp["internal_port"] = InternalEndPoint.Port.ToString();
-                        // TODO: Remove in next major version
-                        kvp["alternate_ports"] = "False";
+            // TODO: Remove in next major version
+            kvp["alternate_ports"] = "False";
             kvp["server_uri"] = ServerURI;
 
             return kvp;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index dec01ea..c2947a2 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework
             string[] parts = str.Split(',');
             if (parts.Length != 3)
                 throw new ArgumentException("Invalid string: " + str);
-            
+
             SpawnPoint sp = new SpawnPoint();
             sp.Yaw = float.Parse(parts[0]);
             sp.Pitch = float.Parse(parts[1]);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
         public delegate void SaveDelegate(RegionSettings rs);
 
         public event SaveDelegate OnSave;
-        
+
         /// <value>
         /// These appear to be terrain textures that are shipped with the client.
         /// </value>
@@ -454,24 +454,24 @@ namespace OpenSim.Framework
             get { return m_LoadedCreationDateTime; }
             set { m_LoadedCreationDateTime = value; }
         }
-        
+
         public String LoadedCreationDate
         {
-            get 
-            { 
+            get
+            {
                 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                 DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongDateString(); 
+                return stamp.ToLongDateString();
             }
         }
 
         public String LoadedCreationTime
         {
-            get 
-            { 
+            get
+            {
                 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                 DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongTimeString(); 
+                return stamp.ToLongTimeString();
             }
         }
 
diff --git a/OpenSim/Framework/RestClient.cs b/OpenSim/Framework/RestClient.cs
index 26237de..0166d9d 100644
--- a/OpenSim/Framework/RestClient.cs
+++ b/OpenSim/Framework/RestClient.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework
         public void Dispose()
         {
             Dispose(true);
-            GC.SuppressFinalize(this); 
+            GC.SuppressFinalize(this);
         }
 
         protected virtual void Dispose(bool disposing)
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index e66d5be..9458625 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework
             Material = -2
         }
 
-        
+
         #region SL / file extension / content-type conversions
 
         /// <summary>
@@ -175,10 +175,10 @@ namespace OpenSim.Framework
             new TypeMapping(AssetType.Folder, FolderType.CurrentOutfit, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
             new TypeMapping(AssetType.Folder, FolderType.Outfit, "application/vnd.ll.outfitfolder", "outfitfolder"),
             new TypeMapping(AssetType.Folder, FolderType.MyOutfits, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            
+
             // This next mappping is an asset to inventory item mapping.
             // Note: LL stores folders as assets of type Folder = 8, and it has a corresponding InventoryType = 8
-            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server 
+            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server
             new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
 
             // OpenSim specific
@@ -198,7 +198,7 @@ namespace OpenSim.Framework
             inventory2Content = new Dictionary<sbyte, string>();
             content2Asset = new Dictionary<string, sbyte>();
             content2Inventory = new Dictionary<string, sbyte>();
-            
+
             foreach (TypeMapping mapping in MAPPINGS)
             {
                 sbyte assetType = mapping.AssetTypeCode;
@@ -226,7 +226,7 @@ namespace OpenSim.Framework
                 }
             }
         }
-        
+
         public static string SLAssetTypeToContentType(int assetType)
         {
             string contentType;
@@ -406,7 +406,7 @@ namespace OpenSim.Framework
                 if(data[0] == "inv_item")
                 {
                     skipInventoryItem(reader);
-                } 
+                }
                 else if (line.IndexOf('{') >= 0)
                 {
                     throw new NotANotecardFormatException(reader.LineNumber);
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
                 {
                     int length = Int32.Parse(data[2]);
                     notecardString = reader.getBlock(length);
-                } 
+                }
                 else if (line.IndexOf('{') >= 0)
                 {
                     throw new NotANotecardFormatException(reader.LineNumber);
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index ab3c285..9081411 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -72,12 +72,12 @@ namespace OpenSim.Framework.Serialization
         /// Path for region settings.
         /// </value>
         public const string SETTINGS_PATH = "settings/";
-        
+
         /// <value>
         /// Path for region settings.
         /// </value>
         public const string LANDDATA_PATH = "landdata/";
-        
+
         /// <value>
         /// Path for user profiles
         /// </value>
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 55640ac..1523fa9 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -106,13 +106,13 @@ namespace OpenSim.Framework.Serialization.External
                     {
                         errors = true;
                         parseExceptionAction(nodeToFill, nodeName, e);
-                        
+
                         if (xtr.EOF)
                         {
                             m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to unexpected end of XML");
                             break;
                         }
-                        
+
                         if (++numErrors == 10)
                         {
                             m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to too many parsing errors");
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Serialization.External
                         break;
 
                     case XmlNodeType.XmlDeclaration:
-                        // For various reasons, not all serializations have xml declarations (or consistent ones) 
+                        // For various reasons, not all serializations have xml declarations (or consistent ones)
                         // and as it's embedded inside a byte stream we don't need it anyway, so ignore.
                         break;
 
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs
index fa7160f..a1e9d55 100644
--- a/OpenSim/Framework/Serialization/External/OspResolver.cs
+++ b/OpenSim/Framework/Serialization/External/OspResolver.cs
@@ -35,13 +35,13 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Framework.Serialization
 {
     /// <summary>
-    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for 
+    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for
     /// identifying user profiles or supplying a simple name if no profile is available.
     /// </summary>
     public class OspResolver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public const string OSPA_PREFIX = "ospa:";
         public const string OSPA_NAME_KEY = "n";
         public const string OSPA_NAME_VALUE_SEPARATOR = " ";
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Serialization
 
             return null;
         }
-        
+
         /// <summary>
         /// Make an OSPA given a user name
         /// </summary>
@@ -89,17 +89,17 @@ namespace OpenSim.Framework.Serialization
 
 //            m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
 //            System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
-            
+
             return ospa;
         }
-        
+
         /// <summary>
         /// Resolve an osp string into the most suitable internal OpenSim identifier.
         /// </summary>
-        /// 
+        ///
         /// In some cases this will be a UUID if a suitable profile exists on the system.  In other cases, this may
         /// just return the same identifier after creating a temporary profile.
-        /// 
+        ///
         /// <param name="ospa"></param>
         /// <param name="commsManager"></param>
         /// <returns>
@@ -111,14 +111,14 @@ namespace OpenSim.Framework.Serialization
             if (!ospa.StartsWith(OSPA_PREFIX))
             {
 //                m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa);
-                return UUID.Zero;            
+                return UUID.Zero;
             }
 
 //            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
-            
+
             string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
-            
+
             foreach (string tuple in ospaTuples)
             {
                 int tupleSeparatorIndex = tuple.IndexOf(OSPA_PAIR_SEPARATOR);
@@ -128,17 +128,17 @@ namespace OpenSim.Framework.Serialization
                     m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa);
                     continue;
                 }
-                
+
                 string key = tuple.Remove(tupleSeparatorIndex).Trim();
                 string value = tuple.Substring(tupleSeparatorIndex + 1).Trim();
-                
+
                 if (OSPA_NAME_KEY == key)
                     return ResolveOspaName(value, userService);
             }
-            
+
             return UUID.Zero;
         }
-        
+
         /// <summary>
         /// Hash a profile name into a UUID
         /// </summary>
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Serialization
         {
             return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0);
         }
-        
+
         /// <summary>
         /// Resolve an OSPI name by querying existing persistent user profiles.  If there is no persistent user profile
         /// then a temporary user profile is inserted in the cache.
@@ -164,13 +164,13 @@ namespace OpenSim.Framework.Serialization
                 return UUID.Zero;
 
             int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
-            
+
             if (nameSeparatorIndex < 0)
             {
                 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
                 return UUID.Zero;
             }
-            
+
             string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
             string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart();
 
@@ -178,14 +178,14 @@ namespace OpenSim.Framework.Serialization
             if (account != null)
             {
 //                m_log.DebugFormat(
-//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", 
+//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}",
 //                    account.PrincipalID, firstName, lastName);
-                
+
                 return account.PrincipalID;
             }
 //            else
 //            {
-//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);            
+//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);
 //            }
 
             // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
@@ -194,11 +194,11 @@ namespace OpenSim.Framework.Serialization
             tempUserProfile.FirstName = firstName;
             tempUserProfile.SurName = lastName;
             tempUserProfile.ID = HashName(tempUserProfile.Name);
-            
+
             m_log.DebugFormat(
                 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
-            
+
             return tempUserProfile.ID;
             */
 
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 19468c3..617c451 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Serialization.External
         {
             return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
         }
-        
+
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -60,14 +60,14 @@ namespace OpenSim.Framework.Serialization.External
         public static RegionSettings Deserialize(string serializedSettings)
         {
             RegionSettings settings = new RegionSettings();
-            
+
             StringReader sr = new StringReader(serializedSettings);
             XmlTextReader xtr = new XmlTextReader(sr);
-            
+
             xtr.ReadStartElement("RegionSettings");
-         
+
             xtr.ReadStartElement("General");
-           
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -113,10 +113,10 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-            
+
             xtr.ReadEndElement();
             xtr.ReadStartElement("GroundTextures");
-            
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -159,10 +159,10 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-           
+
             xtr.ReadEndElement();
             xtr.ReadStartElement("Terrain");
-            
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -212,19 +212,19 @@ namespace OpenSim.Framework.Serialization.External
 
             xtr.Close();
             sr.Close();
-            
+
             return settings;
         }
-        
+
         public static string Serialize(RegionSettings settings)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
             xtw.Formatting = Formatting.Indented;
             xtw.WriteStartDocument();
-            
+
             xtw.WriteStartElement("RegionSettings");
-            
+
             xtw.WriteStartElement("General");
             xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
             xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("ElevationHighSE", settings.Elevation2SE.ToString());
             xtw.WriteElementString("ElevationHighNE", settings.Elevation2NE.ToString());
             xtw.WriteEndElement();
-            
+
             xtw.WriteStartElement("Terrain");
             xtw.WriteElementString("WaterHeight", settings.WaterHeight.ToString());
             xtw.WriteElementString("TerrainRaiseLimit", settings.TerrainRaiseLimit.ToString());
@@ -275,12 +275,12 @@ namespace OpenSim.Framework.Serialization.External
                     xtw.WriteElementString("SpawnPoint", sp.ToString());
             }
             xtw.WriteEndElement();
-            
+
             xtw.WriteEndElement();
-            
+
             xtw.Close();
             sw.Close();
-            
+
             return sw.ToString();
         }
     }
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 994cede..9b02553 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -36,9 +36,9 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
-    
+
 namespace OpenSim.Framework.Serialization.External
-{        
+{
     /// <summary>
     /// Serialize and deserialize user inventory items as an external format.
     /// </summary>
@@ -49,14 +49,14 @@ namespace OpenSim.Framework.Serialization.External
         private static Dictionary<string, Action<InventoryItemBase, XmlReader>> m_InventoryItemXmlProcessors
             = new Dictionary<string, Action<InventoryItemBase, XmlReader>>();
 
-        #region InventoryItemBase Processor initialization 
+        #region InventoryItemBase Processor initialization
         static UserInventoryItemSerializer()
         {
             m_InventoryItemXmlProcessors.Add("Name", ProcessName);
             m_InventoryItemXmlProcessors.Add("ID", ProcessID);
             m_InventoryItemXmlProcessors.Add("InvType", ProcessInvType);
             m_InventoryItemXmlProcessors.Add("CreatorUUID", ProcessCreatorUUID);
-            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID); 
+            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID);
             m_InventoryItemXmlProcessors.Add("CreatorData", ProcessCreatorData);
             m_InventoryItemXmlProcessors.Add("CreationDate", ProcessCreationDate);
             m_InventoryItemXmlProcessors.Add("Owner", ProcessOwner);
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Serialization.External
             m_InventoryItemXmlProcessors.Add("GroupID", ProcessGroupID);
             m_InventoryItemXmlProcessors.Add("GroupOwned", ProcessGroupOwned);
         }
-        #endregion 
+        #endregion
 
         #region InventoryItemBase Processors
         private static void ProcessName(InventoryItemBase item, XmlReader reader)
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Serialization.External
         {
             return Deserialize(Encoding.ASCII.GetString(serialization, 0, serialization.Length));
         }
-        
+
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -212,8 +212,8 @@ namespace OpenSim.Framework.Serialization.External
 
             //m_log.DebugFormat("[XXX]: parsed InventoryItemBase {0} - {1}", obj.Name, obj.UUID);
             return item;
-        }      
-        
+        }
+
         public static string Serialize(InventoryItemBase inventoryItem, Dictionary<string, object> options, IUserAccountService userAccountService)
         {
             StringWriter sw = new StringWriter();
@@ -294,11 +294,11 @@ namespace OpenSim.Framework.Serialization.External
             }
 
             writer.WriteEndElement();
-            
+
             writer.Close();
             sw.Close();
-            
+
             return sw.ToString();
-        }        
+        }
     }
 }
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index c685a15..34eaa99 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -42,31 +42,31 @@ namespace OpenSim.Framework.Serialization.External
     {
         public const int MAJOR_VERSION = 0;
         public const int MINOR_VERSION = 1;
-        
+
         public static string Serialize(UUID userID, string firstName, string lastName)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
             xtw.Formatting = Formatting.Indented;
             xtw.WriteStartDocument();
-            
+
             xtw.WriteStartElement("user_profile");
             xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
             xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
-                       
+
             xtw.WriteElementString("name", firstName + " " + lastName);
             xtw.WriteElementString("id", userID.ToString());
             xtw.WriteElementString("about", "");
-  
+
             // Not sure if we're storing this yet, need to take a look
 //            xtw.WriteElementString("Url", profile.Url);
             // or, indeed, interests
 
             xtw.WriteEndElement();
-            
+
             xtw.Close();
             sw.Close();
-            
+
             return sw.ToString();
         }
     }
diff --git a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
index f2060ab..7dfb87b 100644
--- a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Framework.Serialization")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 2a3bc48..a5c3d0a 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Serialization
             lock (m_bw)
             {
                 m_bw.Write(finalZeroPadding);
-    
+
                 m_bw.Flush();
                 m_bw.Close();
             }
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Serialization
         {
 //            m_log.DebugFormat(
 //                "[TAR ARCHIVE WRITER]: Data for {0} is {1} bytes", filePath, (null == data ? "null" : data.Length.ToString()));
-                  
+
             byte[] header = new byte[512];
 
             // file path field (100)
@@ -208,18 +208,18 @@ namespace OpenSim.Framework.Serialization
             {
                 // Write out header
                 m_bw.Write(header);
-    
+
                 // Write out data
                 // An IOException occurs if we try to write out an empty array in Mono 2.6
                 if (data.Length > 0)
                     m_bw.Write(data);
-    
+
                 if (data.Length % 512 != 0)
                 {
                     int paddingRequired = 512 - (data.Length % 512);
-    
+
                     //m_log.DebugFormat("[TAR ARCHIVE WRITER]: Padding data with {0} bytes", paddingRequired);
-    
+
                     byte[] padding = new byte[paddingRequired];
                     m_bw.Write(padding);
                 }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 1d4deac..f761813 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -68,9 +68,9 @@ namespace OpenSim.Framework.Servers
 
         private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
         private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
-        
+
         /// <summary>
-        /// Random uuid for private data 
+        /// Random uuid for private data
         /// </summary>
         protected string m_osSecret = String.Empty;
 
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Servers
             // Random uuid for private data
             m_osSecret = UUID.Random().ToString();
         }
-        
+
         /// <summary>
         /// Must be overriden by child classes for their own server specific startup behaviour.
         /// </summary>
@@ -104,10 +104,10 @@ namespace OpenSim.Framework.Servers
                 m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS;
                 m_periodicDiagnosticsTimer.Enabled = true;
             }
-        }       
+        }
 
         protected override void ShutdownSpecific()
-        {            
+        {
             m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
 
             RemovePIDFile();
@@ -117,12 +117,12 @@ namespace OpenSim.Framework.Servers
             if (!SuppressExit)
                 Environment.Exit(0);
         }
-        
+
         /// <summary>
         /// Provides a list of help topics that are available.  Overriding classes should append their topics to the
         /// information returned when the base method is called.
         /// </summary>
-        /// 
+        ///
         /// <returns>
         /// A list of strings that represent different help topics on which more information is available
         /// </returns>
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Servers
         public virtual void Startup()
         {
             m_log.Info("[STARTUP]: Beginning startup processing");
-            
+
             m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine);
             // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
             // the clr version number doesn't match the project version number under Mono.
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers
             m_log.InfoFormat(
                 "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
                 Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
-            
+
             try
             {
                 StartupSpecific();
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Servers
                     (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
                 Environment.Exit(1);
             }
-            
+
             TimeSpan timeTaken = DateTime.Now - m_startuptime;
-            
+
 //            MainConsole.Instance.OutputFormat(
 //                "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.  Non-script portion of startup took {0}m {1}s.",
 //                timeTaken.Minutes, timeTaken.Seconds);
         }
 
-        public string osSecret 
+        public string osSecret
         {
             // Secret uuid for the simulator
-            get { return m_osSecret; }            
+            get { return m_osSecret; }
         }
 
         public string StatReport(IOSHttpRequest httpRequest)
@@ -187,8 +187,8 @@ namespace OpenSim.Framework.Servers
             if (httpRequest.Query.ContainsKey("callback"))
             {
                 return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
-            } 
-            else 
+            }
+            else
             {
                 return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index e431042..fb92b92 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         /// <summary>
         /// This is a pending websocket request before it got an sucessful upgrade response.
-        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to 
+        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to
         /// start the connection and optionally provide an origin authentication method.
         /// </summary>
         /// <param name="servicepath"></param>
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             new Dictionary<string, PollServiceEventArgs>();
 
         protected Dictionary<string, WebSocketRequestDelegate> m_WebSocketHandlers =
-            new Dictionary<string, WebSocketRequestDelegate>(); 
+            new Dictionary<string, WebSocketRequestDelegate>();
 
         protected uint m_port;
         protected uint m_sslport;
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 return new List<string>(m_rpcHandlers.Keys);
         }
 
-        // JsonRPC 
+        // JsonRPC
         public bool AddJsonRPCHandler(string method, JsonRPCMethod handler)
         {
             lock(jsonRpcHandlers)
@@ -459,11 +459,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHttpServerHandler(req, context, 8192));
                 return;
             }
-            
+
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
             resp.ReuseContext = true;
 //            resp.ReuseContext = false;
-            HandleRequest(req, resp);           
+            HandleRequest(req, resp);
 
             // !!!HACK ALERT!!!
             // There seems to be a bug in the underlying http code that makes subsequent requests
@@ -554,7 +554,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         LogIncomingToStreamHandler(request, requestHandler);
 
                     response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
-                    
+
                     if (requestHandler is IStreamedRequestHandler)
                     {
                         IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -630,16 +630,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                         case "text/html":
                             if (DebugLevel >= 3)
                                 LogIncomingToContentTypeHandler(request);
-    
+
                             buffer = HandleHTTPRequest(request, response);
                             break;
-    
+
                         case "application/llsd+xml":
                         case "application/xml+llsd":
                         case "application/llsd+json":
                             if (DebugLevel >= 3)
                                 LogIncomingToContentTypeHandler(request);
-    
+
                             buffer = HandleLLSDRequests(request, response);
                             break;
 
@@ -649,7 +649,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                             buffer = HandleJsonRpcRequests(request, response);
                             break;
-    
+
                         case "text/xml":
                         case "application/xml":
                         case "application/json":
@@ -666,7 +666,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToContentTypeHandler(request);
-    
+
                                 buffer = HandleLLSDRequests(request, response);
                             }
     //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
@@ -674,18 +674,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToContentTypeHandler(request);
-    
+
                                 buffer = HandleHTTPRequest(request, response);
                             }
                             else
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToXmlRpcHandler(request);
-    
+
                                 // generic login request.
                                 buffer = HandleXmlRpcRequests(request, response);
                             }
-    
+
                             break;
                     }
                 }
@@ -972,7 +972,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        private bool TryGetAgentHandler(OSHttpRequest request, OSHttpResponse response, out IHttpAgentHandler agentHandler)
 //        {
 //            agentHandler = null;
-//            
+//
 //            lock (m_agentHandlers)
 //            {
 //                foreach (IHttpAgentHandler handler in m_agentHandlers.Values)
@@ -1171,7 +1171,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             return buffer;
         }
 
-        // JsonRpc (v2.0 only) 
+        // JsonRpc (v2.0 only)
         // Batch requests not yet supported
         private byte[] HandleJsonRpcRequests(OSHttpRequest request, OSHttpResponse response)
         {
@@ -1188,7 +1188,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 jsonRpcResponse.Error.Code = ErrorCode.InternalError;
                 jsonRpcResponse.Error.Message = e.Message;
             }
-            
+
             requestStream.Close();
 
             if (jsonRpcRequest != null)
@@ -1253,7 +1253,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             string responseData = string.Empty;
 
             responseData = jsonRpcResponse.Serialize();
-       
+
             byte[] buffer = Encoding.UTF8.GetBytes(responseData);
             return buffer;
         }
@@ -1533,7 +1533,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                     }
                 }
-    
+
                 if (String.IsNullOrEmpty(bestMatch))
                 {
                     llsdHandler = null;
@@ -1899,8 +1899,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
-            
-                
+
+
             return buffer;
         }
 
@@ -1977,7 +1977,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 throw e;
             }
 
-            m_requestsProcessedStat 
+            m_requestsProcessedStat
                 = new Stat(
                     "HTTPRequestsServed",
                     "Number of inbound HTTP requests processed",
@@ -1989,7 +1989,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     MeasuresOfInterest.AverageChangeOverTime,
                     stat => stat.Value = RequestNumber,
                     StatVerbosity.Debug);
-          
+
             StatsManager.RegisterStat(m_requestsProcessedStat);
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index d4a1ec3..01d95e9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -69,13 +69,13 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 StatsManager.RegisterStat(
                     new Stat(
-                    "requests", 
-                    "requests", 
-                    "Number of requests received by this service endpoint", 
-                    "requests", 
-                    "service", 
-                    string.Format("{0}:{1}", httpMethod, path), 
-                    StatType.Pull, 
+                    "requests",
+                    "requests",
+                    "Number of requests received by this service endpoint",
+                    "requests",
+                    "service",
+                    string.Format("{0}:{1}", httpMethod, path),
+                    StatType.Pull,
                     MeasuresOfInterest.AverageChangeOverTime,
                     s => s.Value = RequestsReceived,
                     StatVerbosity.Debug));
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index 41aa19b..7fc9f0b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             : base(httpMethod, path, name, description) {}
 
         protected BaseStreamHandler(string httpMethod, string path, IServiceAuth auth)
-            : base(httpMethod, path, null, null) 
+            : base(httpMethod, path, null, null)
         {
             m_Auth = auth;
         }
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 HttpStatusCode statusCode;
 
                 if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out statusCode))
-                {                
+                {
                     httpResponse.StatusCode = (int)statusCode;
                     httpResponse.ContentType = "text/plain";
                     return new byte[0];
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 1b88545..9619e03 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     /// </remarks>
     public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
     {
-       
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 result = ThrottledRequest(path, request, httpRequest, httpResponse);
             if (_options.MaxConcurrentSessions > 0)
                 _dosProtector.ProcessEnd(clientstring, endpoint);
-            
+
             RequestsHandled++;
 
             return result;
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             return new byte[0];
         }
 
-        
+
         private string GetRemoteAddr(IOSHttpRequest httpRequest)
         {
             string remoteaddr = string.Empty;
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 clientstring = GetRemoteAddr(httpRequest);
 
             return clientstring;
-           
+
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index cd4b8ff..98d33e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private readonly GenericHTTPMethod _normalMethod;
         private readonly GenericHTTPMethod _throttledMethod;
-      
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-            
+
             _options = options;
             _dosProtector = new BasicDOSProtector(_options);
         }
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return process;
         }
-        
+
         private string GetRemoteAddr(Hashtable request)
         {
             string remoteaddr = "";
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index d162bc1..3a04074 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -45,26 +45,26 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        // the handlers - it is NOT required to be an actual agent header
 //        // value.
 //        bool AddAgentHandler(string agent, IHttpAgentHandler handler);
-        
+
         /// <summary>
         /// Add a handler for an HTTP request.
         /// </summary>
         /// <remarks>
-        /// This handler can actually be invoked either as 
-        /// 
-        /// http://<hostname>:<port>/?method=<methodName> 
-        /// 
+        /// This handler can actually be invoked either as
+        ///
+        /// http://<hostname>:<port>/?method=<methodName>
+        ///
         /// or
-        /// 
+        ///
         /// http://<hostname>:<port><method>
-        /// 
+        ///
         /// if the method name starts with a slash.  For example, AddHTTPHandler("/object/", ...) on a standalone region
         /// server will register a handler that can be invoked with either
-        /// 
+        ///
         /// http://localhost:9000/?method=/object/
-        /// 
+        ///
         /// or
-        /// 
+        ///
         /// http://localhost:9000/object/
         ///
         /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="handler">handle the LLSD response</param>
         /// <returns></returns>
         bool AddLLSDHandler(string path, LLSDMethod handler);
-        
+
         /// <summary>
         /// Add a stream handler to the http server.  If the handler already exists, then nothing happens.
         /// </summary>
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive);
 
         bool AddJsonRPCHandler(string method, JsonRPCMethod handler);
-        
+
         /// <summary>
         /// Websocket HTTP server handlers.
         /// </summary>
@@ -108,7 +108,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
 
         void RemoveWebSocketHandler(string servicepath);
-       
+
         /// <summary>
         /// Gets the XML RPC handler for given method name
         /// </summary>
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        /// <param name="handler"></param>
 //        /// <returns></returns>
 //        bool RemoveAgentHandler(string agent, IHttpAgentHandler handler);
-        
+
         /// <summary>
         /// Remove an HTTP handler
         /// </summary>
@@ -134,15 +134,15 @@ namespace OpenSim.Framework.Servers.HttpServer
         void RemoveHTTPHandler(string httpMethod, string path);
 
         void RemovePollServiceHTTPHandler(string httpMethod, string path);
-        
+
         bool RemoveLLSDHandler(string path, LLSDMethod handler);
-        
+
         void RemoveStreamHandler(string httpMethod, string path);
 
         void RemoveXmlRPCHandler(string method);
 
         void RemoveJsonRPCHandler(string method);
-        
+
         string GetHTTP404(string host);
 
         string GetHTTP500();
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index b8541cb..62d92fb 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         void Handle(string path, Stream request, Stream response, IOSHttpRequest httpReqbuest, IOSHttpResponse httpResponse);
     }
-    
+
     public interface IGenericHTTPHandler : IRequestHandler
     {
         Hashtable Handle(string path, Hashtable request);
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
index f3faf4f..411ee31 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     public class JsonRpcRequestManager
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public JsonRpcRequestManager()
         {
         }
@@ -188,6 +188,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return true;
         }
-    
+
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
index 2c50587..91d284b 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
 
             }
-            return result; 
+            return result;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 05ec6dc..1a6b8cf 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -155,11 +155,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private string _userAgent;
 
         internal IHttpRequest IHttpRequest
-        { 
+        {
             get { return _request; }
         }
 
-        internal IHttpClientContext IHttpClientContext 
+        internal IHttpClientContext IHttpClientContext
         {
             get { return _context; }
         }
@@ -192,19 +192,19 @@ namespace OpenSim.Framework.Servers.HttpServer
                     // ignore
                 }
             }
-            
+
             if (null != req.Headers["content-type"])
                 _contentType = _request.Headers["content-type"];
             if (null != req.Headers["user-agent"])
                 _userAgent = req.Headers["user-agent"];
-            
+
             if (null != req.Headers["remote_addr"])
             {
                 try
                 {
                     IPAddress addr = IPAddress.Parse(req.Headers["remote_addr"]);
                     // sometimes req.Headers["remote_port"] returns a comma separated list, so use
-                    // the first one in the list and log it 
+                    // the first one in the list and log it
                     string[] strPorts = req.Headers["remote_port"].Split(new char[] { ',' });
                     if (strPorts.Length > 1)
                     {
@@ -216,7 +216,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (FormatException)
                 {
-                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring", 
+                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring",
                                      req.Headers["remote_addr"], req.Headers["remote_port"]);
                 }
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index ccf9c91..d7744fc 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public bool KeepAlive
         {
-            get 
+            get
             {
                 return _httpResponse.Connection == ConnectionType.KeepAlive;
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
index a736c8b..88e3068 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// 300 Redirect: different presentation forms available, take a pick
         /// </summary>
         RedirectMultipleChoices = 300,
-        
+
         /// <summary>
         /// 301 Redirect: requested resource has moved and now lives somewhere else
         /// </summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 3fd3bf7..8ace7a9 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         public RequestMethod Request;
         public UUID Id;
         public int TimeOutms;
-        public EventType Type;    
+        public EventType Type;
 
         public enum EventType : int
         {
             LongPoll = 0,
             LslHttp = 1,
             Inventory = 2,
-            Texture = 3, 
+            Texture = 3,
             Mesh = 4
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index ffcad0f..936146d 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             startInfo.ThreadPoolName = "PoolService";
 
             m_threadPool = new SmartThreadPool(startInfo);
-                
+
         }
 
         public void Start()
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 true,
                 null,
                 1000 * 60 * 10);
-                                
+
 
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 398179f..9b663ba 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Framework.Servers.HttpServer")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index ad69cd2..68073c1 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -291,5 +291,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                 serializer.Serialize(xmlWriter, response);
             }
         }
-    }   
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index c2925e3..c8af90f 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public event PongDelegate OnPong;
 
         /// <summary>
-        /// This is a regular HTTP Request...    This may be removed in the future.   
+        /// This is a regular HTTP Request...    This may be removed in the future.
         /// </summary>
 //        public event RegularHttpRequestDelegate OnRegularHttpRequest;
 
@@ -93,9 +93,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// When the websocket is closed, this will be fired.
         /// </summary>
         public event CloseDelegate OnClose;
-        
+
         /// <summary>
-        /// Set this delegate to allow your module to validate the origin of the 
+        /// Set this delegate to allow your module to validate the origin of the
         /// Websocket request.  Primary line of defense against cross site scripting
         /// </summary>
         public ValidateHandshake HandshakeValidateMethodOverride = null;
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     throw new InvalidOperationException("The socket has been shutdown");
                 }
-            } 
+            }
             set
             {
                 if (_networkContext != null && _networkContext.Socket != null)
@@ -194,8 +194,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// This triggers the websocket to start the upgrade process...  
-        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead 
+        /// This triggers the websocket to start the upgrade process...
+        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead
         /// of the more context appropriate HandshakeAndUpgrade()
         /// </summary>
         public void Start()
@@ -261,7 +261,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     acceptKey = GenerateAcceptKey(websocketKey);
                     string rawaccept = string.Format(HandshakeAcceptText, acceptKey);
                     SendUpgradeSuccess(rawaccept);
-                    
+
 
                 }
                 else
@@ -282,7 +282,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// Generates a handshake response key string based on the client's 
+        /// Generates a handshake response key string based on the client's
         /// provided key to prove to the client that we're allowing the Websocket
         /// upgrade of our own free will and we were not coerced into doing it.
         /// </summary>
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             SHA1 hashobj = SHA1.Create();
             string ret = Convert.ToBase64String(hashobj.ComputeHash(Encoding.UTF8.GetBytes(acceptkey)));
             hashobj.Clear();
-            
+
             return ret;
         }
 
@@ -310,11 +310,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             // Create a new websocket state so we can keep track of data in between network reads.
             WebSocketState socketState = new WebSocketState() { ReceivedBytes = new List<byte>(), Header = WebsocketFrameHeader.HeaderDefault(), FrameComplete = true};
-            
+
             byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(pHandshakeResponse);
 
-            
-           
+
+
 
             try
             {
@@ -324,7 +324,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 // Begin reading the TCP stream before writing the Upgrade success message to the other side of the stream.
                 _networkContext.Stream.BeginRead(_buffer, 0, _bufferLength, OnReceive, socketState);
-                
+
                 // Write the upgrade handshake success message
                 _networkContext.Stream.Write(bhandshakeResponse, 0, bhandshakeResponse.Length);
                 _networkContext.Stream.Flush();
@@ -345,7 +345,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             catch (ObjectDisposedException)
             {
                 Close(string.Empty);
-            }           
+            }
         }
 
         /// <summary>
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         /// <summary>
         /// This is our ugly Async OnReceive event handler.
-        /// This chunks the input stream based on the length of the provided buffer and processes out 
+        /// This chunks the input stream based on the length of the provided buffer and processes out
         /// as many frames as it can.   It then moves the unprocessed data to the beginning of the buffer.
         /// </summary>
         /// <param name="ar">Our Async State from beginread</param>
@@ -390,7 +390,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 if (_bufferPosition > _bufferLength)
                 {
-                    // Message too big for chunksize..   not sure how this happened...  
+                    // Message too big for chunksize..   not sure how this happened...
                     //Close(string.Empty);
                 }
 
@@ -413,7 +413,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             if (pheader.PayloadLen > (ulong) _maxPayloadBytes)
                             {
                                 Close("Invalid Payload size");
-                                
+
                                 return;
                             }
                             if (pheader.PayloadLen > 0)
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             _socketState.ReceivedBytes.Clear();
                             _socketState.ExpectedBytes = 0;
                             // do some processing
-                        }                       
+                        }
                     }
                 }
                 if (offset > 0)
@@ -504,7 +504,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 else
                 {
-                    // We can't read the stream anymore...  
+                    // We can't read the stream anymore...
                 }
             }
             catch (IOException)
@@ -533,7 +533,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             textMessageFrame.Header.Opcode = WebSocketReader.OpCode.Text;
             textMessageFrame.Header.IsEnd = true;
             SendSocket(textMessageFrame.ToBytes());
-            
+
         }
 
         public void SendData(byte[] data)
@@ -657,7 +657,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     SendSocket(pongFrame.ToBytes());
                     break;
                 case WebSocketReader.OpCode.Pong:
-                 
+
                     PongDelegate pongD = OnPong;
                     if (pongD != null)
                     {
@@ -701,7 +701,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         {
                             textD(this, new WebsocketTextEventArgs() { Data = Encoding.UTF8.GetString(psocketState.ReceivedBytes.ToArray()) });
                         }
-                        
+
                         // Send Done Event!
                     }
                     break;
@@ -719,7 +719,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     {
                         if (psocketState.ContinuationFrame.Header.Opcode == WebSocketReader.OpCode.Text)
                         {
-                            // Send Done event    
+                            // Send Done event
                             TextDelegate textD = OnText;
                             if (textD != null)
                             {
@@ -744,9 +744,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                     break;
                 case WebSocketReader.OpCode.Close:
                     Close(string.Empty);
-                    
+
                     break;
-               
+
             }
             psocketState.Header.SetDefault();
             psocketState.ReceivedBytes.Clear();
@@ -837,12 +837,12 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader, 
+        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader,
         /// and an int to move the buffer forward when it reads a header.  False when it can't read a header
         /// </summary>
         /// <param name="pBuffer">Bytes read from the stream</param>
         /// <param name="pOffset">Starting place in the stream to begin trying to read from</param>
-        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the 
+        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the
         /// buffer's length is larger then the data in it</param>
         /// <param name="oHeader">Outputs the read WebSocket frame header</param>
         /// <param name="moveBuffer">Informs the calling stream to move the buffer forward</param>
@@ -897,7 +897,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     oHeader.PayloadLen = BitConverter.ToUInt16(pBuffer, pOffset + index);
                     index += 2;
                     break;
-                case 127:   // we got more this is a bigger frame  
+                case 127:   // we got more this is a bigger frame
                     // 8 bytes - uint64 - most significant bit 0  network byte order
                     minumheadersize += 8;
                     if (length < minumheadersize)
@@ -909,7 +909,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     oHeader.PayloadLen = BitConverter.ToUInt64(pBuffer, pOffset + index);
                     index += 8;
                     break;
-                
+
             }
             //oHeader.PayloadLeft = oHeader.PayloadLen; // Start the count in case it's chunked over the network.  This is different then frame fragmentation
             if (oHeader.IsMasked)
@@ -937,9 +937,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         /*
          * RFC6455
 nib   0       1       2       3       4       5       6       7
-byt   0               1               2               3               
-dec   0                   1                   2                   3   
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+byt   0               1               2               3
+dec   0                   1                   2                   3
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
      +-+-+-+-+-------+-+-------------+-------------------------------+
      |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
      |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           +
@@ -963,7 +963,7 @@ dec   0                   1                   2                   3
         public static readonly WebSocketFrame DefaultFrame = new WebSocketFrame(){Header = new WebsocketFrameHeader(),WebSocketPayload = new byte[0]};
         public WebsocketFrameHeader Header;
         public byte[] WebSocketPayload;
-        
+
         public byte[] ToBytes()
         {
             Header.PayloadLen = (ulong)WebSocketPayload.Length;
@@ -991,7 +991,7 @@ dec   0                   1                   2                   3
         public int Mask;
         /*
 byt   0               1               2               3
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
      +---------------+---------------+---------------+---------------+
      |    Octal 1    |    Octal 2    |    Octal 3    |    Octal 4    |
      +---------------+---------------+---------------+---------------+
@@ -1002,11 +1002,11 @@ byt   0               1               2               3
 
         public UInt64 PayloadLen;
         //public UInt64 PayloadLeft;
-        // Payload is X + Y   
+        // Payload is X + Y
         //public UInt64 ExtensionDataLength;
         //public UInt64 ApplicationDataLength;
         public static readonly WebsocketFrameHeader ZeroHeader = WebsocketFrameHeader.HeaderDefault();
-       
+
         public void SetDefault()
         {
 
@@ -1025,16 +1025,16 @@ byt   0               1               2               3
         /// <summary>
         /// Returns a byte array representing the Frame header
         /// </summary>
-        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload. 
+        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload.
         /// If payload is null, a Zero sized payload is assumed</param>
         /// <returns>Returns a byte array representing the frame header</returns>
         public byte[] ToBytes(byte[] payload)
         {
             List<byte> result = new List<byte>();
-           
+
             // Squeeze in our opcode and our ending bit.
             result.Add((byte)((byte)Opcode | (IsEnd?0x80:0x00) ));
-           
+
             // Again with the three different byte interpretations of size..
 
             //bytesize
@@ -1056,7 +1056,7 @@ byt   0               1               2               3
                 Array.Reverse(payloadLengthByte);
                 result.AddRange(payloadLengthByte);
             }
-            
+
             // Only add a payload if it's not null
             if (payload != null)
             {
@@ -1155,5 +1155,5 @@ byt   0               1               2               3
 
     }
 
-   
+
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index f212208..6b2c0ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private readonly XmlRpcMethod _normalMethod;
         private readonly XmlRpcMethod _throttledMethod;
-       
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-           
+
             _options = options;
             _dosProtector = new BasicDOSProtector(_options);
 
@@ -87,5 +87,5 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     }
 
-    
+
 }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 57931d4..ea7b2b5 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -223,11 +223,11 @@ namespace OpenSim.Framework.Servers
                 {
                     handlers.AppendFormat(
                         "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port);
-        
+
                     handlers.AppendFormat("* XMLRPC:\n");
                     foreach (String s in httpServer.GetXmlRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* HTTP:\n");
                     foreach (String s in httpServer.GetHTTPHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -235,19 +235,19 @@ namespace OpenSim.Framework.Servers
                     handlers.AppendFormat("* HTTP (poll):\n");
                     foreach (String s in httpServer.GetPollServiceHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-                    
+
                     handlers.AppendFormat("* JSONRPC:\n");
                     foreach (String s in httpServer.GetJsonRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
 //                    handlers.AppendFormat("* Agent:\n");
 //                    foreach (String s in httpServer.GetAgentHandlerKeys())
 //                        handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* LLSD:\n");
                     foreach (String s in httpServer.GetLLSDHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count);
                     foreach (String s in httpServer.GetStreamHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.Servers
         {
             if (port == 0)
                 return Instance;
-            
+
             if (instance != null && port == Instance.Port)
                 return Instance;
 
diff --git a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
index 792c62e..4469e7c 100644
--- a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Framework.Servers")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 7b806a4..8965e71 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Servers
         protected ICommandConsole m_console;
 
         protected OpenSimAppender m_consoleAppender;
-        protected FileAppender m_logFileAppender; 
+        protected FileAppender m_logFileAppender;
 
         protected DateTime m_startuptime;
         protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers
         {
             if (File.Exists(path))
                 m_log.ErrorFormat(
-                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.", 
+                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.",
                     path);
 
             try
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Servers
                 m_log.Warn(string.Format("[SERVER BASE]: Could not create PID file at {0} ", path), e);
             }
         }
-           
+
         protected void RemovePIDFile()
         {
             if (m_pidFile != String.Empty)
@@ -166,11 +166,11 @@ namespace OpenSim.Framework.Servers
             {
                 // FIXME: This should be done through an interface rather than casting.
                 m_consoleAppender.Console = (ConsoleBase)m_console;
-                
+
                 // If there is no threshold set then the threshold is effectively everything.
                 if (null == m_consoleAppender.Threshold)
                     m_consoleAppender.Threshold = Level.All;
-                
+
                 Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
             }
 
@@ -205,11 +205,11 @@ namespace OpenSim.Framework.Servers
                 "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
 
             m_console.Commands.AddCommand(
-                "General", false, "get log level", "get log level", "Get the current console logging level", 
+                "General", false, "get log level", "get log level", "Get the current console logging level",
                 (mod, cmd) => ShowLogLevel());
 
             m_console.Commands.AddCommand(
-                "General", false, "set log level", "set log level <level>", 
+                "General", false, "set log level", "set log level <level>",
                 "Set the console logging level for this session.", HandleSetLogLevel);
 
             m_console.Commands.AddCommand(
@@ -222,14 +222,14 @@ namespace OpenSim.Framework.Servers
                 "config get [<section>] [<key>]",
                 "Synonym for config show",
                 HandleConfig);
-            
+
             m_console.Commands.AddCommand(
                 "General", false, "config show",
                 "config show [<section>] [<key>]",
-                "Show config information", 
+                "Show config information",
                 "If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine
                 + "If a section is given but not a field, then all fields in that section are printed.",
-                HandleConfig);            
+                HandleConfig);
 
             m_console.Commands.AddCommand(
                 "General", false, "config save",
@@ -280,7 +280,7 @@ namespace OpenSim.Framework.Servers
                 "debug threadpool status",
                 "Show current debug threadpool parameters.",
                 HandleDebugThreadpoolStatus);
-            
+
             m_console.Commands.AddCommand(
                 "Debug", false, "debug threadpool level",
                 "debug threadpool level 0.." + Util.MAX_THREADPOOL_LEVEL,
@@ -332,7 +332,7 @@ namespace OpenSim.Framework.Servers
             {
                 WebUtil.SerializeOSDRequestsPerEndpoint = networkConfig.GetBoolean("SerializeOSDRequests", false);
             }
-    
+
             m_serverStatsCollector = new ServerStatsCollector();
             m_serverStatsCollector.Initialise(configSource);
             m_serverStatsCollector.Start();
@@ -432,7 +432,7 @@ namespace OpenSim.Framework.Servers
 
             ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
             Notice("Available worker threads: {0}", workerThreads);
-            Notice("Available IOCP threads:   {0}", iocpThreads);           
+            Notice("Available IOCP threads:   {0}", iocpThreads);
         }
 
         private void HandleDebugThreadpoolSet(string module, string[] args)
@@ -488,7 +488,7 @@ namespace OpenSim.Framework.Servers
                         fail = true;
                 }
             }
-             
+
             if (fail)
             {
                 Notice("ERROR: Could not set {0} {1} threads to {2}", poolType, bound, newThreads);
@@ -582,7 +582,7 @@ namespace OpenSim.Framework.Servers
             if (cmdparams.Length > 0)
             {
                 string firstParam = cmdparams[0].ToLower();
-                
+
                 switch (firstParam)
                 {
                     case "set":
@@ -633,12 +633,12 @@ namespace OpenSim.Framework.Servers
                                 {
                                     Notice("[{0}]", config.Name);
                                     foreach (string key in config.GetKeys())
-                                        Notice("  {0} = {1}", key, config.GetString(key));                                
+                                        Notice("  {0} = {1}", key, config.GetString(key));
                                 }
                                 else
                                 {
                                     Notice(
-                                        "config get {0} {1} : {2}", 
+                                        "config get {0} {1} : {2}",
                                         cmdparams[1], cmdparams[2], config.GetString(cmdparams[2]));
                                 }
                             }
@@ -692,10 +692,10 @@ namespace OpenSim.Framework.Servers
             }
 
             string rawLevel = cmd[3];
-            
+
             ILoggerRepository repository = LogManager.GetRepository();
             Level consoleLevel = repository.LevelMap[rawLevel];
-            
+
             if (consoleLevel != null)
                 m_consoleAppender.Threshold = consoleLevel;
             else
@@ -770,9 +770,9 @@ namespace OpenSim.Framework.Servers
         protected void ShowInfo()
         {
             Notice(GetVersionText());
-            Notice("Startup directory: " + m_startupDirectory);                
+            Notice("Startup directory: " + m_startupDirectory);
             if (null != m_consoleAppender)
-                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));              
+                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));
         }
 
         /// <summary>
@@ -873,7 +873,7 @@ namespace OpenSim.Framework.Servers
 
         public string GetVersionText()
         {
-            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", 
+            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})",
                 m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax);
         }
 
@@ -898,7 +898,7 @@ namespace OpenSim.Framework.Servers
             foreach (Watchdog.ThreadWatchdogInfo twi in threads)
             {
                 Thread t = twi.Thread;
-                
+
                 sb.AppendFormat(
                     reportFormat,
                     t.ManagedThreadId,
@@ -1005,7 +1005,7 @@ namespace OpenSim.Framework.Servers
                 MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
             else
                 MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
-        } 
+        }
 
         /// <summary>
         /// Console output is only possible if a console has been established.
@@ -1020,13 +1020,13 @@ namespace OpenSim.Framework.Servers
                 m_console.Output(msg);
             }
         }
-        
+
         /// <summary>
         /// Console output is only possible if a console has been established.
         /// That is something that cannot be determined within this class. So
         /// all attempts to use the console MUST be verified.
         /// </summary>
-        /// <param name="format"></param>        
+        /// <param name="format"></param>
         /// <param name="components"></param>
         protected void Notice(string format, params object[] components)
         {
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index 60533cd..e5f7043 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -92,87 +92,87 @@ namespace OpenSim.Framework.Servers.Tests
         public class TestHttpRequest: IHttpRequest
         {
             private string _uriPath;
-            public bool BodyIsComplete 
-            { 
-                get { return true; } 
+            public bool BodyIsComplete
+            {
+                get { return true; }
             }
-            public string[] AcceptTypes 
-            { 
+            public string[] AcceptTypes
+            {
                 get {return _acceptTypes; }
             }
             private string[] _acceptTypes;
-            public Stream Body 
-            { 
-                get { return _body; } 
-                set { _body = value;} 
+            public Stream Body
+            {
+                get { return _body; }
+                set { _body = value;}
             }
             private Stream _body;
-            public ConnectionType Connection 
-            { 
+            public ConnectionType Connection
+            {
                 get { return _connection; }
                 set { _connection = value; }
             }
             private ConnectionType _connection;
-            public int ContentLength 
-            { 
+            public int ContentLength
+            {
                 get { return _contentLength; }
                 set { _contentLength = value; }
             }
             private int _contentLength;
-            public NameValueCollection Headers 
-            { 
+            public NameValueCollection Headers
+            {
                 get { return _headers; }
             }
             private NameValueCollection _headers = new NameValueCollection();
-            public string HttpVersion 
-            { 
+            public string HttpVersion
+            {
                 get { return _httpVersion; }
                 set { _httpVersion = value; }
             }
             private string _httpVersion = null;
-            public string Method 
-            { 
+            public string Method
+            {
                 get { return _method; }
                 set { _method = value; }
             }
             private string _method = null;
-            public HttpInput QueryString 
-            { 
+            public HttpInput QueryString
+            {
                 get { return _queryString;  }
             }
             private HttpInput _queryString = null;
-            public Uri Uri 
-            { 
+            public Uri Uri
+            {
                 get { return _uri; }
-                set { _uri = value; } 
+                set { _uri = value; }
             }
             private Uri _uri = null;
-            public string[] UriParts 
-            { 
+            public string[] UriParts
+            {
                 get { return _uri.Segments; }
             }
-            public HttpParam Param 
-            { 
-                get { return null; } 
+            public HttpParam Param
+            {
+                get { return null; }
             }
-            public HttpForm Form 
-            { 
-                get { return null; } 
+            public HttpForm Form
+            {
+                get { return null; }
             }
-            public bool IsAjax 
-            { 
-                get { return false; } 
+            public bool IsAjax
+            {
+                get { return false; }
             }
-            public RequestCookies Cookies 
-            { 
-                get { return null; } 
+            public RequestCookies Cookies
+            {
+                get { return null; }
             }
 
             public TestHttpRequest() {}
 
-            public TestHttpRequest(string contentEncoding, string contentType, string userAgent, 
+            public TestHttpRequest(string contentEncoding, string contentType, string userAgent,
                                    string remoteAddr, string remotePort, string[] acceptTypes,
-                                   ConnectionType connectionType, int contentLength, Uri uri) 
+                                   ConnectionType connectionType, int contentLength, Uri uri)
             {
                 _headers["content-encoding"] = contentEncoding;
                 _headers["content-type"] = contentType;
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Servers.Tests
             {
                 _headers.Add(name, value);
             }
-            public int AddToBody(byte[] bytes, int offset, int length) 
+            public int AddToBody(byte[] bytes, int offset, int length)
             {
                 return 0;
             }
@@ -223,7 +223,7 @@ namespace OpenSim.Framework.Servers.Tests
                 set
                 {
                     _uriPath = value;
-                   
+
                 }
             }
 
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Servers.Tests
 
         public class TestHttpResponse: IHttpResponse
         {
-            public Stream Body 
+            public Stream Body
             {
                 get { return _body; }
 
@@ -239,14 +239,14 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private Stream _body;
 
-            public string ProtocolVersion 
-            { 
+            public string ProtocolVersion
+            {
                 get { return _protocolVersion; }
                 set { _protocolVersion = value; }
             }
             private string _protocolVersion;
 
-            public bool Chunked 
+            public bool Chunked
             {
                 get { return _chunked; }
 
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private bool _chunked;
 
-            public ConnectionType Connection 
+            public ConnectionType Connection
             {
                 get { return _connection; }
 
@@ -262,7 +262,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private ConnectionType _connection;
 
-            public Encoding Encoding 
+            public Encoding Encoding
             {
                 get { return _encoding; }
 
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private Encoding _encoding;
 
-            public int KeepAlive 
+            public int KeepAlive
             {
                 get { return _keepAlive; }
 
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private int _keepAlive;
 
-            public HttpStatusCode Status 
+            public HttpStatusCode Status
             {
                 get { return _status; }
 
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private HttpStatusCode _status;
 
-            public string Reason 
+            public string Reason
             {
                 get { return _reason; }
 
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private string _reason;
 
-            public long ContentLength 
+            public long ContentLength
             {
                 get { return _contentLength; }
 
@@ -302,7 +302,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private long _contentLength;
 
-            public string ContentType 
+            public string ContentType
             {
                 get { return _contentType; }
 
@@ -310,19 +310,19 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private string _contentType;
 
-            public bool HeadersSent 
+            public bool HeadersSent
             {
                 get { return _headersSent; }
             }
             private bool _headersSent;
 
-            public bool Sent 
+            public bool Sent
             {
                 get { return _sent; }
             }
             private bool _sent;
 
-            public ResponseCookies Cookies 
+            public ResponseCookies Cookies
             {
                 get { return _cookies; }
             }
@@ -335,25 +335,25 @@ namespace OpenSim.Framework.Servers.Tests
             }
 
             public void AddHeader(string name, string value) {}
-            public void Send() 
+            public void Send()
             {
                 if (!_headersSent) SendHeaders();
                 if (_sent) throw new InvalidOperationException("stuff already sent");
                 _sent = true;
             }
 
-            public void SendBody(byte[] buffer, int offset, int count) 
+            public void SendBody(byte[] buffer, int offset, int count)
             {
                 if (!_headersSent) SendHeaders();
                 _sent = true;
             }
-            public void SendBody(byte[] buffer) 
+            public void SendBody(byte[] buffer)
             {
                 if (!_headersSent) SendHeaders();
                 _sent = true;
             }
 
-            public void SendHeaders() 
+            public void SendHeaders()
             {
                 if (_headersSent) throw new InvalidOperationException("headers already sent");
                 _headersSent = true;
@@ -362,7 +362,7 @@ namespace OpenSim.Framework.Servers.Tests
             public void Redirect(Uri uri) {}
             public void Redirect(string url) {}
         }
-       
+
 
         public OSHttpRequest req0;
         public OSHttpRequest req1;
@@ -374,22 +374,22 @@ namespace OpenSim.Framework.Servers.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
-                                                       new string[] {"text/xml"}, 
-                                                       ConnectionType.KeepAlive, 4711, 
+            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
+                                                       new string[] {"text/xml"},
+                                                       ConnectionType.KeepAlive, 4711,
                                                        new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis"));
             threq0.Method = "GET";
             threq0.HttpVersion = HttpHelper.HTTP10;
 
-            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
-                                                       new string[] {"text/xml"}, 
-                                                       ConnectionType.KeepAlive, 4711, 
+            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
+                                                       new string[] {"text/xml"},
+                                                       ConnectionType.KeepAlive, 4711,
                                                        new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis?a=0&b=1&c=2"));
             threq1.Method = "POST";
             threq1.HttpVersion = HttpHelper.HTTP11;
             threq1.Headers["x-wuff"] = "wuffwuff";
             threq1.Headers["www-authenticate"] = "go away";
-            
+
             req0 = new OSHttpRequest(new TestHttpClientContext(false), threq0);
             req1 = new OSHttpRequest(new TestHttpClientContext(false), threq1);
 
diff --git a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
index 512ac4f..9126cfb 100644
--- a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
         {
 //            remove_me = section;
             m_Username = Util.GetConfigVarFromSections<string>(config, "HttpAuthUsername", new string[] { "Network", section }, string.Empty);
-            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty); 
+            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty);
             string str = m_Username + ":" + m_Password;
             byte[] encData_byte = Util.UTF8.GetBytes(str);
 
diff --git a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
index a49952c..79d6ff4 100644
--- a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
             m_authentications.Remove(auth);
         }
 
-        public void AddAuthorization(NameValueCollection headers) 
+        public void AddAuthorization(NameValueCollection headers)
         {
             foreach (IServiceAuth auth in m_authentications)
                 auth.AddAuthorization(headers);
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index a811187..f19a270 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     /// <summary>
     /// Enapsulate statistics for a simulator/scene.
-    /// 
+    ///
     /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
     /// storage.
     /// </summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Framework
             get { return m_regionY; }
         }
         private uint m_regionY;
-        
+
         public SimStatsPacket.RegionBlock RegionBlock
         {
             get { return m_regionBlock; }
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
             get { return m_regionFlags; }
         }
         private uint m_regionFlags;
-            
+
         public uint ObjectCapacity
         {
             get { return m_objectCapacity; }
@@ -85,9 +85,9 @@ namespace OpenSim.Framework
             get { return regionUUID; }
         }
         private UUID regionUUID;
-                
+
         public SimStats(
-            uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 
+            uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
             SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock,
             SimStatsPacket.StatBlock[] ExtraStatsBlock, UUID pRUUID)
         {
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index c270d98..223d91f 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework
 
         private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Thread LockedByThread;
 //        private string WriterStack;
 
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
                     if (!LockedByThread.IsAlive)
                     {
                         //Locked by dead thread, reset.
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim(); 
+                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
                     }
                 }
 
@@ -146,7 +146,7 @@ namespace OpenSim.Framework
 //                    {}
                     m_itemLock.ExitWriteLock();
                 }
-                
+
                 while (!m_itemLock.TryEnterReadLock(60000))
                 {
                     m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index b195bbe..1cc32b3 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
         private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
-        
+
         public UUID AssetID {
             get {
                 return _assetID;
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index e8ae728..5ad0030 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOOT_SIZE] = 45;
 
 
-            // head 
+            // head
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SIZE] = 255;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SQUASH_STRETCH_HEAD] = 0; // head stretch
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SHAPE] = 155;
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Tests
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FACE_SHEAR] = 127;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOREHEAD_ANGLE] = 104;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BIG_BROW] = 94;
-            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks 
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DOUBLE_CHIN] = 122; //  lower cheeks
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIGH_CHEEK_BONES] = 130;
 
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Tests
         /// <summary>
         /// Test to ensure that the serialization format is the same and the underlying types don't change without notice
         /// oldSerialization is just a json serialization of the OSDMap packed for the AgentCircuitData.
-        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types 
+        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types
         /// have changed and are incompatible.
         /// </summary>
         [Test]
@@ -319,7 +319,7 @@ namespace OpenSim.Framework.Tests
                 string str = OSDParser.SerializeJsonString(map);
                 //System.Console.WriteLine(str);
                 map2 = (OSDMap) OSDParser.DeserializeJson(str);
-            } 
+            }
             catch (System.NullReferenceException)
             {
                 //spurious litjson errors :P
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index ae132c8..b572afc 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Tests
 
             resp = agentCircuitManager.AuthenticateSession(UUID.Random(), AgentId1, circuitcode1);
             Assert.That(!resp.Authorised);
-            
+
             resp = agentCircuitManager.AuthenticateSession(SessionId1, AgentId1, circuitcode2);
             Assert.That(!resp.Authorised);
 
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs
index d8f17d0..daf8611 100644
--- a/OpenSim/Framework/Tests/AnimationTests.cs
+++ b/OpenSim/Framework/Tests/AnimationTests.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework.Tests
             anim4.AnimID = anim2.AnimID;
             anim4.ObjectID = anim2.ObjectID;
             anim4.SequenceNum = anim2.SequenceNum;
-            
+
             Assert.That(anim4.ObjectID == objUUID2 && anim4.AnimID == animUUID2 && anim4.SequenceNum == 1, "void constructor and manual field population failed to set the properties correctly.");
         }
     }
diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs
index c709860..a92ff3c 100644
--- a/OpenSim/Framework/Tests/CacheTests.cs
+++ b/OpenSim/Framework/Tests/CacheTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Tests
             Assert.That(citem == null, "Item should not be in Cache");
         }
 
-        
+
         [Test]
         public void ExpireItemManually()
         {
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
             cache.Clear();
-  
+
             object citem = cache.Get(cacheItemUUID.ToString());
             Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
         }
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 3d5d1d2..5e84026 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -85,6 +85,6 @@ namespace OpenSim.Framework.Tests
             Assert.That(TestLocation2.Equals(cln), "Cloned object failed .Equals(obj) Test");
 
         }
-        
+
     }
 }
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index d8072c7..bde7056 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Tests
                 && position2.Center == position1.Center
                 && position2.RegionHandle == position1.RegionHandle
                 && position2.Far == position1.Far
-               
+
                 ,"Copy From ChildAgentDataUpdate failed");
 
             position2 = new AgentPosition();
@@ -148,13 +148,13 @@ namespace OpenSim.Framework.Tests
 //            string time = settings.LoadedCreationTime;
 
             Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
-            
+
         }
         public void RegionSaveFired(RegionSettings settings)
         {
             m_RegionSettingsOnSaveEventFired = true;
         }
-        
+
         [Test]
         public void InventoryItemBaseConstructorTest01()
         {
@@ -164,7 +164,7 @@ namespace OpenSim.Framework.Tests
 
             UUID ItemID = UUID.Random();
             UUID OwnerID = UUID.Random();
-            
+
             InventoryItemBase b2 = new InventoryItemBase(ItemID);
             Assert.That(b2.ID == ItemID, "ID constructor should create an inventory item with ID = ItemID");
             Assert.That(b2.Owner == UUID.Zero, "ID constructor  should create an inventory item with Owner = UUID.Zero");
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Tests
             Assert.That(fld.ID == uuid1, "ID,Owner constructor failed to save value in ID field.");
             Assert.That(fld.Owner == uuid2, "ID,Owner constructor failed to save value in ID field.");
         }
-        
+
         [Test]
         public void AsssetBaseConstructorTest01()
         {
@@ -304,6 +304,6 @@ namespace OpenSim.Framework.Tests
             Culture.SetCurrentCulture();
             Assert.That(Thread.CurrentThread.CurrentCulture.Name == ci.Name, "SetCurrentCulture failed to set thread culture to en-US");
 
-        }     
+        }
     }
 }
diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
index 82e13e5..cc30fb9 100644
--- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
+++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Framework.Tests
 
             int[] nonprimes = {
                                4, 6, 8, 10, 14, 16, 18, 22, 28, 30, 36, 40, 42, 46, 52, 58, 60, 66, 70, 72, 78, 82, 88,
-                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462, 
-                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936, 
-                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662, 
+                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462,
+                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936,
+                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662,
                                4672, 4678, 4690, 7740, 7752, 7756, 7758, 7788, 7792, 7816, 7822, 7828, 7840, 7852, 7866, 7872,
                                7876, 7878, 7882, 7900, 7906, 7918
                            };
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 14b9d2f..b3d79ee 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Framework.Tests
                                                "application/vnd.ll.clothing",
                                                "application/vnd.ll.gesture"
                                            };
-        
+
             for (int i=0;i<inventorytypes.Length;i++)
             {
                 Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index f7069a5..d8fa629 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -159,12 +159,12 @@ namespace OpenSim.Framework
         /// </summary>
         public virtual ulong HomeRegion
         {
-            get 
-            { 
+            get
+            {
                 return Util.RegionWorldLocToHandle(Util.RegionToWorldLoc(m_homeRegionX), Util.RegionToWorldLoc(m_homeRegionY));
-                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize); 
+                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize);
             }
-            
+
             set
             {
                 uint regionWorldLocX, regionWorldLocY;
@@ -212,7 +212,7 @@ namespace OpenSim.Framework
             get { return m_surname; }
             set { m_surname = value; }
         }
-        
+
         /// <value>
         /// The concatentation of the various name components.
         /// </value>
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 4ed890b..7c6a6fe 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
         public byte Flags = 0;
         public int Price = 0;
     }
-    
+
     public class UserProfileProperties
     {
         public UUID UserId = UUID.Zero;
@@ -68,7 +68,7 @@ namespace OpenSim.Framework
         public UUID FirstLifeImageId = UUID.Zero;
         public string FirstLifeText = string.Empty;
     }
-    
+
     public class UserProfilePick
     {
         public UUID PickId = UUID.Zero;
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
         public int SortOrder = 0;
         public bool Enabled = false;
     }
-    
+
     public class UserProfileNotes
     {
         public UUID UserId;
@@ -101,7 +101,7 @@ namespace OpenSim.Framework
         public bool Visible = false;
         public string EMail = string.Empty;
     }
-    
+
     public class UserAccountProperties
     {
         public string EmailAddress = string.Empty;
@@ -110,13 +110,13 @@ namespace OpenSim.Framework
         public string Password = string.Empty;
         public string UserId = string.Empty;
     }
-    
+
     public class UserAccountAuth
     {
         public string UserId = UUID.Zero.ToString();
         public string Password = string.Empty;
     }
-    
+
     public class UserAppData
     {
         public string TagId = string.Empty;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 89cf045..6d679f2 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
 {
     [Flags]
     public enum PermissionMask : uint
-    { 
+    {
         None = 0,
 
         // folded perms
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
         public STPStartInfo STPStartInfo { get; set; }
         public WIGStartInfo WIGStartInfo { get; set; }
         public bool IsIdle { get; set; }
-        public bool IsShuttingDown { get; set; }       
+        public bool IsShuttingDown { get; set; }
         public int MaxThreads { get; set; }
         public int MinThreads { get; set; }
         public int InUseThreads { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
         public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
 
         /// <value>
-        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
+        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards)
         /// </value>
         public static UUID BLANK_TEXTURE_UUID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
 
@@ -280,7 +280,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="a">A 3d vector</param>
         /// <returns>A new vector which is normalized form of the vector</returns>
-        
+
         public static Vector3 GetNormalizedVector(Vector3 a)
         {
             Vector3 v = new Vector3(a.X, a.Y, a.Z);
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
         // Regions are identified with a 'handle' made up of its world coordinates packed into a ulong.
         // Region handles are based on the coordinate of the region corner with lower X and Y
         // var regions need more work than this to get that right corner from a generic world position
-        // this corner must be on a grid point 
+        // this corner must be on a grid point
         public static ulong RegionWorldLocToHandle(uint X, uint Y)
         {
            ulong handle = X & 0xffffff00; // make sure it matchs grid coord points.
@@ -450,7 +450,7 @@ namespace OpenSim.Framework
 
                 string host;
                 uint port = 80;
-                
+
                 string[] parts = inputName.Split(new char[] { ':' });
                 int indx;
                 if(parts.Length == 0)
@@ -470,7 +470,7 @@ namespace OpenSim.Framework
                 else
                 {
                     host = parts[0];
-               
+
                     if (parts.Length >= 2)
                     {
                         indx = parts[1].IndexOf('/');
@@ -875,8 +875,8 @@ namespace OpenSim.Framework
         /// <param name="newx">New region x-coord</param>
         /// <param name="oldy">Old region y-coord</param>
         /// <param name="newy">New region y-coord</param>
-        /// <returns></returns>        
-        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy, 
+        /// <returns></returns>
+        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy,
             int oldsizex, int oldsizey, int newsizex, int newsizey)
         {
             // we still need to make sure we see new region  1stNeighbors
@@ -1267,7 +1267,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
         /// any values previously found.
         /// </summary>
         /// <typeparam name="T">Type of the variable</typeparam>
@@ -1282,7 +1282,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
         /// any values previously found.
         /// </summary>
         /// <remarks>
@@ -1338,7 +1338,7 @@ namespace OpenSim.Framework
                 ConfigSource.ExpandKeyValues();
             }
         }
-        
+
         public static T ReadSettingsFromIniFile<T>(IConfig config, T settingsClass)
         {
             Type settingsType = settingsClass.GetType();
@@ -1449,7 +1449,7 @@ namespace OpenSim.Framework
 
             if (File.Exists(configFile))
             {
-                // Merge 
+                // Merge
                 config.Merge(new IniConfigSource(configFile));
                 config.ExpandKeyValues();
                 configFilePath = configFile;
@@ -1598,7 +1598,7 @@ namespace OpenSim.Framework
             }
 
             memory.Position = 0;
-           
+
             byte[] compressed = new byte[memory.Length];
             memory.Read(compressed, 0, compressed.Length);
 
@@ -1645,7 +1645,7 @@ namespace OpenSim.Framework
             const int readSize = 256;
             byte[] buffer = new byte[readSize];
             MemoryStream ms = new MemoryStream();
-        
+
             int count = inputStream.Read(buffer, 0, readSize);
 
             while (count > 0)
@@ -1731,10 +1731,10 @@ namespace OpenSim.Framework
             regionHandle = Utils.BytesToUInt64(bytes);
             x = Utils.BytesToUInt(bytes, 8) & 0xffff;
             y = Utils.BytesToUInt(bytes, 12) & 0xffff;
-            // validation may fail, just reducing the odds of using a real UUID as encoded parcel  
+            // validation may fail, just reducing the odds of using a real UUID as encoded parcel
             return  ( bytes[0] == 0 && bytes[4] == 0 && // handler x,y multiples of 256
                          bytes[9] < 64 && bytes[13] < 64 && // positions < 16km
-                         bytes[14] == 0 && bytes[15] == 0);          
+                         bytes[14] == 0 && bytes[15] == 0);
         }
 
         public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y, out uint z)
@@ -1757,7 +1757,7 @@ namespace OpenSim.Framework
             x += rx;
             y += ry;
         }
-        
+
         /// <summary>
         /// Get operating system information if available.  Returns only the first 45 characters of information
         /// </summary>
@@ -1776,12 +1776,12 @@ namespace OpenSim.Framework
 //            {
 //                os = ReadEtcIssue();
 //            }
-//                      
+//
 //            if (os.Length > 45)
 //            {
 //                os = os.Substring(0, 45);
 //            }
-            
+
             return os;
         }
 
@@ -1993,7 +1993,7 @@ namespace OpenSim.Framework
                     vol = vcomps[0];
                 }
             }
-            
+
             string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
 
             // Glob
@@ -2095,7 +2095,7 @@ namespace OpenSim.Framework
 
             if (!str.EndsWith("\0"))
                 str += "\0";
-            
+
             // Because this is UTF-8 encoding and not ASCII, it's possible we
             // might have gotten an oversized array even after the string trim
             byte[] data = UTF8.GetBytes(str);
@@ -2354,7 +2354,7 @@ namespace OpenSim.Framework
                     throw new NotImplementedException();
             }
         }
-                
+
         /// <summary>
         /// Additional information about threads in the main thread pool. Used to time how long the
         /// thread has been running, and abort it if it has timed-out.
@@ -2365,7 +2365,7 @@ namespace OpenSim.Framework
             public string StackTrace { get; set; }
             private string context;
             public bool LogThread { get; set; }
-            
+
             public IWorkItemResult WorkItem { get; set; }
             public Thread Thread { get; set; }
             public bool Running { get; set; }
@@ -2470,7 +2470,7 @@ namespace OpenSim.Framework
         public static Dictionary<string, int> GetFireAndForgetCallsMade()
         {
             return new Dictionary<string, int>(m_fireAndForgetCallsMade);
-        }       
+        }
 
         private static Dictionary<string, int> m_fireAndForgetCallsMade = new Dictionary<string, int>();
 
@@ -2490,7 +2490,7 @@ namespace OpenSim.Framework
         {
             FireAndForget(callback, obj, null);
         }
-     
+
         public static void FireAndForget(System.Threading.WaitCallback callback, object obj, string context)
         {
             Interlocked.Increment(ref numTotalThreadFuncsCalled);
@@ -2511,19 +2511,19 @@ namespace OpenSim.Framework
             WaitCallback realCallback;
 
             bool loggingEnabled = LogThreadPool > 0;
-            
+
             long threadFuncNum = Interlocked.Increment(ref nextThreadFuncNum);
             ThreadInfo threadInfo = new ThreadInfo(threadFuncNum, context);
 
             if (FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 // If we're running regression tests, then we want any exceptions to rise up to the test code.
-                realCallback = 
-                    o => 
-                    { 
-                        Culture.SetCurrentCulture(); 
-                        callback(o); 
-                        
+                realCallback =
+                    o =>
+                    {
+                        Culture.SetCurrentCulture();
+                        callback(o);
+
                         if (context != null)
                             m_fireAndForgetCallsInProgress[context]--;
                     };
@@ -2666,7 +2666,7 @@ namespace OpenSim.Framework
                 if (stackTrace.Contains("BeginFireQueueEmpty"))
                     return false;
             }
-            
+
             return true;
         }
 
@@ -2679,7 +2679,7 @@ namespace OpenSim.Framework
         {
             string src = Environment.StackTrace;
             string[] lines = src.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
-            
+
             StringBuilder dest = new StringBuilder(src.Length);
 
             bool started = false;
@@ -2724,11 +2724,11 @@ namespace OpenSim.Framework
         /// trace. And pausing another thread can cause a deadlock. This method attempts to
         /// avoid deadlock by using a short timeout (200ms), after which it gives up and
         /// returns 'null' instead of the stack trace.
-        /// 
+        ///
         /// Take from: http://stackoverflow.com/a/14935378
-        /// 
+        ///
         /// WARNING: this doesn't work in Mono. See https://bugzilla.novell.com/show_bug.cgi?id=571691
-        /// 
+        ///
         /// </remarks>
         /// <returns>The stack trace, or null if failed to get it</returns>
         private static StackTrace GetStackTrace(Thread targetThread)
@@ -2829,7 +2829,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
         /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
-        /// for the callers. 
+        /// for the callers.
         /// This trims it to a 12 day interval so don't let your frame time get too long.
         /// </summary>
         /// <returns></returns>
@@ -3186,7 +3186,7 @@ namespace OpenSim.Framework
                 if (parts.Length == 2)
                     return CalcUniversalIdentifier(id, agentsURI, parts[0] + " " + parts[1]);
             }
-            
+
             return CalcUniversalIdentifier(id, agentsURI, firstName + " " + lastName);
         }
 
@@ -3286,10 +3286,10 @@ namespace OpenSim.Framework
 
         public virtual int Count
         {
-            get 
-            { 
+            get
+            {
                 lock (m_syncRoot)
-                    return m_highQueue.Count + m_lowQueue.Count; 
+                    return m_highQueue.Count + m_lowQueue.Count;
             }
         }
 
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index 7bb0351..1e6efe5 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -58,10 +58,10 @@ namespace OpenSim
         }
 
         public const int VERSIONINFO_VERSION_LENGTH = 27;
-        
+
         /// <value>
         /// This is the external interface version.  It is separate from the OpenSimulator project version.
-        /// 
+        ///
         /// </value>
         /// Commented because it's not used anymore, see below for new
         /// versioning method.
@@ -70,18 +70,18 @@ namespace OpenSim
         /// <summary>
         /// This rules versioning regarding teleports, and compatibility between simulators in that regard.
         /// </summary>
-        /// 
+        ///
         /// <remarks>
         /// The protocol version that we will use for outgoing transfers
-        /// Valid values are 
-        /// "SIMULATION/0.3" 
+        /// Valid values are
+        /// "SIMULATION/0.3"
         ///   - This is the latest, and it supports teleports to variable-sized regions
         ///   - Older versions can teleport to this one, but only if the destination region
         ///     is 256x256
         /// "SIMULATION/0.2"
         ///   - A source simulator which only implements "SIMULATION/0.1" can still teleport here
         ///   - this protocol is more efficient than "SIMULATION/0.1"
-        /// "SIMULATION/0.1" 
+        /// "SIMULATION/0.1"
         ///   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
         /// </remarks>
         public readonly static float SimulationServiceVersionAcceptedMin = 0.3f;
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index 966a6bc..ccaf69e 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
             WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
             for (uint i=0;i<itemmax;i++)
                 retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
-            return retitems;          
+            return retitems;
         }
 
         public static WearableCacheItem[] FromOSD(OSD pInput, IAssetCache dataCache)
@@ -64,7 +64,7 @@ namespace OpenSim.Framework
                                     CacheId = item["cacheid"].AsUUID(),
                                     TextureID = item["textureid"].AsUUID()
                                 });
-                    
+
                     if (dataCache != null && item.ContainsKey("assetdata"))
                     {
                         AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString());
@@ -181,7 +181,7 @@ namespace OpenSim.Framework
                         pcache[idx].TextureAsset = asset;
                     }
                     else
- */ 
+ */
                         pcache[idx].TextureAsset = null;
                 }
             }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index f927e69..12f58fe 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Framework
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
+
                 // If there is some input, write it into the request
                 if (data != null)
                 {
@@ -261,7 +261,7 @@ namespace OpenSim.Framework
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
                     request.ContentType = rpc ? "application/json-rpc" : "application/json";
-                    
+
                     if (compressed)
                     {
                         request.Headers["X-Content-Encoding"] = "gzip"; // can't set "Content-Encoding" because old OpenSims fail if they get an unrecognized Content-Encoding
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
                             requestStream.Write(buffer, 0, buffer.Length);         //Send it
                     }
                 }
-                
+
                 // capture how much time was spent writing, this may seem silly
                 // but with the number concurrent requests, this often blocks
                 tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -354,7 +354,7 @@ namespace OpenSim.Framework
                         reqnum, tickdiff, tickdata);
                 }
             }
-           
+
             m_log.DebugFormat(
                 "[LOGHTTP]: JSON-RPC request {0} {1} to {2} FAILED: {3}", reqnum, method, url, errorMessage);
 
@@ -378,7 +378,7 @@ namespace OpenSim.Framework
             result["success"] = OSD.FromBoolean(true);
             result["_RawResult"] = OSD.FromString(response);
             result["_Result"] = new OSDMap();
-            
+
             if (response.Equals("true",System.StringComparison.OrdinalIgnoreCase))
                 return result;
 
@@ -389,7 +389,7 @@ namespace OpenSim.Framework
                 return result;
             }
 
-            try 
+            try
             {
                 OSD responseOSD = OSDParser.Deserialize(response);
                 if (responseOSD.Type == OSDType.Map)
@@ -403,10 +403,10 @@ namespace OpenSim.Framework
                 // don't need to treat this as an error... we're just guessing anyway
 //                m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
             }
-            
+
             return result;
         }
-        
+
         #endregion JSONRequest
 
         #region FormRequest
@@ -419,7 +419,7 @@ namespace OpenSim.Framework
         {
             return ServiceFormRequest(url,data, 30000);
         }
-        
+
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
         {
             lock (EndPointLock(url))
@@ -436,7 +436,7 @@ namespace OpenSim.Framework
             if (DebugLevel >= 3)
                 m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} ServiceForm '{1}' to {2}",
                     reqnum, method, url);
-            
+
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
@@ -451,7 +451,7 @@ namespace OpenSim.Framework
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
+
                 if (data != null)
                 {
                     queryString = BuildQueryString(data);
@@ -460,7 +460,7 @@ namespace OpenSim.Framework
                         LogOutgoingDetail("SEND", reqnum, queryString);
 
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
-                    
+
                     request.ContentLength = buffer.Length;
                     request.ContentType = "application/x-www-form-urlencoded";
                     using (Stream requestStream = request.GetRequestStream())
@@ -538,7 +538,7 @@ namespace OpenSim.Framework
         }
 
         #endregion FormRequest
-        
+
         #region Uri
 
         /// <summary>
@@ -591,7 +591,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Appends a query string to a Uri that may or may not have existing 
+        /// Appends a query string to a Uri that may or may not have existing
         /// query parameters
         /// </summary>
         /// <param name="uri">Uri to append the query to</param>
@@ -643,7 +643,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="collection"></param>
         /// <param name="key"></param>
@@ -662,12 +662,12 @@ namespace OpenSim.Framework
         #region Stream
 
         /// <summary>
-        /// Copies the contents of one stream to another, starting at the 
+        /// Copies the contents of one stream to another, starting at the
         /// current position of each stream
         /// </summary>
-        /// <param name="copyFrom">The stream to copy from, at the position 
+        /// <param name="copyFrom">The stream to copy from, at the position
         /// where copying should begin</param>
-        /// <param name="copyTo">The stream to copy to, at the position where 
+        /// <param name="copyTo">The stream to copy to, at the position where
         /// bytes should be written</param>
         /// <param name="maximumBytesToCopy">The maximum bytes to copy</param>
         /// <returns>The total number of bytes copied</returns>
@@ -811,7 +811,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static void MakeRequest<TRequest, TResponse>(string verb,
@@ -909,7 +909,7 @@ namespace OpenSim.Framework
                             // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
                             // documented in MSDN
                             using (WebResponse response = request.EndGetResponse(res2))
-                            {   
+                            {
                                 try
                                 {
                                     using (Stream respStream = response.GetResponseStream())
@@ -930,7 +930,7 @@ namespace OpenSim.Framework
                                 if (e.Response is HttpWebResponse)
                                 {
                                     using (HttpWebResponse httpResponse = (HttpWebResponse)e.Response)
-                                    {        
+                                    {
                                         if (httpResponse.StatusCode != HttpStatusCode.NotFound)
                                         {
                                             // We don't appear to be handling any other status codes, so log these feailures to that
@@ -955,7 +955,7 @@ namespace OpenSim.Framework
                                 "[ASYNC REQUEST]: Request {0} {1} failed with exception {2}{3}",
                                 verb, requestUrl, e.Message, e.StackTrace);
                         }
-        
+
                         //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
 
                         try
@@ -968,7 +968,7 @@ namespace OpenSim.Framework
                                 "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}{3}",
                                 verb, requestUrl, e.Message, e.StackTrace);
                         }
-        
+
                     }, null);
                 }
 
@@ -997,7 +997,7 @@ namespace OpenSim.Framework
                 }
             }
             finally
-            { 
+            {
                 if (buffer != null)
                     buffer.Dispose();
             }
@@ -1168,7 +1168,7 @@ namespace OpenSim.Framework
         /// Request timeout in milliseconds.  Timeout.Infinite indicates no timeout.  If 0 is passed then the default HttpWebRequest timeout is used (100 seconds)
         /// </param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
@@ -1191,7 +1191,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections)
@@ -1210,7 +1210,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections, IServiceAuth auth)
@@ -1375,7 +1375,7 @@ namespace OpenSim.Framework
 
             return deserial;
         }
-    
+
         public static class XMLResponseHelper
         {
             public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength)
@@ -1400,7 +1400,7 @@ namespace OpenSim.Framework
         }
     }
 
-    
+
     public static class XMLRPCRequester
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -1444,7 +1444,7 @@ namespace OpenSim.Framework
                 {
                     m_log.Error("Error parsing XML-RPC response", e);
                 }
-                    
+
                 if (Resp.IsFault)
                 {
                     m_log.DebugFormat(
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index e441cc8..5cb6a88 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -86,9 +86,9 @@ namespace OpenSim
             if (logConfigFile != String.Empty)
             {
                 XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile));
-                m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file", 
+                m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file",
                                  logConfigFile);
-            } 
+            }
             else
             {
                 XmlConfigurator.Configure();
@@ -104,22 +104,22 @@ namespace OpenSim
                 "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
 
             // Verify the Threadpool allocates or uses enough worker and IO completion threads
-                        // .NET 2.0, workerthreads default to 50 *  numcores
-                        // .NET 3.0, workerthreads defaults to 250 * numcores
-                        // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
+            // .NET 2.0, workerthreads default to 50 *  numcores
+            // .NET 3.0, workerthreads defaults to 250 * numcores
+            // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
             // Max IO Completion threads are 1000 on all 3 CLRs
             //
             // Mono 2.10.9 to at least Mono 3.1, workerthreads default to 100 * numcores, iocp threads to 4 * numcores
-                        int workerThreadsMin = 500;
-                        int workerThreadsMax = 1000; // may need further adjustment to match other CLR
-                        int iocpThreadsMin = 1000;
-                        int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
+            int workerThreadsMin = 500;
+            int workerThreadsMax = 1000; // may need further adjustment to match other CLR
+            int iocpThreadsMin = 1000;
+            int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
 
             {
                 int currentMinWorkerThreads, currentMinIocpThreads;
                 System.Threading.ThreadPool.GetMinThreads(out currentMinWorkerThreads, out currentMinIocpThreads);
                 m_log.InfoFormat(
-                    "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads", 
+                    "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads",
                     currentMinWorkerThreads, currentMinIocpThreads);
             }
 
@@ -138,30 +138,30 @@ namespace OpenSim
                 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max worker threads to {0}",workerThreads);
             }
 
-                        // Increase the number of IOCP threads available.
-                        // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
-                        if (iocpThreads < iocpThreadsMin)
+            // Increase the number of IOCP threads available.
+            // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
+            if (iocpThreads < iocpThreadsMin)
             {
                 iocpThreads = iocpThreadsMin;
                 m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads);
             }
-                        // Make sure we don't overallocate IOCP threads and thrash system resources
+            // Make sure we don't overallocate IOCP threads and thrash system resources
             if ( iocpThreads > iocpThreadsMax )
             {
                 iocpThreads = iocpThreadsMax;
                 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads);
             }
-                        // set the resulting worker and IO completion thread counts back to ThreadPool
+            // set the resulting worker and IO completion thread counts back to ThreadPool
             if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
-                        {
-                    m_log.InfoFormat(
+            {
+                m_log.InfoFormat(
                     "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
                     workerThreads, iocpThreads);
-                        }
-                        else
-                        {
-                    m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");                         
-                        }
+            }
+            else
+            {
+                m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");
+            }
 
             // Check if the system is compatible with OpenSimulator.
             // Ensures that the minimum system requirements are met
@@ -179,7 +179,7 @@ namespace OpenSim
             Culture.SetCurrentCulture();
 
             // Validate that the user has the most basic configuration done
-            // If not, offer to do the most basic configuration for them warning them along the way of the importance of 
+            // If not, offer to do the most basic configuration for them warning them along the way of the importance of
             // reading these files.
             /*
             m_log.Info("Checking for reguired configuration...\n");
@@ -188,13 +188,13 @@ namespace OpenSim
                                || (File.Exists(Path.Combine(Util.configDir(), "opensim.ini")))
                                || (File.Exists(Path.Combine(Util.configDir(), "openSim.ini")))
                                || (File.Exists(Path.Combine(Util.configDir(), "Opensim.ini")));
-            
+
             bool StanaloneCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini"));
             bool StanaloneCommon_lowercased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "standalonecommon.ini"));
             bool GridCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "GridCommon.ini"));
             bool GridCommon_lowerCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "gridcommon.ini"));
 
-            if ((OpenSim_Ini) 
+            if ((OpenSim_Ini)
                 && (
                 (StanaloneCommon_ProperCased
                 || StanaloneCommon_lowercased
@@ -212,7 +212,7 @@ namespace OpenSim
                                         "yes");
                 if (resp == "yes")
                 {
-                    
+
                         if (!(OpenSim_Ini))
                         {
                             try
@@ -312,7 +312,7 @@ namespace OpenSim
             m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
 
             // load Crash directory config
-            m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);           
+            m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
 
             if (background)
             {
@@ -320,9 +320,9 @@ namespace OpenSim
                 m_sim.Startup();
             }
             else
-            {                       
+            {
                 m_sim = new OpenSim(configSource);
-                          
+
                 m_sim.Startup();
 
                 while (true)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4f141a6..62bd4f4 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,10 +43,10 @@ namespace OpenSim
     public class ConfigurationLoader
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Various Config settings the region needs to start
-        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 
+        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
         /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
         /// Standalone settings.
         /// </summary>
@@ -188,7 +188,7 @@ namespace OpenSim
                         {
                             iniFileExists = true;
                             AddIncludes(overrideConfig, overrideSources);
-                        } 
+                        }
                     }
                     m_config.Source.Merge(overrideConfig.Source);
                 }
@@ -198,7 +198,7 @@ namespace OpenSim
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 Environment.Exit(1);
-            } 
+            }
             else if (!iniFileExists)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
@@ -257,14 +257,14 @@ namespace OpenSim
                             string path = Path.Combine(basepath, chunkWithoutWildcards);
                             path = Path.GetFullPath(path) + chunkWithWildcards;
                             string[] paths = Util.Glob(path);
-                            
+
                             // If the include path contains no wildcards, then warn the user that it wasn't found.
                             if (wildcardIndex == -1 && paths.Length == 0)
                             {
                                 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
                             }
                             else
-                            {                            
+                            {
                                 foreach (string p in paths)
                                 {
                                     if (!sources.Contains(p))
@@ -377,7 +377,7 @@ namespace OpenSim
                 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
 
-                m_configSettings.ClientstackDll 
+                m_configSettings.ClientstackDll
                     = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
 
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index a3fa66c..ff3f5d7 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -43,7 +43,7 @@ namespace OpenSim
         void Initialise(OpenSimBase openSim);
 
         /// <summary>
-        /// Called when the application loading is completed 
+        /// Called when the application loading is completed
         /// </summary>
         void PostInitialise();
     }
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index d9fdcde..8022b1e 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -135,7 +135,7 @@ namespace OpenSim
             {
                 // Wait for a signal to be delivered
                 int index = Mono.Unix.UnixSignal.WaitAny (signals, -1);
-         
+
                 //Mono.Unix.Native.Signum signal = signals [index].Signum;
                 MainConsole.Instance.RunCommand("shutdown");
             }
@@ -273,17 +273,17 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
-                                          "Change current console region", 
+                                          "Change current console region",
                                           ChangeSelectedRegion);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml",
                                           "save xml [<file name>]",
-                                          "Save a region's data in XML format", 
+                                          "Save a region's data in XML format",
                                           SaveXml);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml2",
                                           "save xml2 [<file name>]",
-                                          "Save a region's data in XML2 format", 
+                                          "Save a region's data in XML2 format",
                                           SaveXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load xml",
@@ -293,12 +293,12 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Archiving", false, "load xml2",
                                           "load xml2 [<file name>]",
-                                          "Load a region's data from XML2 format", 
+                                          "Load a region's data from XML2 format",
                                           LoadXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
                                           "save prims xml2 [<prim name> <file name>]",
-                                          "Save named prim to XML2", 
+                                          "Save named prim to XML2",
                                           SavePrimsXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load oar",
@@ -352,7 +352,7 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Objects", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
-                                          "Change the scale of a named prim", 
+                                          "Change the scale of a named prim",
                                           HandleEditScale);
 
             m_console.Commands.AddCommand("Objects", false, "rotate scene",
@@ -379,44 +379,44 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Users", false, "show users",
                                           "show users [full]",
-                                          "Show user data for users currently on the region", 
+                                          "Show user data for users currently on the region",
                                           "Without the 'full' option, only users actually on the region are shown."
                                             + "  With the 'full' option child agents of users in neighbouring regions are also shown.",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show connections",
                                           "show connections",
-                                          "Show connection data", 
+                                          "Show connection data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show circuits",
                                           "show circuits",
-                                          "Show agent circuit data", 
+                                          "Show agent circuit data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show pending-objects",
                                           "show pending-objects",
-                                          "Show # of objects on the pending queues of all scene viewers", 
+                                          "Show # of objects on the pending queues of all scene viewers",
                                           HandleShow);
 
             m_console.Commands.AddCommand("General", false, "show modules",
                                           "show modules",
-                                          "Show module data", 
+                                          "Show module data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Regions", false, "show regions",
                                           "show regions",
-                                          "Show region data", 
+                                          "Show region data",
                                           HandleShow);
-            
+
             m_console.Commands.AddCommand("Regions", false, "show ratings",
                                           "show ratings",
-                                          "Show rating data", 
+                                          "Show rating data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Objects", false, "backup",
                                           "backup",
-                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", 
+                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "create region",
@@ -430,22 +430,22 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Regions", false, "restart",
                                           "restart",
-                                          "Restart the currently selected region(s) in this instance", 
+                                          "Restart the currently selected region(s) in this instance",
                                           RunCommand);
 
             m_console.Commands.AddCommand("General", false, "command-script",
                                           "command-script <script>",
-                                          "Run a command script from file", 
+                                          "Run a command script from file",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "remove-region",
                                           "remove-region <name>",
-                                          "Remove a region from this simulator", 
+                                          "Remove a region from this simulator",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "delete-region",
                                           "delete-region <name>",
-                                          "Delete a region from disk", 
+                                          "Delete a region from disk",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Estates", false, "estate create",
@@ -476,7 +476,7 @@ namespace OpenSim
             {
                 RunCommandScript(m_shutdownCommandsFile);
             }
-            
+
             base.ShutdownSpecific();
         }
 
@@ -515,7 +515,7 @@ namespace OpenSim
         private void KickUserCommand(string module, string[] cmdparams)
         {
             bool force = false;
-            
+
             OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; });
 
             List<string> mainParams = options.Parse(cmdparams);
@@ -612,7 +612,7 @@ namespace OpenSim
                 MainConsole.Instance.Output(usage);
                 return;
             }
-            
+
             float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
             OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
 
@@ -624,7 +624,7 @@ namespace OpenSim
 
             Vector3 center = new Vector3(centerX, centerY, 0.0f);
 
-            SceneManager.ForEachSelectedScene(delegate(Scene scene) 
+            SceneManager.ForEachSelectedScene(delegate(Scene scene)
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
@@ -776,8 +776,8 @@ namespace OpenSim
             CreateRegion(regInfo, true, out scene);
 
             if (changed)
-                    m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
-        
+                m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
+
             scene.Start();
         }
 
@@ -880,8 +880,8 @@ namespace OpenSim
         protected override void HandleRestartRegion(RegionInfo whichRegion)
         {
             base.HandleRestartRegion(whichRegion);
- 
-            // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the 
+
+            // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the
             // m_console.ConsoleScene to null (indicating all scenes).
             if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name)
                 SceneManager.TrySetCurrentScene(whichRegion.RegionName);
@@ -914,7 +914,7 @@ namespace OpenSim
                     {
                         agents = SceneManager.GetCurrentSceneAvatars();
                     }
-                
+
                     MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
 
                     MainConsole.Instance.Output(
@@ -960,7 +960,7 @@ namespace OpenSim
 
                 case "modules":
                     SceneManager.ForEachSelectedScene(
-                        scene => 
+                        scene =>
                         {
                             MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name);
 
@@ -996,16 +996,16 @@ namespace OpenSim
                     cdt.AddColumn("Ready?", 6);
                     cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
                     SceneManager.ForEachScene(
-                        scene => 
-                        { 
-                            RegionInfo ri = scene.RegionInfo; 
+                        scene =>
+                        {
+                            RegionInfo ri = scene.RegionInfo;
                             cdt.AddRow(
-                                ri.RegionName, 
-                                ri.RegionID, 
-                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 
+                                ri.RegionName,
+                                ri.RegionID,
+                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
                                 string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
-                                ri.InternalEndPoint.Port, 
-                                scene.Ready ? "Yes" : "No", 
+                                ri.InternalEndPoint.Port,
+                                scene.Ready ? "Yes" : "No",
                                 ri.EstateSettings.EstateName);
                         }
                     );
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8499a90..b33e2c2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -85,7 +85,7 @@ namespace OpenSim
 
         protected string proxyUrl;
         protected int proxyOffset = 0;
-        
+
         public string userStatsURI = String.Empty;
         public string managedStatsURI = String.Empty;
 
@@ -125,7 +125,7 @@ namespace OpenSim
         {
             get { return m_EnvConfigSource; }
         }
-       
+
         public uint HttpServerPort
         {
             get { return m_httpServerPort; }
@@ -210,7 +210,7 @@ namespace OpenSim
         }
 
         /// <summary>
-        /// Performs startup specific to the region server, including initialization of the scene 
+        /// Performs startup specific to the region server, including initialization of the scene
         /// such as loading configuration from disk.
         /// </summary>
         protected override void StartupSpecific()
@@ -228,7 +228,7 @@ namespace OpenSim
                 string pidFile = startupConfig.GetString("PIDFile", String.Empty);
                 if (pidFile != String.Empty)
                     CreatePIDFile(pidFile);
-                
+
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
 
                 m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
@@ -254,11 +254,11 @@ namespace OpenSim
             if (m_simulationDataService == null)
                 throw new Exception(
                     string.Format(
-                        "Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.", 
+                        "Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.",
                         module));
 
             // Load the estate data service
-            module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty); 
+            module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty);
             if (String.IsNullOrEmpty(module))
                 throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] or [EstateService] section");
 
@@ -268,7 +268,7 @@ namespace OpenSim
                 if (m_estateDataService == null)
                     throw new Exception(
                         string.Format(
-                            "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", 
+                            "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.",
                             module));
             }
 
@@ -405,9 +405,9 @@ namespace OpenSim
             // set initial ServerURI
             regionInfo.HttpPort = m_httpServerPort;
             regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/";
-            
+
             regionInfo.osSecret = m_osSecret;
-            
+
             if ((proxyUrl.Length > 0) && (portadd_flag))
             {
                 // set proxy url to RegionInfo
@@ -461,17 +461,17 @@ namespace OpenSim
 
             // Prims have to be loaded after module configuration since some modules may be invoked during the load
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
-            
+
             // TODO : Try setting resource for region xstats here on scene
             MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
-            
+
             scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
             scene.EventManager.TriggerParcelPrimCountUpdate();
 
             if (scene.SnmpService != null)
             {
                 scene.SnmpService.BootInfo("Grid Registration in progress", scene);
-            } 
+            }
 
             try
             {
@@ -480,7 +480,7 @@ namespace OpenSim
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 
+                    "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
                     e.Message, e.StackTrace);
 
                 if (scene.SnmpService != null)
@@ -608,7 +608,7 @@ namespace OpenSim
 
                     if (rawEstateOwnerUuid == null)
                         rawEstateOwnerUuid = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
-        
+
                     UUID estateOwnerUuid = UUID.Zero;
                     if (!UUID.TryParse(rawEstateOwnerUuid, out estateOwnerUuid))
                     {
@@ -671,7 +671,7 @@ namespace OpenSim
             scene.DeleteAllSceneObjects();
             SceneManager.CloseScene(scene);
             //ShutdownClientServer(scene.RegionInfo);
-            
+
             if (!cleanup)
                 return;
 
@@ -733,7 +733,7 @@ namespace OpenSim
             SceneManager.CloseScene(scene);
             //ShutdownClientServer(scene.RegionInfo);
         }
-        
+
         /// <summary>
         /// Remove a region from the simulator without deleting it permanently.
         /// </summary>
@@ -745,7 +745,7 @@ namespace OpenSim
             if (SceneManager.TryGetScene(name, out target))
                 CloseRegion(target);
         }
-        
+
         /// <summary>
         /// Create a scene and its initial base structures.
         /// </summary>
@@ -781,15 +781,15 @@ namespace OpenSim
             IEstateDataService estateDataService, AgentCircuitManager circuitManager)
         {
             return new Scene(
-                regionInfo, circuitManager,  
+                regionInfo, circuitManager,
                 simDataService, estateDataService,
                 Config, m_version);
         }
-        
+
         protected virtual void HandleRestartRegion(RegionInfo whichRegion)
         {
             m_log.InfoFormat(
-                "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", 
+                "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
                 whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
 
             //ShutdownClientServer(whichRegion);
@@ -824,18 +824,18 @@ namespace OpenSim
 
         /// <summary>
         /// Handler to supply the current extended status of this sim
-        /// Sends the statistical data in a json serialization 
+        /// Sends the statistical data in a json serialization
         /// </summary>
         public class XSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-        
-            public XSimStatusHandler(OpenSimBase sim) 
+
+            public XSimStatusHandler(OpenSimBase sim)
                 : base("GET", "/" + Util.SHA1Hash(sim.osSecret), "XSimStatus", "Simulator XStatus")
             {
                 m_opensim = sim;
             }
-            
+
             protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
@@ -850,20 +850,20 @@ namespace OpenSim
 
         /// <summary>
         /// Handler to supply the current extended status of this sim to a user configured URI
-        /// Sends the statistical data in a json serialization 
-        /// If the request contains a key, "callback" the response will be wrappend in the 
+        /// Sends the statistical data in a json serialization
+        /// If the request contains a key, "callback" the response will be wrappend in the
         /// associated value for jsonp used with ajax/javascript
         /// </summary>
         protected class UXSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-        
+
             public UXSimStatusHandler(OpenSimBase sim)
                 : base("GET", "/" + sim.userStatsURI, "UXSimStatus", "Simulator UXStatus")
             {
-                m_opensim = sim;                
+                m_opensim = sim;
             }
-            
+
             protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
@@ -956,7 +956,7 @@ namespace OpenSim
         {
             regionnum = SceneManager.Scenes.Count;
         }
-        
+
         /// <summary>
         /// Create an estate with an initial region.
         /// </summary>
@@ -983,19 +983,19 @@ namespace OpenSim
                 MainConsole.Instance.OutputFormat("An estate named {0} already exists.  Please try again.", newName);
                 return false;
             }
-            
+
             regInfo.EstateSettings.EstateName = newName;
-            
+
             // FIXME: Later on, the scene constructor will reload the estate settings no matter what.
             // Therefore, we need to do an initial save here otherwise the new estate name will be reset
             // back to the default.  The reloading of estate settings by scene could be eliminated if it
-            // knows that the passed in settings in RegionInfo are already valid.  Also, it might be 
+            // knows that the passed in settings in RegionInfo are already valid.  Also, it might be
             // possible to eliminate some additional later saves made by callers of this method.
-            EstateDataService.StoreEstateSettings(regInfo.EstateSettings);   
-            
+            EstateDataService.StoreEstateSettings(regInfo.EstateSettings);
+
             return true;
         }
-        
+
         /// <summary>
         /// Load the estate information for the provided RegionInfo object.
         /// </summary>
@@ -1009,8 +1009,8 @@ namespace OpenSim
                 return false;   // estate info in the database did not change
 
             m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
-            
-            List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();                
+
+            List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
             Dictionary<string, EstateSettings> estatesByName = new Dictionary<string, EstateSettings>();
 
             foreach (EstateSettings estate in estates)
@@ -1103,12 +1103,12 @@ namespace OpenSim
                         MainConsole.Instance.Output("Joining the estate failed. Please try again.");
                     }
                 }
-            }
+            }
 
-            return true;        // need to update the database
-        }
+            return true;        // need to update the database
+        }
     }
-    
+
     public class OpenSimConfigSource
     {
         public IConfigSource Source;
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index b3efce0..09772d3 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/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")]
@@ -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/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index ba92fd6..83a9fff 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -57,9 +57,9 @@ namespace OpenSim
         public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
         public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } }
         public IEstateDataService EstateDataService { get { return m_estateDataService; } }
-       
+
         protected abstract void Initialize();
-        
+
         protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager);
 
         protected override void StartupSpecific()
@@ -68,11 +68,11 @@ namespace OpenSim
 
             Initialize();
 
-            m_httpServer 
+            m_httpServer
                 = new BaseHttpServer(
-                    m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort, 
+                    m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort,
                     m_networkServersInfo.HttpSSLCN);
-            
+
             if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort))
             {
                 m_log.Error("[REGION SERVER]: HTTP Server config failed.   HTTP Server and HTTPS server must be on different ports");
@@ -107,7 +107,7 @@ namespace OpenSim
                     server.Start();
                 }
             }
-            
+
             base.StartupSpecific();
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index aabdb51..8f65a69 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
             {
                 data = new AgentPrefs(agent);
             }
-                
+
             if (req.ContainsKey("access_prefs"))
             {
                 OSDMap accessPrefs = (OSDMap)req["access_prefs"];  // We could check with ContainsKey...
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index bbadc55..e3c430c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ClientStack.Linden
     public class AvatarPickerSearchModule : INonSharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
         private IPeople m_People;
         private bool m_Enabled = false;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 14a4873..8cb40e1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private ModelCost m_ModelCost;
 
         // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
-        
+
         // These are callbacks which will be setup by the scene so that we can update scene data when we
         // receive capability calls
         public NewInventoryItem AddNewInventoryItem = null;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory
                                                                     // may not be visible till relog
-        
+
         private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!!
         private UUID m_testAssetsCreatorID = UUID.Zero;
 
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack.Linden
             processUpload = 3
         }
         private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle;
-        
+
         public BunchOfCaps(Scene scene, UUID agentID, Caps caps)
         {
             m_Scene = scene;
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             // create a model upload cost provider
             m_ModelCost = new ModelCost(scene);
-           
+
             m_PrimScaleMin = m_ModelCost.PrimScaleMin;
 
             IConfigSource config = m_Scene.Config;
@@ -216,7 +216,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public string GetNewCapPath()
         {
-            return  "/CAPS/" + UUID.Random(); 
+            return  "/CAPS/" + UUID.Random();
         }
 
         /// <summary>
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null);
                     m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
                 }
-                
+
                 if(m_AllowCapGroupMemberData)
                 {
                     IRequestHandler GroupMemberDataHandler = new RestStreamHandler(
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 IRequestHandler CopyInventoryFromNotecardHandler = new RestStreamHandler(
                         "POST",  GetNewCapPath(), CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null);
                 m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", CopyInventoryFromNotecardHandler);
-             
+
             }
             catch (Exception e)
             {
@@ -568,8 +568,8 @@ namespace OpenSim.Region.ClientStack.Linden
                     {
                         string error;
                         int modelcost;
-                        
-                        
+
+
                         if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
                             meshcostdata, out error, ref warning))
                         {
@@ -639,7 +639,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         client.SendAgentAlertMessage(warning, true);
                 }
             }
-            
+
             string assetDes = llsdRequest.description;
             UUID newAsset = UUID.Random();
             UUID newInvItem = UUID.Random();
@@ -813,7 +813,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     List<UUID> textures = new List<UUID>();
 
-                   
+
 //                    if (doTextInv)
                         m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
 
@@ -895,7 +895,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         meshAvatarSkeletons.Add(curAvSkeleton);
                         meshAvatarColliders.Add(curAvCollider);
 
-                        // test code 
+                        // test code
                         if (curAvSkeleton && client != null)
                         {
                             string name = assetName;
@@ -1054,7 +1054,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         prim.LastOwnerID = creatorID;
                         prim.RezzerID = creatorID;
                         prim.CreationDate = Util.UnixTimeSinceEpoch();
-                        
+
                         if (grp == null)
                             prim.Name = assetName;
                         else
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.ClientStack.Linden
         public string GetObjectCost(string request, string path,
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
-        {          
+        {
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             OSDMap resp = new OSDMap();
 
@@ -1446,7 +1446,7 @@ namespace OpenSim.Region.ClientStack.Linden
             for (int i = 0; i < object_ids.Count; i++)
             {
                 UUID uuid = object_ids[i].AsUUID();
-                                
+
                 SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
                 SceneObjectGroup grp = null;
                 if (part != null)
@@ -1479,7 +1479,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 resp[UUID.Zero.ToString()] = object_data;
             }
             string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
         }
 
         public string ResourceCostSelected(string request, string path,
@@ -1548,7 +1548,7 @@ namespace OpenSim.Region.ClientStack.Linden
             resp["selected"] = object_data;
 //            resp["transaction_id"] = "undef";
             string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
         }
 
         public string UpdateAgentInformation(string request, string path,
@@ -1564,7 +1564,7 @@ namespace OpenSim.Region.ClientStack.Linden
             resp["access_prefs"] = accessPrefs;
 
             string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
         }
 
         public bool OSDMapTOVector3(OSDMap map, out Vector3 v)
@@ -1598,19 +1598,19 @@ namespace OpenSim.Region.ClientStack.Linden
 
             IClientAPI client = null;
             ScenePresence sp;
-           
+
             while(true)
             {
                 if(m_Scene.GridUserService == null)
                     break;
-                    
+
                 if(m_Scene.UserManagementModule == null)
                     break;
 
                 m_Scene.TryGetScenePresence(m_AgentID, out sp);
                 if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit)
                     break;
-                
+
                 client = sp.ControllingClient;
 
                 if(!m_Scene.UserManagementModule.IsLocalGridUser(m_AgentID))
@@ -1637,7 +1637,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 ILandObject land = m_Scene.LandChannel.GetLandObject(pos);
                 if(land == null)
                     break;
-                
+
                 ulong gpowers = client.GetGroupPowers(land.LandData.GroupID);
                 SceneObjectGroup telehub = null;
                 if (m_Scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     !m_Scene.Permissions.IsGod(m_AgentID) &&
                     m_AgentID != land.LandData.OwnerID && // (b) land owners can set home
                     // (c) members of the land-associated group in roles that can set home
-                    ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) && 
+                    ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) &&
                     // (d) parcels with telehubs can be the home of anyone
                     (telehub == null || !land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
                 {
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 break;
             }
-            
+
             string response;
 
             if(fail)
@@ -1728,11 +1728,11 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_GroupsModule = m_Scene.RequestModuleInterface<IGroupsModule>();
                 if(m_GroupsModule == null)
                     break;
-                    
+
                 m_Scene.TryGetScenePresence(m_AgentID, out sp);
                 if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit)
                     break;
-                
+
                 client = sp.ControllingClient;
 
                 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
@@ -1866,12 +1866,12 @@ namespace OpenSim.Region.ClientStack.Linden
                 OSDMap osdname = new OSDMap();
                 if(parts[0] == "Unknown")
                 {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));
                     osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2));
                 }
                 else
                 {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));
                     osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1));
                 }
                 osdname["display_name"] = OSD.FromString(kvp.Value);
@@ -1916,7 +1916,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_assetType = String.Empty;
         private int m_cost;
         private string m_error = String.Empty;
-        
+
         private Timer m_timeoutTimer = new Timer();
         private UUID m_texturesFolder;
         private int m_nreqtextures;
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private int m_groupMask;
         private int m_everyoneMask;
 
-        
+
         public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
                                 UUID parentFolderID, string invType, string assetType, string path,
                                 IHttpServer httpServer, bool dumpAssetsToFile,
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index 5b4e0da..683c3d5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
         }
 
-        public void Close() { } 
+        public void Close() { }
 
         public void AddRegion(Scene scene)
         {
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
 
         public void PostInitialise() { }
-        #endregion 
+        #endregion
 
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index fb22694..eb1ab45 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ClientStack.Linden
 {
     public struct ModelPrimLimits
     {
-        
+
     }
 
     public class ModelCost
@@ -82,9 +82,9 @@ namespace OpenSim.Region.ClientStack.Linden
         const float lowestSizeWth = 2f; // 3x
         // favor potencially physical optimized meshs versus automatic decomposition
         const float physMeshSizeWth = 6f; // counts  7x
-        const float physHullSizeWth = 8f; // counts  9x      
+        const float physHullSizeWth = 8f; // counts  9x
 
-        // stream cost area factors 
+        // stream cost area factors
         // more or less like SL
         const float highLodFactor = 17.36f;
         const float midLodFactor = 277.78f;
@@ -108,7 +108,7 @@ namespace OpenSim.Region.ClientStack.Linden
             PrimScaleMin = scene.m_minNonphys;
             NonPhysicalPrimScaleMax = scene.m_maxNonphys;
             PhysicalPrimScaleMax = scene.m_maxPhys;
-            ObjectLinkedPartsMax = scene.m_linksetCapacity;                 
+            ObjectLinkedPartsMax = scene.m_linksetCapacity;
         }
 
         public void Econfig(IConfig EconomyConfig)
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack.Linden
             bytecost = EconomyConfig.GetFloat("ModelMeshByteCost", bytecost);
         }
 
-        // storage for a single mesh asset cost parameters       
+        // storage for a single mesh asset cost parameters
         private class ameshCostParam
         {
             // LOD sizes for size dependent streaming cost
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ClientStack.Linden
         // resources input LLSD request
         // basicCost input region assets upload cost
         // totalcost returns model total upload fee
-        // meshcostdata returns detailed costs for viewer 
+        // meshcostdata returns detailed costs for viewer
         // avatarSkeleton if mesh includes a avatar skeleton
         // useAvatarCollider if we should use physics mesh for avatar
         public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost,
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.Linden
             error = string.Empty;
 
             bool avatarSkeleton = false;
-            
+
             if (resources == null ||
                 resources.instance_list == null ||
                 resources.instance_list.Array.Count == 0)
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack.Linden
             if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0)
             {
                 numberMeshs = resources.mesh_list.Array.Count;
-                
+
                 for (int i = 0; i < numberMeshs; i++)
                 {
                     ameshCostParam curCost = new ameshCostParam();
@@ -230,7 +230,7 @@ namespace OpenSim.Region.ClientStack.Linden
             }
 
             // instances (prims) cost
-            
+
 
             int mesh;
             int skipedSmall = 0;
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             // breakdown prices
             // don't seem to be in use so removed code for now
-            
+
             return true;
         }
 
@@ -404,7 +404,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     int sksize = tmpmap["size"].AsInteger();
                     if(sksize > 0)
                         skeleton = true;
-                }               
+                }
             }
 
             if (map.ContainsKey("physics_convex"))
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.Linden
             }
 
             submesh_offset = -1;
-            
+
             // only look for LOD meshs sizes
 
             if (map.ContainsKey("high_lod"))
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ClientStack.Linden
             cost.physicsCost = 0.04f * phys_hullsvertices;
 
             float sfee;
-            
+
             sfee = data.Length; // start with total compressed data size
 
             // penalize lod meshs that should be more builder optimized
@@ -535,7 +535,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             // bytes to money
             sfee *= bytecost;
-           
+
             cost.costFee = sfee;
             return true;
         }
@@ -675,7 +675,7 @@ namespace OpenSim.Region.ClientStack.Linden
             return true;
         }
 
-        // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length 
+        // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length
         private float streamingCost(ameshCostParam curCost, float sqdiam)
         {
             // compute efective areas
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index ba3edd6..1feece1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -74,12 +74,12 @@ namespace OpenSim.Region.ClientStack.Linden
         private const int SERVER_EQ_TIME_NO_EVENTS = VIEWER_TIMEOUT - (10 * 1000);
 
         protected Scene m_scene;
-        
+
         private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
 
         private Dictionary<UUID, Queue<OSD>> queues = new Dictionary<UUID, Queue<OSD>>();
         private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
-            
+
         #region INonSharedRegionModule methods
         public virtual void Initialise(IConfigSource config)
         {
@@ -170,7 +170,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 foreach (KeyValuePair<UUID, Queue<OSD>> kvp in queues)
                 {
                     MainConsole.Instance.OutputFormat(
-                        "For agent {0} there are {1} messages queued for send.", 
+                        "For agent {0} there are {1} messages queued for send.",
                         kvp.Key, kvp.Value.Count);
                 }
             }
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     if (DebugLevel > 0)
                         m_log.DebugFormat(
-                            "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
+                            "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}",
                             agentId, m_scene.RegionInfo.RegionName);
 
                     queues[agentId] = new Queue<OSD>();
@@ -238,13 +238,13 @@ namespace OpenSim.Region.ClientStack.Linden
                             "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}",
                             avatarID, evMap["message"], m_scene.Name);
                 }
-            } 
+            }
             catch (NullReferenceException e)
             {
                 m_log.Error("[EVENTQUEUE] Caught exception: " + e);
                 return false;
             }
-            
+
             return true;
         }
 
@@ -309,10 +309,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     // push markers to handle old responses still waiting
                     // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe 
+                    // even being a new queue better be safe
                     queue.Enqueue(null);
                     queue.Enqueue(null); // one should be enough
-                    
+
                     lock (m_AvatarQueueUUIDMapping)
                     {
                         eventQueueGetUUID = UUID.Random();
@@ -336,7 +336,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     // push markers to handle old responses still waiting
                     // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe 
+                    // even being a new queue better be safe
                     queue.Enqueue(null);
                     queue.Enqueue(null); // one should be enough
 
@@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
         public void Drop(UUID requestID, UUID pAgentId)
         {
-            // do nothing for now, hope client close will do it        
+            // do nothing for now, hope client close will do it
         }
 
         public Hashtable GetEvents(UUID requestID, UUID pAgentId)
@@ -437,7 +437,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     negativeID = true;
                     thisID = -thisID;
                 }
-               
+
                 while (queue.Count > 0)
                 {
                     element = queue.Dequeue();
@@ -477,7 +477,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // if there where no elements before a marker send a NoEvents
             if (array.Count == 0)
                 return NoEvents(requestID, pAgentId);
-          
+
             Hashtable responsedata = new Hashtable();
             responsedata["int_response_code"] = 200;
             responsedata["content_type"] = "application/xml";
@@ -500,7 +500,7 @@ namespace OpenSim.Region.ClientStack.Linden
             responsedata["http_protocol_version"] = "HTTP/1.0";
             return responsedata;
         }
- 
+
         public void DisableSimulator(ulong handle, UUID avatarID)
         {
             OSD item = EventQueueHelper.DisableSimulator(handle);
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
 
         public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
-                                ulong regionHandle, int regionSizeX, int regionSizeY) 
+                                ulong regionHandle, int regionSizeX, int regionSizeY)
         {
             if (DebugLevel > 0)
                 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
@@ -528,9 +528,9 @@ namespace OpenSim.Region.ClientStack.Linden
             Enqueue(item, avatarID);
         }
 
-        public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+        public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess,
                                         IPEndPoint regionExternalEndPoint,
-                                        uint locationID, uint flags, string capsURL, 
+                                        uint locationID, uint flags, string capsURL,
                                         UUID avatarID, int regionSizeX, int regionSizeY)
         {
             if (DebugLevel > 0)
@@ -560,15 +560,15 @@ namespace OpenSim.Region.ClientStack.Linden
                                          uint timeStamp, bool offline, int parentEstateID, Vector3 position,
                                          uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket)
         {
-            OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, 
-                                                             timeStamp, offline, parentEstateID, position, ttl, transactionID, 
+            OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog,
+                                                             timeStamp, offline, parentEstateID, position, ttl, transactionID,
                                                              fromGroup, binaryBucket);
             Enqueue(item, toAgent);
             //m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item);
 
         }
 
-        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat,
                                                       bool isModerator, bool textMute, bool isEnterorLeave)
         {
             OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 5e0bd71..e1e88ae 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             return BuildEvent("DisableSimulator", llsdBody);
         }
-        
+
         public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                                       IPEndPoint newRegionExternalEndPoint,
                                       string capsURL, UUID agentID, UUID sessionID,
@@ -194,13 +194,13 @@ namespace OpenSim.Region.ClientStack.Linden
             script.Add("ItemID", OSD.FromUUID(itemID));
             script.Add("Running", OSD.FromBoolean(running));
             script.Add("Mono", OSD.FromBoolean(mono));
-            
+
             OSDArray scriptArr = new OSDArray();
             scriptArr.Add(script);
-            
+
             OSDMap body = new OSDMap();
             body.Add("Script", scriptArr);
-            
+
             return BuildEvent("ScriptRunningReply", body);
         }
 
@@ -243,7 +243,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             OSDMap messageParams = new OSDMap(15);
             messageParams.Add("type", new OSDInteger((int)dialog));
-            
+
             OSDArray positionArray = new OSDArray(3);
             positionArray.Add(OSD.FromReal(position.X));
             positionArray.Add(OSD.FromReal(position.Y));
@@ -423,7 +423,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID));
                 QueryDataMap.Add("ProductSku", OSD.FromInteger(0));
                 QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price));
-                
+
                 QueryData.Add(QueryDataMap);
             }
             body.Add("QueryData", QueryData);
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ClientStack.Linden
         public static OSD partPhysicsProperties(uint localID, byte physhapetype,
                         float density, float friction, float bounce, float gravmod)
         {
-            
+
             OSDMap physinfo = new OSDMap(6);
             physinfo["LocalID"] = localID;
             physinfo["Density"] = density;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 1e629bd..ee3f4f1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            UUID npcId 
+            UUID npcId
                 = m_npcMod.CreateNPC(
                     "John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance());
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index f66ef57..ae18bc1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
     {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
         private IAssetService m_AssetService;
         private bool m_Enabled = true;
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_URL2;
         private string m_RedirectURL = null;
         private string m_RedirectURL2 = null;
-       
+
         struct aPollRequest
         {
             public PollServiceMeshEventArgs thepoll;
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_scene = pScene;
-            
+
             m_assetService = pScene.AssetService;
         }
 
@@ -342,7 +342,7 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 string capUrl = "/CAPS/" + UUID.Random() + "/";
 
-                // Register this as a poll service           
+                // Register this as a poll service
                 PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
 
                 args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -394,7 +394,7 @@ namespace OpenSim.Region.ClientStack.Linden
             private readonly Scene m_scene;
             private ThrottleOutPacketType Throttle;
             private readonly UUID User;
-            
+
             public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
             {
                 ThrottleBytes = pBytes;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     // Normal
                     if (BytesSent <= ThrottleBytes)
                     {
-                        BytesSent += response.bytes;                     
+                        BytesSent += response.bytes;
                         return true;
                     }
                     else
@@ -432,7 +432,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 }
                 return haskey;
             }
-           
+
             public void ProcessTime()
             {
                 PassTime();
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 14a59fe..0c20e04 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 new OpenMetaverse.BlockingQueue<aPollRequest>();
 
         private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
-   
+
         private string m_Url = "localhost";
 
         #region ISharedRegionModule Members
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
         private int ExtractImageThrottle(byte[] pthrottles)
         {
-       
+
             byte[] adjData;
             int pos = 0;
 
@@ -195,10 +195,10 @@ namespace OpenSim.Region.ClientStack.Linden
             if(m_NumberScenes <= 0 && m_workerThreads != null)
             {
                 m_log.DebugFormat("[GetTextureModule] Closing");
-                
+
                 foreach (Thread t in m_workerThreads)
                     Watchdog.AbortThread(t.ManagedThreadId);
-            
+
                 m_queue.Clear();
             }
         }
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ClientStack.Linden
             private Scene m_scene;
             private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000);
             public PollServiceTextureEventArgs(UUID pId, Scene scene) :
-                    base(null, "", null, null, null, pId, int.MaxValue)              
+                    base(null, "", null, null, null, pId, int.MaxValue)
             {
                 m_scene = scene;
                 // x is request id, y is userid
@@ -258,7 +258,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     reqinfo.reqID = x;
                     reqinfo.request = y;
                     reqinfo.send503 = false;
-                    
+
                     lock (responses)
                     {
                         if (responses.Count > 0)
@@ -317,7 +317,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     Hashtable headers = new Hashtable();
                     headers["Retry-After"] = 30;
                     response["headers"] = headers;
-                    
+
                     lock (responses)
                         responses[requestID] = new aPollResponse() {bytes = 0, response = response};
 
@@ -334,13 +334,13 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["content_type"] = "text/plain";
                     response["keepalive"] = false;
                     response["reusecontext"] = false;
-                    
+
                     lock (responses)
                         responses[requestID] = new aPollResponse() {bytes = 0, response = response};
 
                     return;
                 }
-                
+
                 response = m_getTextureHandler.Handle(requestinfo.request);
                 lock (responses)
                 {
@@ -349,8 +349,8 @@ namespace OpenSim.Region.ClientStack.Linden
                                                    bytes = (int) response["int_bytes"],
                                                    response = response
                                                };
-                   
-                } 
+
+                }
                 m_throttler.ProcessTime();
             }
 
@@ -368,16 +368,16 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 string capUrl = "/CAPS/" + UUID.Random() + "/";
 
-                // Register this as a poll service           
+                // Register this as a poll service
                 PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
-                
+
                 args.Type = PollServiceEventArgs.EventType.Texture;
                 MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
 
                 string hostName = m_scene.RegionInfo.ExternalHostName;
                 uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
                 string protocol = "http";
-                
+
                 if (MainServer.Instance.UseSSL)
                 {
                     hostName = MainServer.Instance.SSLCommonName;
@@ -484,5 +484,5 @@ namespace OpenSim.Region.ClientStack.Linden
             }
             public int ThrottleBytes;
         }
-    }   
+    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 1b68603..44bf1a5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.Linden
 //          data["username"] = sp.Firstname + "." + sp.Lastname;
 //          data["display_name_next_update"] = new OSDDate(DateTime.Now);
 //          data["legacy_first_name"] = sp.Firstname;
-            data["mesh_upload_status"] = "valid";
+            data["mesh_upload_status"] = "valid";
 //          data["display_name"] = sp.Firstname + " " + sp.Lastname;
 //          data["legacy_last_name"] = sp.Lastname;
 //          data["id"] = m_agentID;
@@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             //Send back data
             Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 200; 
+            responsedata["int_response_code"] = 200;
             responsedata["content_type"] = "text/plain";
             responsedata["keepalive"] = false;
             responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 94f8bc1..189fa36 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ClientStack.Linden
     {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
 
         #region INonSharedRegionModule Members
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
 
         public void Close()
-        {            
+        {
         }
 
         public string Name
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 713125c..6874662 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 if (i == 0)
                 {
                     rootpos = obj.Position;
-//                    rootrot = obj.Rotation;                    
+//                    rootrot = obj.Rotation;
                 }
 
                 // Combine the extraparams data into it's ugly blob again....
@@ -321,7 +321,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 pbs.TextureEntry = tmp.GetBytes();
                 prim.Shape = pbs;
                 prim.Scale = obj.Scale;
-                
+
                 SceneObjectGroup grp = new SceneObjectGroup();
 
                 grp.SetRootPart(prim);
@@ -329,21 +329,21 @@ namespace OpenSim.Region.ClientStack.Linden
                 if (i == 0)
                 {
                     rootGroup = grp;
-                   
+
                 }
                 grp.AttachToScene(m_scene);
                 grp.AbsolutePosition = obj.Position;
                 prim.RotationOffset = obj.Rotation;
-                
+
                 // Required for linking
                 grp.RootPart.ClearUpdateSchedule();
-                
+
                 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos))
                 {
                     m_scene.AddSceneObject(grp);
                     grp.AbsolutePosition = obj.Position;
                 }
-                
+
                 allparts[i] = grp;
             }
 
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack.Linden
             pos
                 = m_scene.GetNewRezLocation(
                     Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false);
-           
+
             responsedata["int_response_code"] = 200; //501; //410; //404;
             responsedata["content_type"] = "text/plain";
             responsedata["keepalive"] = false;
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             return responsedata;
         }
-        
+
         private string ConvertUintToBytes(uint val)
         {
             byte[] resultbytes = Utils.UIntToBytes(val);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
index 67272dd..f36826b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ClientStack.LindenCaps")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index 5196368..b3e3ac3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden
     {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
         private IEventQueue m_eventQueue;
         private Commands m_commands = new Commands();
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             SendConsoleOutput(agentID, reply);
         }
-        
+
         public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn)
         {
             m_commands.AddCommand(module, shared, command, help, longhelp, fn);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index f7259a6..39f5baf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.ClientStack.Linden
     /// This is required for uploading Mesh.
     /// Since is accepts an open-ended response, we also send more information
     /// for viewers that care to interpret it.
-    /// 
+    ///
     /// NOTE: Part of this code was adapted from the Aurora project, specifically
     /// the normal part of the response in the capability handler.
     /// </remarks>
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.Linden
             IConfig config = source.Configs["SimulatorFeatures"];
 
             if (config != null)
-            {  
+            {
                 //
                 // All this is obsolete since getting these features from the grid service!!
                 // Will be removed after the next release
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             //Send back data
             Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 200; 
+            responsedata["int_response_code"] = 200;
             responsedata["content_type"] = "text/plain";
             responsedata["keepalive"] = false;
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
index db16ccb..6ffed4d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests
             OSDMap responseOsd = (OSDMap)OSDParser.DeserializeLLSDXml(context.ResponseBody);
             OSDArray foldersOsd = (OSDArray)responseOsd["folders"];
             OSDMap folderOsd = (OSDMap)foldersOsd[0];
-           
+
             // A sanity check that the response has the expected number of descendents for a default inventory
             // TODO: Need a more thorough check.
             Assert.That((int)folderOsd["descendents"], Is.EqualTo(16));
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 8fd8d1f..dfe097e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.Linden
         public void AddRegion(Scene s)
         {
             m_scene = s;
-           
+
         }
 
         public void RemoveRegion(Scene s)
@@ -94,14 +94,14 @@ namespace OpenSim.Region.ClientStack.Linden
             s.EventManager.OnRemovePresence -= DeRegisterPresence;
             m_BakedTextureModule = null;
             m_scene = null;
-        }     
+        }
 
         public void RegionLoaded(Scene s)
         {
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
             m_scene.EventManager.OnNewPresence += RegisterNewPresence;
             m_scene.EventManager.OnRemovePresence += DeRegisterPresence;
-            
+
         }
 
         private void DeRegisterPresence(UUID agentId)
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
                     else
-                    {               
+                    {
                         for (int i = 0; i < maxCacheitemsLoop; i++)
                         {
                             if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         avatarhandler.UploadBakedTexture,
                         "UploadBakedTexture",
                         agentID.ToString()));
-                
+
             }
             else
             {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index ba4fb76..e0ec842 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[INVENTORY]: Failed to process queued inventory request {0} for {1}.  Exception {3}", 
+                            "[INVENTORY]: Failed to process queued inventory request {0} for {1}.  Exception {3}",
                             poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e);
                     }
                 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 15d6f7f..0a6785c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
-        /// Sends packets for this texture to a client until packetsToSend is 
+        /// Sends packets for this texture to a client until packetsToSend is
         /// hit or the transfer completes
         /// </summary>
         /// <param name="client">Reference to the client that the packets are destined for</param>
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         m_currentPacket = m_stopPacket;
                         return;
                     }
-                    
+
                     if (DiscardLevel >= 0 || m_stopPacket == 0)
                     {
                         // This shouldn't happen, but if it does, we really can't proceed
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 27ca740..dba2872 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -434,7 +434,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// Entity update queues
         /// </summary>
         public PriorityQueue EntityUpdateQueue { get { return m_entityUpdates; } }
-        
+
         /// <summary>
         /// First name of the agent/avatar represented by the client
         /// </summary>
@@ -478,7 +478,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public List<uint> SelectedObjects {get; private set;}
 
         public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
-       
+
 
         #endregion Properties
 
@@ -554,7 +554,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // there is some unidentified connection problem, not where we have issues due to deadlock
                 if (!IsActive && !force)
                 {
-                    m_log.DebugFormat( "{0} Not attempting to close inactive client {1} in {2} since force flag is not set", 
+                    m_log.DebugFormat( "{0} Not attempting to close inactive client {1} in {2} since force flag is not set",
                         LogHeader, Name, m_scene.Name);
 
                     return;
@@ -713,13 +713,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="packetType"></param>
         /// <param name="handler"></param>
         /// <param name="doAsync">
-        /// If true, when the packet is received handle it on a different thread.  Whether this is given direct to 
+        /// If true, when the packet is received handle it on a different thread.  Whether this is given direct to
         /// a threadpool thread or placed in a queue depends on the inEngine parameter.
         /// </param>
         /// <param name="inEngine">
         /// If async is false then this parameter is ignored.
         /// If async is true and inEngine is false, then the packet is sent directly to a
-        /// threadpool thread. 
+        /// threadpool thread.
         /// If async is true and inEngine is true, then the packet is sent to the IncomingPacketAsyncHandlingEngine.
         /// This may result in slower handling but reduces the risk of overloading the simulator when there are many
         /// simultaneous async requests.
@@ -820,7 +820,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void ProcessSpecificPacketAsync(object state)
         {
             AsyncPacketProcess packetObject = (AsyncPacketProcess)state;
-            
+
             try
             {
                 packetObject.result = packetObject.Method(packetObject.ClientView, packetObject.Pack);
@@ -830,7 +830,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Make sure that we see any exception caused by the asynchronous operation.
                 m_log.Error(
                     string.Format(
-                        "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}  ", packetObject.Pack, Name), 
+                        "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}  ", packetObject.Pack, Name),
                     e);
             }
         }
@@ -976,7 +976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (im.imSessionID == UUID.Zero.Guid)
                     msg.MessageBlock.ID = new UUID(im.fromAgentID) ^ new UUID(im.toAgentID);
                 else
-                    msg.MessageBlock.ID = new UUID(im.imSessionID);                
+                    msg.MessageBlock.ID = new UUID(im.imSessionID);
                 msg.MessageBlock.Offline = im.offline;
                 msg.MessageBlock.ParentEstateID = im.ParentEstateID;
                 msg.MessageBlock.Position = im.Position;
@@ -1301,7 +1301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         // Legacy form of invocation that passes around a bare data array.
         // Just ignore what was passed and use the real terrain info that is part of the scene.
-        // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI, 
+        // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI,
         //    there is a special form for specifying multiple terrain patches to send.
         //    The form is to pass 'px' as negative the number of patches to send and to
         //    pass the float array as pairs of patch X and Y coordinates. So, passing 'px'
@@ -1396,7 +1396,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public virtual void SendWindData(int version, Vector2[] windSpeeds)
         {
 //            Vector2[] windSpeeds = (Vector2[])o;
-          
+
             ulong handle = this.Scene.RegionInfo.RegionHandle;
             bool isNewData;
             lock(lastWindPackets)
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_entityUpdates.Remove(localIDs);
 
             KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
-            
+
             int perpacket = localIDs.Count;
             if(perpacket > 200)
                 perpacket = 200;
@@ -2545,7 +2545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             for (int i = 0; i < buttonlabels.Length; i++)
             {
                 buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24); 
+                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24);
             }
             dialog.Buttons = buttons;
 
@@ -2863,15 +2863,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
         {
 /* not in use
-            // udp part           
-            ObjectPropertiesPacket packet = 
+            // udp part
+            ObjectPropertiesPacket packet =
                 (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
             ObjectPropertiesPacket.ObjectDataBlock[] ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[parts.Count];
 
             int i = 0;
             foreach(SceneObjectPart sop in parts)
                 ObjectData[i++] = CreateObjectPropertiesBlock(sop);
-   
+
             packet.ObjectData = ObjectData;
             packet.Header.Zerocoded = true;
             // udp send splits this mega packets correctly
@@ -3003,13 +3003,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             isWearable = ((AssetType) req.AssetInf.Type ==
                      AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
 
-            
+
             //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable);
-           
-            
-            //if (isWearable) 
+
+
+            //if (isWearable)
             //    m_log.Debug((AssetType)req.AssetInf.Type);
-            
+
             TransferInfoPacket Transfer = new TransferInfoPacket();
             Transfer.TransferInfo.ChannelType = 2;
             Transfer.TransferInfo.Status = 0;
@@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if(avatarID != AgentId)
                 m_log.Debug("[CLIENT]: SendAgentGroupDataUpdate avatarID != AgentId");
-                 
+
             IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
             if(eq != null)
             {
@@ -3862,7 +3862,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count];
             AgentWearablesUpdatePacket.WearableDataBlock awb;
             int idx = 0;
-           
+
                     for (int i = 0; i < wearables.Length; i++)
                     {
                         for (int j = 0; j < wearables[i].Count; j++)
@@ -3878,7 +3878,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             //                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
                             //                                    awb.ItemID, awb.AssetID, i, Name);
                         }
-                    }    
+                    }
 
             OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
         }
@@ -3955,7 +3955,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
 //                avatar.Name, avatar.UUID, Name, AgentId);
-            
+
             ScenePresence presence = avatar as ScenePresence;
             if (presence == null)
                 return;
@@ -3965,7 +3965,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             objupdate.RegionData.RegionHandle = presence.RegionHandle;
 //            objupdate.RegionData.TimeDilation = ushort.MaxValue;
-            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);    
+            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
             objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
             objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
 
@@ -4021,7 +4021,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Primitive Packet/Data Sending Methods
 
-        
+
         /// <summary>
         /// Generate one of the object update packets based on PrimUpdateFlags
         /// and broadcast the packet to clients
@@ -4054,18 +4054,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             uint priority = m_prioritizer.GetUpdatePriority(this, entity);
 
             lock (m_entityUpdates.SyncRoot)
-                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags)); 
+                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags));
         }
 
         /// <summary>
-        /// Requeue an EntityUpdate when it was not acknowledged by the client. 
-        /// We will update the priority and put it in the correct queue, merging update flags 
-        /// with any other updates that may be queued for the same entity. 
+        /// Requeue an EntityUpdate when it was not acknowledged by the client.
+        /// We will update the priority and put it in the correct queue, merging update flags
+        /// with any other updates that may be queued for the same entity.
         /// The original update time is used for the merged update.
         /// </summary>
         private void ResendPrimUpdate(EntityUpdate update)
-        {          
-            // If the update exists in priority queue, it will be updated.           
+        {
+            // If the update exists in priority queue, it will be updated.
             // If it does not exist then it will be added with the current (rather than its original) priority
             uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity);
 
@@ -4074,9 +4074,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
-        /// Requeue a list of EntityUpdates when they were not acknowledged by the client. 
-        /// We will update the priority and put it in the correct queue, merging update flags 
-        /// with any other updates that may be queued for the same entity. 
+        /// Requeue a list of EntityUpdates when they were not acknowledged by the client.
+        /// We will update the priority and put it in the correct queue, merging update flags
+        /// with any other updates that may be queued for the same entity.
         /// The original update time is used for the merged update.
         /// </summary>
         private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
@@ -4140,7 +4140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 lock (m_entityUpdates.SyncRoot)
                     if (!m_entityUpdates.TryDequeue(out update, out timeinqueue))
                         break;
-                   
+
                 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
 
                 if(updateFlags.HasFlag(PrimUpdateFlags.Kill))
@@ -4243,7 +4243,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             dpos = (float)Math.Sqrt(dpos) - bradius;
                             if(dpos > cullingrange)
                                 continue;
- 
+
                             GroupsNeedFullUpdate.Add(grp);
                             continue;
                         }
@@ -4276,7 +4276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bool canUseCompressed = true;
                 bool canUseImproved = true;
 
-                
+
                 // Compressed object updates only make sense for LL primitives
                 if (!(update.Entity is SceneObjectPart))
                 {
@@ -4316,14 +4316,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         canUseImproved = false;
                     }
                 }
-    
+
                 #endregion UpdateFlags to packet type conversion
 
                 #region Block Construction
 
                 // TODO: Remove this once we can build compressed updates
                 canUseCompressed = false;
-              
+
                 if (!canUseImproved && !canUseCompressed)
                 {
                     ObjectUpdatePacket.ObjectDataBlock ablock;
@@ -4368,7 +4368,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             #region Packet Sending
-    
+
             ushort timeDilation;
 
             if(!IsActive)
@@ -4398,7 +4398,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
                 packet.RegionData.TimeDilation = timeDilation;
                 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[objectUpdateBlocks.Count];
-    
+
                 for (int i = 0; i < objectUpdateBlocks.Count; i++)
                     packet.ObjectData[i] = objectUpdateBlocks[i];
 
@@ -4406,7 +4406,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
             }
-    
+
             if (compressedUpdateBlocks.Count > 0)
             {
                 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
@@ -4421,7 +4421,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
             }
-    
+
             if (terseUpdateBlocks.Count > 0)
             {
                 ImprovedTerseObjectUpdatePacket packet
@@ -4430,7 +4430,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
                 packet.RegionData.TimeDilation = timeDilation;
                 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[terseUpdateBlocks.Count];
-    
+
                 for (int i = 0; i < terseUpdateBlocks.Count; i++)
                     packet.ObjectData[i] = terseUpdateBlocks[i];
 
@@ -4484,11 +4484,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
 //            m_log.DebugFormat(
-//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}", 
+//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}",
 //                updatesThisCall, Name, SceneAgent.IsChildAgent ? "child" : "root", Scene.Name);
 //
         }
-        
+
         public void ReprioritizeUpdates()
         {
             lock (m_entityUpdates.SyncRoot)
@@ -4600,7 +4600,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     foreach(SceneObjectPart p in grp.Parts)
                         SendEntityUpdate(p,PrimUpdateFlags.CancelKill);
                 }
-            }       
+            }
 
             CheckGroupsInViewBusy = false;
         }
@@ -4640,8 +4640,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
             {
-                int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);   
-                       
+                int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);
+
                 if (m_entityUpdates.Count > 0)
                     ProcessEntityUpdates(maxUpdateBytes);
 
@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (m_entityUpdates.Count > 0)
                     return true;
                 if (m_entityProps.Count > 0)
-                    return true;                   
+                    return true;
             }
 
             if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
@@ -4775,7 +4775,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             internal bool SendFamilyProps;
             internal bool SendObjectProps;
-            
+
             public ObjectPropertyUpdate(ISceneEntity entity, uint flags, bool sendfam, bool sendobj)
                 : base(entity,(PrimUpdateFlags)flags)
             {
@@ -4790,7 +4790,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 base.Update(update);
             }
         }
-        
+
         public void SendObjectPropertiesFamilyData(ISceneEntity entity, uint requestFlags)
         {
             uint priority = 0;  // time based ordering only
@@ -4824,7 +4824,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             foreach (ObjectPropertyUpdate update in updates)
                 ResendPropertyUpdate(update);
         }
-        
+
         public void SendObjectPropertiesReply(ISceneEntity entity)
         {
             uint priority = 0;  // time based ordering only
@@ -4845,8 +4845,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
 //                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-           
-             
+
+
             EntityUpdate iupdate;
             Int32 timeinqueue; // this is just debugging code & can be dropped later
 
@@ -4882,7 +4882,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                 }
             }
-           
+
             if (objectPropertiesBlocks.Count > 0)
             {
                 ObjectPropertiesPacket packet = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
@@ -4890,7 +4890,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < objectPropertiesBlocks.Count; i++)
                     packet.ObjectData[i] = objectPropertiesBlocks[i];
 
-         
+
                 objectPropertiesBlocks.Clear();
                 packet.Header.Zerocoded = true;
 
@@ -4907,12 +4907,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // pbcnt += blocks.Count;
                 // ppcnt++;
             }
-            
+
             // Int32 fpcnt = 0;
             // Int32 fbcnt = 0;
-            
+
             if (objectFamilyBlocks.Count > 0)
-            {               
+            {
                 // one packet per object block... uggh...
                 for (int i = 0; i < objectFamilyBlocks.Count; i++)
                 {
@@ -4965,7 +4965,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                  }
                  needPhysics.Clear();
             }
-            
+
             // m_log.WarnFormat("[PACKETCOUNTS] queued {0} property packets with {1} blocks",ppcnt,pbcnt);
             // m_log.WarnFormat("[PACKETCOUNTS] queued {0} family property packets with {1} blocks",fpcnt,fbcnt);
         }
@@ -4998,7 +4998,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             return block;
         }
-    
+
         private ObjectPropertiesPacket.ObjectDataBlock CreateObjectPropertiesBlock(SceneObjectPart sop)
         {
             //ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
@@ -5024,7 +5024,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             block.FolderID = UUID.Zero; // sog.FromFolderID ??
             block.FromTaskID = UUID.Zero; // ???
             block.InventorySerial = (short)sop.InventorySerial;
-            
+
             SceneObjectPart root = sop.ParentGroup.RootPart;
 
             block.TouchName = Util.StringToBytes256(root.TouchName);
@@ -5036,7 +5036,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            {
 //                using (BinaryWriter binWriter = new BinaryWriter(memStream))
 //                {
-//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)
 //                    {
 //                        Primitive.TextureEntryFace teFace = sop.Shape.Textures.FaceTextures[i];
 //
@@ -5053,7 +5053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                    block.TextureID = memStream.ToArray();
 //                }
 //            }
-           
+
             block.TextureID = new byte[0]; // TextureID ???
             block.SitName = Util.StringToBytes256(root.SitName);
             block.OwnerMask = root.OwnerMask;
@@ -5202,7 +5202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SendEstateCovenantInformation(UUID covenant)
         {
 //            m_log.DebugFormat("[LLCLIENTVIEW]: Sending estate covenant asset id of {0} to {1}", covenant, Name);
-            
+
             EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
             EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
             edata.CovenantID = covenant;
@@ -5219,7 +5219,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant);
-            
+
             EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
             packet.MethodData.Invoice = invoice;
             packet.AgentData.TransactionID = UUID.Random();
@@ -5282,13 +5282,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         public void SendLandProperties(
-             int sequence_id, bool snap_selection, int request_result, ILandObject lo, 
+             int sequence_id, bool snap_selection, int request_result, ILandObject lo,
              float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
         {
 //            m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name);
-            
+
             LandData landData = lo.LandData;
-            
+
             ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage();
 
             updateMessage.AABBMax = landData.AABBMax;
@@ -5301,7 +5301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             updateMessage.Category = landData.Category;
             updateMessage.ClaimDate = Util.ToDateTime(landData.ClaimDate);
             updateMessage.ClaimPrice = landData.ClaimPrice;
-            updateMessage.GroupID = landData.GroupID;            
+            updateMessage.GroupID = landData.GroupID;
             updateMessage.IsGroupOwned = landData.IsGroupOwned;
             updateMessage.LandingType = (LandingType) landData.LandingType;
             updateMessage.LocalID = landData.LocalID;
@@ -5322,7 +5322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             updateMessage.Name = landData.Name;
             updateMessage.OtherCleanTime = landData.OtherCleanTime;
             updateMessage.OtherCount = 0; //TODO: Unimplemented
-            updateMessage.OwnerID = landData.OwnerID;            
+            updateMessage.OwnerID = landData.OwnerID;
             updateMessage.ParcelFlags = (ParcelFlags) landData.Flags;
             updateMessage.ParcelPrimBonus = simObjectBonusFactor;
             updateMessage.PassHours = landData.PassHours;
@@ -5337,10 +5337,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             updateMessage.RentPrice = 0;
             updateMessage.RequestResult = (ParcelResult) request_result;
-            updateMessage.SalePrice = landData.SalePrice;            
+            updateMessage.SalePrice = landData.SalePrice;
             updateMessage.SelfCount = 0; //TODO: Unimplemented
             updateMessage.SequenceID = sequence_id;
-            
+
             if (landData.SimwideArea > 0)
             {
                 updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount();
@@ -5349,7 +5349,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 updateMessage.SimWideMaxPrims = 0;
             }
-            
+
             updateMessage.SnapSelection = snap_selection;
             updateMessage.SnapshotID    = landData.SnapshotID;
             updateMessage.Status        = (ParcelStatus) landData.Status;
@@ -5367,11 +5367,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             updateMessage.SeeAVs        = landData.SeeAVs;
             updateMessage.AnyAVSounds   = landData.AnyAVSounds;
             updateMessage.GroupAVSounds = landData.GroupAVSounds;
-            
+
             IPrimCounts pc = lo.PrimCounts;
-            updateMessage.OwnerPrims        = pc.Owner;            
+            updateMessage.OwnerPrims        = pc.Owner;
             updateMessage.GroupPrims        = pc.Group;
-            updateMessage.OtherPrims        = pc.Others;            
+            updateMessage.OtherPrims        = pc.Others;
             updateMessage.SelectedPrims     = pc.Selected;
             updateMessage.TotalPrims        = pc.Total;
             updateMessage.SimWideTotalPrims = pc.Simulator;
@@ -5384,8 +5384,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (eq != null)
                 {
                     eq.ParcelProperties(updateMessage, this.AgentId);
-                } 
-                else 
+                }
+                else
                 {
                     m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
                 }
@@ -5422,7 +5422,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SendForceClientSelectObjects(List<uint> ObjectIDs)
         {
 //            m_log.DebugFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
-            
+
             bool firstCall = true;
             const int MAX_OBJECTS_PER_PACKET = 251;
             ForceObjectSelectPacket pack = (ForceObjectSelectPacket)PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);
@@ -5634,7 +5634,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             ImprovedTerseObjectUpdatePacket.ObjectDataBlock block
                 = PacketPool.Instance.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            
+
             block.Data = data;
 
             if (textureEntry != null && textureEntry.Length > 0)
@@ -5661,7 +5661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Vector3 offsetPosition = data.OffsetPosition;
             Quaternion rotation = data.Rotation;
             uint parentID = data.ParentID;
-  
+
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending full update to {0} with pos {1}, vel {2} in {3}", Name, data.OffsetPosition, data.Velocity, m_scene.Name);
 
@@ -5752,7 +5752,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 /*
             if (data.ParentGroup.IsAttachment)
             {
-                update.NameValue 
+                update.NameValue
                     = Util.StringToBytes256(
                         string.Format("AttachItemID STRING RW SV {0}", data.ParentGroup.FromItemID));
 
@@ -5906,7 +5906,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 m_groupPowers.Clear();
                 m_groupPowers = powers;
-            }       
+            }
         }
 
         public ulong GetGroupPowers(UUID groupID)
@@ -6193,7 +6193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if(
                 (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
-//                || ((x.ControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0 && 
+//                || ((x.ControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0 &&
 //                    (x.ControlFlags & 0x3f8dfff) != 0) // we need to rotate the av on fly
                 || x.ControlFlags != (byte)AgentManager.ControlFlags.NONE// actually all movement controls need to pass
                 || (x.Flags != m_thisAgentUpdateArgs.Flags)                 // significant if Flags changed
@@ -6208,7 +6208,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if(
                 qdelta1 < QDELTABody // significant if body rotation above(below cos) threshold
                 // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
-                // || qdelta2 < QDELTAHead // significant if head rotation above(below cos) threshold            
+                // || qdelta2 < QDELTAHead // significant if head rotation above(below cos) threshold
                 )
                 return true;
 
@@ -6257,7 +6257,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             TotalAgentUpdates++;
             // dont let ignored updates pollute this throttles
-            if(SceneAgent == null || SceneAgent.IsChildAgent || 
+            if(SceneAgent == null || SceneAgent.IsChildAgent ||
                     SceneAgent.IsInTransit || seq <= m_thisAgentUpdateArgs.lastpacketSequence )
             {
                 // throttle reset is done at MoveAgentIntoRegion()
@@ -6476,7 +6476,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                 }
             }
-            
+
             //m_log.Debug("[LLCLIENTVIEW]: Not handling GenericMessage with method-type of: " + method);
             return false;
         }
@@ -6922,7 +6922,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //m_log.Info("[LAND]: LAND:" + modify.ToString());
             if (modify.ParcelData.Length > 0)
             {
-                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore, 
+                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore,
                 // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit.
                 if (OnModifyTerrain != null)
                 {
@@ -6999,20 +6999,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     byte[] visualparams = new byte[appear.VisualParam.Length];
                     for (int i = 0; i < appear.VisualParam.Length; i++)
                         visualparams[i] = appear.VisualParam[i].ParamValue;
-                    //var b = appear.WearableData[0]; 
-                    
+                    //var b = appear.WearableData[0];
+
                     Primitive.TextureEntry te = null;
                     if (appear.ObjectData.TextureEntry.Length > 1)
                         te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
-                    
+
                     WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
                     for (int i=0; i<appear.WearableData.Length;i++)
                         cacheitems[i] = new WearableCacheItem(){
                             CacheId = appear.WearableData[i].CacheID,
-                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)                           
+                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)
                         };
 
-                    
+
 
                     handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
                 }
@@ -7970,7 +7970,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     physdata.Bounce = phsblock.Restitution;
                     physdata.Density = phsblock.Density;
                     physdata.Friction = phsblock.Friction;
-                    physdata.GravitationModifier = phsblock.GravityMultiplier;                   
+                    physdata.GravitationModifier = phsblock.GravityMultiplier;
                 }
 
                 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
@@ -8381,7 +8381,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 handlerObjectDuplicateOnRay = OnObjectDuplicateOnRay;
                 if (handlerObjectDuplicateOnRay != null)
                 {
-                
+
                     UUID rezGroupID = dupeOnRay.AgentData.GroupID;
                     if(!IsGroupMember(rezGroupID))
                         rezGroupID = UUID.Zero;
@@ -10198,7 +10198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                     {
                         int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
-                        
+
                         OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)));
 
                     }
@@ -10234,7 +10234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             Message = Utils.BytesToString(messagePacket.ParamList[1].Parameter);
                         }
                         else
-                        { 
+                        {
                             SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter));
                             SenderName = Utils.BytesToString(messagePacket.ParamList[3].Parameter);
                             Message = Utils.BytesToString(messagePacket.ParamList[4].Parameter);
@@ -10376,7 +10376,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     return true;
 
                 case "kickestate":
-                   
+
                     if(((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                     {
                         UUID invoice = messagePacket.MethodData.Invoice;
@@ -10459,7 +10459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (rglpPack.AgentData.SessionID != SessionId ||
                     rglpPack.AgentData.AgentID != AgentId)
                 return true;
-            
+
             RequestGodlikePowersPacket.RequestBlockBlock rblock = rglpPack.RequestBlock;
             UUID token = rblock.Token;
 
@@ -10975,7 +10975,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             return true;
         }
-        
+
         private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
         {
             CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
@@ -11012,7 +11012,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
-        
+
         private bool HandleInventoryDescendents(IClientAPI sender, Packet Pack)
         {
             return true;
@@ -11402,7 +11402,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             GroupProfileRequestPacket groupProfileRequest =
                        (GroupProfileRequestPacket)Pack;
 
-           
+
             #region Packet Session and User Check
             if (m_checkPackets)
             {
@@ -11464,7 +11464,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
-                        
+
             if(grpID == lastGroupProfileRequestID)
                 lastGroupProfileRequestTS = Util.GetTimeStampMS() - 7000;
 
@@ -12398,10 +12398,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ScenePresence sp = (ScenePresence)SceneAgent;
             if(sp != null && !sp.IsDeleted && !sp.IsInTransit)
             {
-                UUID objectID = pkt.Data.ObjectID;   
-                uint permissions = pkt.Data.ObjectPermissions;        
+                UUID objectID = pkt.Data.ObjectID;
+                uint permissions = pkt.Data.ObjectPermissions;
 
-                sp.HandleRevokePermissions(objectID , permissions);        
+                sp.HandleRevokePermissions(objectID , permissions);
             }
             return true;
         }
@@ -12437,7 +12437,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             scriptQuestion.Data.Questions = question;
             scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName);
             scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName);
-            
+
             OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
         }
 
@@ -12629,7 +12629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                              * 0x01 position
                              * 0x02 rotation
                              * 0x04 scale
-  
+
                              * 0x08 LINK_SET
                              * 0x10 UNIFORM for scale
                              */
@@ -12668,7 +12668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                     updatehandler(localId, udata, this);
                                     break;
 
-                                case 0x14: // uniform scale sp 
+                                case 0x14: // uniform scale sp
                                     udata.scale = new Vector3(block.Data, 0);
 
                                     udata.change = ObjectChangeType.primUS;
@@ -12938,7 +12938,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
                     logPacket = false;
-                
+
                 if (DebugPacketLevel <= 50
                     && (packet.Type == PacketType.ImprovedTerseObjectUpdate || packet.Type == PacketType.ObjectUpdate))
                     logPacket = false;
@@ -12951,7 +12951,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         "[CLIENT]: PACKET OUT to   {0} ({1}) in {2} - {3}",
                         Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type);
             }
-            
+
             m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method);
         }
 
@@ -13198,9 +13198,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     GroupMembershipData[] GroupMembership =
                         m_GroupsModule.GetMembershipData(AgentId);
-                    
+
                     m_groupPowers.Clear();
-                        
+
                     if (GroupMembership != null)
                     {
                         for (int i = 0; i < GroupMembership.Length; i++)
@@ -13220,7 +13220,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             m_activeGroupName = activeMembership.GroupName;
                             m_activeGroupPowers = ActiveGroupPowers;
                         }
-                    }    
+                    }
                 }
 
                 if(activeMembership == null)
@@ -13237,7 +13237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             lock(m_groupPowers)
             {
                 m_groupPowers.Clear();
-                       
+
                 if (data != null)
                 {
                     for (int i = 0; i < data.Length; i++)
@@ -13522,7 +13522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (p is ScenePresence)
             {
 //                m_log.DebugFormat(
-//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", 
+//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}",
 //                    p.Name, Name, Scene.Name);
 
                 // It turns out to get the agent to stop flying, you have to feed it stop flying velocities
@@ -13559,7 +13559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 PlacesReplyData[] data)
         {
             PlacesReplyPacket reply = null;
-            PlacesReplyPacket.QueryDataBlock[] dataBlocks = 
+            PlacesReplyPacket.QueryDataBlock[] dataBlocks =
                     new PlacesReplyPacket.QueryDataBlock[0];
 
             for (int i = 0 ; i < data.Length ; i++)
@@ -13737,7 +13737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             foreach (InventoryItemBase item in items)
             {
                 OSDMap ItemDataMap = new OSDMap();
-                
+
                 ItemDataMap.Add("ItemID", OSD.FromUUID(item.ID));
                 ItemDataMap.Add("FolderID", OSD.FromUUID(item.Folder));
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 41dd4d1..deefd40 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (pAssetCache != null)
                 m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
-            
+
             if (m_missingImage == null)
                 m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index dc8ac3c..439621a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// are waiting on ACKs for</param>
     public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
     /// <summary>
-    /// Fired when the queue for one or more packet categories is empty. This 
+    /// Fired when the queue for one or more packet categories is empty. This
     /// event can be hooked to put more data on the empty queues
     /// </summary>
     /// <param name="category">Categories of the packet queues that are empty</param>
@@ -86,8 +86,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// Controls whether information is logged about each outbound packet immediately before it is sent.  For debug purposes.
         /// </summary>
         /// <remarks>Any level above 0 will turn on logging.</remarks>
-        public int ThrottleDebugLevel 
-        { 
+        public int ThrottleDebugLevel
+        {
             get
             {
                 return m_throttleDebugLevel;
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Number of packets sent to this client</summary>
         public int PacketsSent;
         /// <summary>Number of packets resent to this client</summary>
-        public int PacketsResent;        
+        public int PacketsResent;
         /// <summary>Total byte count of unacked packets sent to this client</summary>
         public int UnackedBytes;
 
@@ -215,7 +215,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// textures are now generally handled through http.
         /// </summary>
         private double m_cannibalrate = 0.0;
-        
+
         private ClientInfo m_info = new ClientInfo();
 
         /// <summary>
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Initialize this to a sane value to prevent early disconnects
             TickLastPacketReceived = Environment.TickCount & Int32.MaxValue;
-            m_pingMS = (int)(3.0 * server.TickCountResolution); // so filter doesnt start at 0; 
+            m_pingMS = (int)(3.0 * server.TickCountResolution); // so filter doesnt start at 0;
         }
 
         /// <summary>
@@ -370,7 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return string.Format(
                 "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}",
                 Util.EnvironmentTickCountSubtract(TickLastPacketReceived),
-                PacketsReceived,                                 
+                PacketsReceived,
                 PacketsSent,
                 PacketsResent,
                 UnackedBytes,
@@ -540,7 +540,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             return data;
         }
-       
+
         public int GetCatBytesCanSend(ThrottleOutPacketType cat, int timeMS)
         {
             int icat = (int)cat;
@@ -559,7 +559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="packet"></param>
         /// <param name="forceQueue">Always queue the packet if at all possible.</param>
         /// <returns>
-        /// true if the packet has been queued, 
+        /// true if the packet has been queued,
         /// false if the packet has not been queued and should be sent immediately.
         /// </returns>
         public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue)
@@ -589,7 +589,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     queue.Enqueue(packet, highPriority);
                     return true;
                 }
-                                  
+
                 if (!forceQueue && bucket.CheckTokens(packet.Buffer.DataLength))
                 {
                     // enough tokens so it can be sent imediatly by caller
@@ -608,24 +608,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // We don't have a token bucket for this category, so it will not be queued
                 return false;
             }
-  
+
         }
 
         /// <summary>
         /// Loops through all of the packet queues for this client and tries to send
         /// an outgoing packet from each, obeying the throttling bucket limits
         /// </summary>
-        /// 
+        ///
         /// <remarks>
-        /// Packet queues are inspected in ascending numerical order starting from 0.  Therefore, queues with a lower 
+        /// Packet queues are inspected in ascending numerical order starting from 0.  Therefore, queues with a lower
         /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have
         /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the
         /// wind queue).
-        /// 
+        ///
         /// This function is only called from a synchronous loop in the
         /// UDPServer so we don't need to bother making this thread safe
         /// </remarks>
-        /// 
+        ///
         /// <returns>True if any packets were sent, otherwise false</returns>
         public bool DequeueOutgoing()
         {
@@ -791,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 double start = Util.GetTimeStampMS();
                 if (start < m_nextOnQueueEmpty)
                     return;
-            
+
                 m_isQueueEmptyRunning = true;
                 m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
 
@@ -803,7 +803,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-       
+
 
         /// <summary>
         /// Fires the OnQueueEmpty callback and sets the minimum time that it
@@ -820,7 +820,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (callback != null)
             {
                 // if (m_udpServer.IsRunningOutbound)
-                // {                
+                // {
                 try { callback(categories); }
                 catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
                 // }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index cedb9b4..ec51e28 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     StatType.Pull,
                     MeasuresOfInterest.None,
                     stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod,
-//                    stat => 
+//                    stat =>
 //                        stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod, 7),
                     StatVerbosity.Debug));
         }
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>The measured resolution of Environment.TickCount</summary>
         public readonly float TickCountResolution;
 
-        /// <summary>Number of prim updates to put on the queue each time the 
+        /// <summary>Number of prim updates to put on the queue each time the
         /// OnQueueEmpty event is triggered for updates</summary>
         public readonly int PrimUpdatesPerCallback;
 
@@ -289,7 +289,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>Bandwidth throttle for this UDP server</summary>
         public TokenBucket Throttle { get; protected set; }
-        
+
         /// <summary>Per client throttle rates enforced by this server</summary>
         /// <remarks>
         /// If the total rate is non-zero, then this is the maximum total throttle setting that any client can ever have.
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// do get changed immediately).  They do not need to sum to the total.
         /// </remarks>
         public ThrottleRates ThrottleRates { get; protected set; }
-        
+
         /// <summary>Manages authentication for agent circuits</summary>
         protected AgentCircuitManager m_circuitManager;
 
@@ -436,8 +436,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             #region Environment.TickCount Measurement
 
-                        // Update the port with the one we actually got
-                        port = (uint)Port;
+            // Update the port with the one we actually got
+            port = (uint)Port;
 
             // Measure the resolution of Environment.TickCount
             TickCountResolution = 0f;
@@ -696,15 +696,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             Scene = (Scene)scene;
             m_location = new Location(Scene.RegionInfo.RegionHandle);
-                        
-            IpahEngine 
+
+            IpahEngine
                 = new JobEngine(
-                    string.Format("Incoming Packet Async Handling Engine ({0})", Scene.Name), 
+                    string.Format("Incoming Packet Async Handling Engine ({0})", Scene.Name),
                     "INCOMING PACKET ASYNC HANDLING ENGINE");
 
-            OqrEngine 
+            OqrEngine
                 = new JobEngine(
-                    string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name), 
+                    string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name),
                     "OUTGOING QUEUE REFILL ENGINE");
 
             StatsManager.RegisterStat(
@@ -730,9 +730,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "clientstack",
                     Scene.Name,
                     StatType.Pull,
-                    stat => 
-                        { PercentageStat pstat = (PercentageStat)stat; 
-                          pstat.Consequent = PacketPool.Instance.PacketsRequested; 
+                    stat =>
+                        { PercentageStat pstat = (PercentageStat)stat;
+                          pstat.Consequent = PacketPool.Instance.PacketsRequested;
                           pstat.Antecedent = PacketPool.Instance.PacketsReused; },
                     StatVerbosity.Debug));
 
@@ -745,8 +745,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     Scene.Name,
                     StatType.Pull,
                     stat =>
-                        { PercentageStat pstat = (PercentageStat)stat; 
-                          pstat.Consequent = PacketPool.Instance.BlocksRequested; 
+                        { PercentageStat pstat = (PercentageStat)stat;
+                          pstat.Consequent = PacketPool.Instance.BlocksRequested;
                           pstat.Antecedent = PacketPool.Instance.BlocksReused; },
                     StatVerbosity.Debug));
 
@@ -799,7 +799,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     MeasuresOfInterest.None,
                     stat => stat.Value = IpahEngine.JobsWaiting,
                     StatVerbosity.Debug));
-                        
+
             StatsManager.RegisterStat(
                 new Stat(
                     "OQRERequestsWaiting",
@@ -812,7 +812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     MeasuresOfInterest.None,
                     stat => stat.Value = OqrEngine.JobsWaiting,
                     StatVerbosity.Debug));
-        
+
             // We delay enabling pool stats to AddScene() instead of Initialize() so that we can distinguish pool stats by
             // scene name
             if (UsePools)
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if ((outgoingPacket.Buffer.Data[0] & Helpers.MSG_RELIABLE) != 0)
                 outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
 
-            // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will 
+            // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will
             // continue to display the deleted object until relog.  Therefore, we need to always queue a kill object
             // packet so that it isn't sent before a queued update packet.
 
@@ -1242,7 +1242,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if ((IncomingMalformedPacketCount % 10000) == 0)
                 m_log.WarnFormat(
-                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}", 
+                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}",
                     IncomingMalformedPacketCount, endPoint);
         }
 
@@ -1391,7 +1391,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 if ((IncomingOrphanedPacketCount % 10000) == 0)
                     m_log.WarnFormat(
-                        "[LLUDPSERVER]: Received {0} orphaned packets so far.  Last was from {1}", 
+                        "[LLUDPSERVER]: Received {0} orphaned packets so far.  Last was from {1}",
                         IncomingOrphanedPacketCount, endPoint);
 
                 return;
@@ -1482,7 +1482,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (packet.Header.Resent)
                     m_log.DebugFormat(
-                        "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}", 
+                        "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}",
                         packet.Header.Sequence, packet.Type, client.Name);
                  else
                     m_log.WarnFormat(
@@ -1512,7 +1512,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // We don't need to do anything else with ping checks
                 StartPingCheckPacket startPing = (StartPingCheckPacket)packet;
                 CompletePing(udpClient, startPing.PingID.PingID);
-                
+
                 if ((Environment.TickCount - m_elapsedMSSinceLastStatReport) >= 3000)
                 {
                     udpClient.SendPacketStats();
@@ -1677,7 +1677,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_log.DebugFormat(
                     "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}",
                     uccp.CircuitCode.Code, Scene.RegionInfo.RegionName, endPoint);
-    
+
                 AuthenticateResponse sessionInfo;
                 if (IsClientAuthorized(uccp, out sessionInfo))
                 {
@@ -1752,10 +1752,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     lock (m_pendingCache)
                         m_pendingCache.Remove(endPoint);
-                }    
+                }
 
                 //            m_log.DebugFormat(
-    //                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
+    //                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
     //                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
 
             }
@@ -1787,9 +1787,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 // Determine which agent this packet came from
                 // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
-                // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode 
+                // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode
                 // and then CompleteAgentMovement immediately without waiting for an ack.  As we are now handling these
-                // packets asynchronously, we need to account for this thread proceeding more quickly than the 
+                // packets asynchronously, we need to account for this thread proceeding more quickly than the
                 // UseCircuitCode thread.
                 int count = 40;
                 while (count-- > 0)
@@ -1811,7 +1811,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             // manager but the SceneAgent has not yet been set in Scene.AddNewAgent().  If we are too
                             // eager, then the new ScenePresence may not have registered a listener for this messsage
                             // before we try to process it.
-                            // XXX: A better long term fix may be to add the SceneAgent before the client is added to 
+                            // XXX: A better long term fix may be to add the SceneAgent before the client is added to
                             // the client manager
                             m_log.DebugFormat(
                                 "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client SceneAgent not set yet.  Waiting.",
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     else
                     {
                         m_log.DebugFormat(
-                            "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.", 
+                            "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.",
                             endPoint, Scene.Name);
                     }
 
@@ -1962,13 +1962,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, Throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
 
-    
+
                     client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                     client.OnLogout += LogoutHandler;
                     client.DebugPacketLevel = DefaultClientPacketDebugLevel;
-    
+
                     ((LLClientView)client).DisableFacelights = m_disableFacelights;
-    
+
                     client.Start();
                 }
             }
@@ -1988,7 +1988,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
         {
             lock (client.CloseSyncLock)
-            {    
+            {
                 ClientLogoutsDueToNoReceives++;
 
                 if (client.SceneAgent != null)
@@ -1996,7 +1996,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_log.WarnFormat(
                         "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
                         client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, Scene.Name);
-    
+
                     if (!client.SceneAgent.IsChildAgent)
                          client.Kick("Simulator logged you out due to connection timeout.");
                 }
@@ -2020,11 +2020,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 try
                 {
                     incomingPacket = packetInbox.Dequeue(250);
-                    
+
                     if (incomingPacket != null && IsRunningInbound)
                     {
                         ProcessInPacket(incomingPacket);
-                        
+
                         if (UsePools)
                         {
                             incomingPacket.Client = null;
@@ -2192,7 +2192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public long IncomingPacketsProcessed { get; protected set; }
 
-        #endregion 
+        #endregion
 
         protected void ProcessInPacket(IncomingPacket incomingPacket)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index 6e6a2d1..012a57d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "Comms", false, "show server throttles",
                 "show server throttles",
                 "Show information about server throttles",
-                HandleShowServerThrottlesCommand); 
+                HandleShowServerThrottlesCommand);
 
             m_console.Commands.AddCommand(
                 "Debug", false, "debug lludp packet",
@@ -207,8 +207,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 HandleClientGetCommand);
 
             m_console.Commands.AddCommand(
-                "Debug", 
-                false, 
+                "Debug",
+                false,
                 "debug lludp client set",
                 "debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]",
                 "Set a debug parameter for a particular client.  If no name is given then the value is set on all clients.",
@@ -228,22 +228,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate;
             cdl.AddRow(
-                "Max scene throttle", 
+                "Max scene throttle",
                 maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
 
             int maxClientDripRate = m_udpServer.ThrottleRates.Total;
             cdl.AddRow(
-                "Max new client throttle", 
+                "Max new client throttle",
                 maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
 
             m_console.Output(cdl.ToString());
 
             m_console.OutputFormat("{0}\n", GetServerThrottlesReport(m_udpServer));
         }
-                
+
         private string GetServerThrottlesReport(LLUDPServer udpServer)
         {
-            StringBuilder report = new StringBuilder();     
+            StringBuilder report = new StringBuilder();
 
             report.AppendFormat(
                 "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
@@ -254,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "Cloud",
                 "Task",
                 "Texture",
-                "Asset");          
+                "Asset");
 
             report.AppendFormat(
                 "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "kb/s",
                 "kb/s",
                 "kb/s",
-                "kb/s");     
+                "kb/s");
 
             ThrottleRates throttleRates = udpServer.ThrottleRates;
             report.AppendFormat(
@@ -277,16 +277,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 (throttleRates.Cloud * 8) / 1000,
                 (throttleRates.Task * 8) / 1000,
                 (throttleRates.Texture  * 8) / 1000,
-                (throttleRates.Asset  * 8) / 1000);  
+                (throttleRates.Asset  * 8) / 1000);
 
             return report.ToString();
         }
 
         protected string GetColumnEntry(string entry, int maxLength, int columnPadding)
-        {                       
+        {
             return string.Format(
-                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}", 
-                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 
+                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}",
+                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry,
                 "");
         }
 
@@ -375,7 +375,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 MainConsole.Instance.OutputFormat(
                     "Usage: debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]");
                 return;
-            }           
+            }
 
             string param = args[4];
             string rawValue = args[5];
@@ -467,7 +467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 MainConsole.Instance.OutputFormat(
                     "Usage: debug lludp throttles get [<avatar-first-name> <avatar-last-name>]");
                 return;
-            }           
+            }
 
             string firstName = null;
             string lastName = null;
@@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     ConsoleDisplayList cdl = new ConsoleDisplayList();
                     cdl.AddRow("adaptive", udpClient.FlowThrottle.AdaptiveEnabled);
                     cdl.AddRow("current", string.Format("{0} kbps", udpClient.FlowThrottle.DripRate * 8 / 1000));
-                    cdl.AddRow("request", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));  
+                    cdl.AddRow("request", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));
                     cdl.AddRow("max", string.Format("{0} kbps", udpClient.FlowThrottle.MaxDripRate * 8 / 1000));
 
                     m_console.Output(cdl.ToString());
@@ -509,12 +509,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate;
             cdl.AddRow(
-                "max-scene-throttle", 
+                "max-scene-throttle",
                 maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
 
             int maxClientDripRate = m_udpServer.ThrottleRates.Total;
             cdl.AddRow(
-                "max-new-client-throttle", 
+                "max-new-client-throttle",
                 maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
 
             m_console.Output(cdl.ToString());
@@ -529,7 +529,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 MainConsole.Instance.OutputFormat("Usage: debug lludp set <param> <value>");
                 return;
-            }           
+            }
 
             string param = args[3];
             string rawValue = args[4];
@@ -552,7 +552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             else
             {
-                return; 
+                return;
             }
 
             m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
@@ -598,7 +598,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 MainConsole.Instance.OutputFormat("Usage: debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]");
                 return;
-            }        
+            }
 
             string param = args[4];
             string rawValue = args[5];
@@ -697,12 +697,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             string direction = args[3];
             string subCommand = args[4];
-            string packetName = args[5];           
+            string packetName = args[5];
 
             if (subCommand == "add")
             {
                 MainConsole.Instance.OutputFormat(
-                    "Adding packet {0} to {1} drop list for all connections in {2}", 
+                    "Adding packet {0} to {1} drop list for all connections in {2}",
                     direction, packetName, m_udpServer.Scene.Name);
 
                 m_udpServer.Scene.ForEachScenePresence(
@@ -720,7 +720,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             else if (subCommand == "remove")
             {
                 MainConsole.Instance.OutputFormat(
-                    "Removing packet {0} from {1} drop list for all connections in {2}", 
+                    "Removing packet {0} from {1} drop list for all connections in {2}",
                     direction, packetName, m_udpServer.Scene.Name);
 
                 m_udpServer.Scene.ForEachScenePresence(
@@ -868,10 +868,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 MainConsole.Instance.OutputFormat("OQRE in {0}", m_udpServer.Scene.Name);
                 MainConsole.Instance.OutputFormat("Running: {0}", m_udpServer.OqrEngine.IsRunning);
                 MainConsole.Instance.OutputFormat(
-                    "Requests waiting: {0}", 
+                    "Requests waiting: {0}",
                     m_udpServer.OqrEngine.IsRunning ? m_udpServer.OqrEngine.JobsWaiting.ToString() : "n/a");
             }
-            else 
+            else
             {
                 MainConsole.Instance.OutputFormat("Unrecognized OQRE subcommand {0}", subCommand);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 831381e..35a0711 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -3,25 +3,25 @@
  * Original Author: Jeff Cesnik
  * All rights reserved.
  *
- * - Redistribution and use in source and binary forms, with or without 
+ * - 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.
- * - Neither the name of the openmetaverse.org nor the names 
+ * - Neither the name of the openmetaverse.org 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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.
  */
 
@@ -107,10 +107,10 @@ namespace OpenMetaverse
         /// </summary>
         public float AverageReceiveTicksForLastSamplePeriod { get; private set; }
 
-                public int Port
-                {
-                        get { return m_udpPort; }
-                }
+        public int Port
+        {
+            get { return m_udpPort; }
+        }
 
         #region PacketDropDebugging
         /// <summary>
@@ -118,7 +118,7 @@ namespace OpenMetaverse
         /// outbound packets.
         /// </summary>
         private Random m_dropRandomGenerator = new Random();
-        
+
         /// <summary>
         /// For debugging purposes only... parameters for a simplified
         /// model of packet loss with bursts, overall drop rate should
@@ -137,7 +137,7 @@ namespace OpenMetaverse
         /// </summary>
         private int m_dropLastTick = 0;
         private int m_dropResetTicks = 500;
-        
+
         /// <summary>
         /// Debugging code used to simulate dropped packets with bursts
         /// </summary>
@@ -187,13 +187,13 @@ namespace OpenMetaverse
         ~OpenSimUDPBase()
         {
             if(m_udpSocket !=null)
-                try { m_udpSocket.Close(); } catch { }               
+                try { m_udpSocket.Close(); } catch { }
         }
         /// <summary>
         /// Start inbound UDP packet handling.
         /// </summary>
-        /// <param name="recvBufferSize">The size of the receive buffer for 
-        /// the UDP socket. This value is passed up to the operating system 
+        /// <param name="recvBufferSize">The size of the receive buffer for
+        /// the UDP socket. This value is passed up to the operating system
         /// and used in the system networking stack. Use zero to leave this
         /// value as the default</param>
         /// <param name="asyncPacketHandling">Set this to true to start
@@ -235,7 +235,7 @@ namespace OpenMetaverse
                 }
                 try
                 {
-                    // This udp socket flag is not supported under mono, 
+                    // This udp socket flag is not supported under mono,
                     // so we'll catch the exception and continue
                     m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
                     m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set");
@@ -249,12 +249,12 @@ namespace OpenMetaverse
                 // we never want two regions to listen on the same port as they cannot demultiplex each other's messages,
                 // leading to a confusing bug.
                 // By default, Windows does not allow two sockets to bind to the same port.
-                                //
-                                // Unfortunately, this also causes a crashed sim to leave the socket in a state
-                                // where it appears to be in use but is really just hung from the old process
-                                // crashing rather than closing it. While this protects agains misconfiguration,
-                                // allowing crashed sims to be started up again right away, rather than having to
-                                // wait 2 minutes for the socket to clear is more valuable. Commented 12/13/2016
+                //
+                // Unfortunately, this also causes a crashed sim to leave the socket in a state
+                // where it appears to be in use but is really just hung from the old process
+                // crashing rather than closing it. While this protects agains misconfiguration,
+                // allowing crashed sims to be started up again right away, rather than having to
+                // wait 2 minutes for the socket to clear is more valuable. Commented 12/13/2016
                 // m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
 
                 if (recvBufferSize != 0)
@@ -262,8 +262,8 @@ namespace OpenMetaverse
 
                 m_udpSocket.Bind(ipep);
 
-                                if (m_udpPort == 0)
-                                        m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port;
+                if (m_udpPort == 0)
+                    m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port;
 
                 IsRunningInbound = true;
 
@@ -334,7 +334,7 @@ namespace OpenMetaverse
         {
             UDPPacketBuffer buf;
 
-            // FIXME: Disabled for now as this causes issues with reused packet objects interfering with each other 
+            // FIXME: Disabled for now as this causes issues with reused packet objects interfering with each other
             // on Windows with m_asyncPacketHandling = true, though this has not been seen on Linux.
             // Possibly some unexpected issue with fetching UDP data concurrently with multiple threads.  Requires more investigation.
 //            if (UsePools)
@@ -387,8 +387,8 @@ namespace OpenMetaverse
                         m_log.Warn("[UDPBASE]: Salvaged the UDP listener on port " + m_udpPort);
                     }
                 }
-                catch (ObjectDisposedException e) 
-                { 
+                catch (ObjectDisposedException e)
+                {
                     m_log.Error(
                         string.Format("[UDPBASE]: Error processing UDP begin receive {0}.  Exception  ", UdpReceives), e);
                 }
@@ -434,7 +434,7 @@ namespace OpenMetaverse
                     // since this should be rare and  won't cause a runtime problem.
                     if (m_currentReceiveTimeSamples >= s_receiveTimeSamples)
                     {
-                        AverageReceiveTicksForLastSamplePeriod 
+                        AverageReceiveTicksForLastSamplePeriod
                             = (float)m_receiveTicksInCurrentSamplePeriod / s_receiveTimeSamples;
 
                         m_receiveTicksInCurrentSamplePeriod = 0;
@@ -446,16 +446,16 @@ namespace OpenMetaverse
                         m_currentReceiveTimeSamples++;
                     }
                 }
-                catch (SocketException se) 
-                { 
+                catch (SocketException se)
+                {
                     m_log.Error(
                         string.Format(
-                            "[UDPBASE]: Error processing UDP end receive {0}, socket error code {1}.  Exception  ", 
-                            UdpReceives, se.ErrorCode), 
+                            "[UDPBASE]: Error processing UDP end receive {0}, socket error code {1}.  Exception  ",
+                            UdpReceives, se.ErrorCode),
                         se);
                 }
-                catch (ObjectDisposedException e) 
-                { 
+                catch (ObjectDisposedException e)
+                {
                     m_log.Error(
                         string.Format("[UDPBASE]: Error processing UDP end receive {0}.  Exception  ", UdpReceives), e);
                 }
@@ -486,7 +486,7 @@ namespace OpenMetaverse
                 // packets when testing throttles & retransmission code
                 // if (DropOutgoingPacket())
                 //     return;
-            
+
                 try
                 {
                     m_udpSocket.BeginSendTo(
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
index 5a2bcee..f585bea 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public int PacketsPooled
         {
-            get 
+            get
             {
                 lock (pool)
                     return pool.Count;
@@ -74,9 +74,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public int BlocksPooled
         {
-            get 
+            get
             {
-                lock (DataBlocks) 
+                lock (DataBlocks)
                     return DataBlocks.Count;
             }
         }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             }
                         }
                         break;
-                    
+
                     // Other packets wont pool
                     default:
                         return;
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     DataBlocks[typeof(T)] = new Stack<Object>();
                 }
-                
+
                 return new T();
             }
         }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
index 1443477..4a8f16d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/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.Region.ClientStack.LindenUDP")]
@@ -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/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a935dd2..0e1a9e3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             m_scene = new SceneHelpers().SetupScene();
             StatsManager.SimExtraStats = new SimExtraStatsCollector();
         }
-        
+
 //        /// <summary>
 //        /// Build an object name packet for test purposes
 //        /// </summary>
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            odb.Name = Utils.StringToBytes(objectName);
 //            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
 //            onp.Header.Zerocoded = false;
-//            
+//
 //            return onp;
 //        }
 //
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             config.Set("AckTimeout", -1);
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics);
 
-            ScenePresence sp 
+            ScenePresence sp
                 = ClientStackHelpers.AddChildClient(
                     m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -175,21 +175,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            uint myCircuitCode = 123457;
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
-//            
+//
 //            // Check that removing a non-existent circuit doesn't have any bad effects
 //            testLLUDPServer.RemoveClientCircuit(101);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
 //        }
-//        
+//
 //        /// <summary>
 //        /// Make sure that the client stack reacts okay to malformed packets
 //        /// </summary>
@@ -200,8 +200,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //
 //            uint myCircuitCode = 123458;
 //            EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001);
-//            MockScene scene = new MockScene(); 
-//            
+//            MockScene scene = new MockScene();
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
@@ -213,24 +213,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            // Send two garbled 'packets' in succession
 //            testLLUDPServer.LoadReceive(data, testEp);
 //            testLLUDPServer.LoadReceive(data, testEp);
-//            testLLUDPServer.ReceiveData(null); 
-//            
+//            testLLUDPServer.ReceiveData(null);
+//
 //            // Check that we are still here
 //            Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode));
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(0));
-//            
+//
 //            // Check that sending a valid packet to same circuit still succeeds
 //            Assert.That(scene.ObjectNameCallsReceived, Is.EqualTo(0));
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
 //        }
-//        
+//
 //        /// <summary>
-//        /// Test that the stack continues to work even if some client has caused a 
+//        /// Test that the stack continues to work even if some client has caused a
 //        /// SocketException on Socket.BeginReceive()
 //        /// </summary>
 //        [Test]
@@ -239,32 +239,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            MockScene scene = new MockScene();
-//            
+//
 //            uint circuitCodeA = 130000;
 //            EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300);
 //            UUID agentIdA   = UUID.Parse("00000000-0000-0000-0000-000000001300");
 //            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");
-//            
+//
 //            uint circuitCodeB = 130001;
 //            EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301);
 //            UUID agentIdB   = UUID.Parse("00000000-0000-0000-0000-000000001301");
 //            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm);
 //            AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet1"), epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet2"), epB);
 //            testLLUDPServer.LoadReceiveWithBeginException(epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
-//         
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
 //        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
index 92f1fc3..1731aa9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            agent.InventoryFolder = UUID.Zero;
 //            agent.startpos = Vector3.Zero;
 //            agent.CapsPath = "http://wibble.com";
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
 //
 //            TestClient testClient = new TestClient(agent, scene);
-//            
+//
 //            LLPacketHandler packetHandler
 //                = new LLPacketHandler(testClient, testLLPacketServer, new ClientStackUserSettings());
 //
@@ -87,14 +87,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //        /// <param name="testPacketServer"></param>
 //        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
 //        protected void SetupStack(
-//            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
+//            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer,
 //            out AgentCircuitManager acm)
 //        {
 //            IConfigSource configSource = new IniConfigSource();
 //            ClientStackUserSettings userSettings = new ClientStackUserSettings();
 //            testLLUDPServer = new TestLLUDPServer();
 //            acm = new AgentCircuitManager();
-//                                    
+//
 //            uint port = 666;
 //            testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
 //            testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
index 5e41dbd..873b1e5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             Scene scene = new SceneHelpers().SetupScene();
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
 
-            ScenePresence sp 
+            ScenePresence sp
                 = ClientStackHelpers.AddChildClient(
                     scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             udpServer.Throttle.DebugLevel = 1;
             udpClient.ThrottleDebugLevel = 1;
-            
+
             int resendBytes = 1000;
             int landBytes = 2000;
             int windBytes = 3000;
@@ -161,8 +161,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             int totalBytes = LLUDPServer.MTU + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes;
 
             AssertThrottles(
-                udpClient, 
-                LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes, 
+                udpClient,
+                LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes,
                 textureBytes, assetBytes, totalBytes, 0, 0);
         }
 
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene, ics);
 
-            ScenePresence sp 
+            ScenePresence sp
                 = ClientStackHelpers.AddChildClient(
                     scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -207,7 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             double commitRatio = 32000.0 / totalBytes;
 
             AssertThrottles(
-                udpClient, 
+                udpClient,
                 LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                 textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
 
@@ -217,7 +217,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             commitRatio = (32000.0 + 20.0 * LLUDPServer.MTU) / totalBytes;
 
             AssertThrottles(
-                udpClient, 
+                udpClient,
                 LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                 textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
 
@@ -227,7 +227,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes;
 
             AssertThrottles(
-                udpClient, 
+                udpClient,
                 LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                 textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
         }
@@ -248,14 +248,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             int taskBytes = 14000;
             int textureBytes = 16000;
             int assetBytes = 18000;
-            int totalBytes 
+            int totalBytes
                 = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
 
             Scene scene = new SceneHelpers().SetupScene();
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
             udpServer.Throttle.RequestedDripRate = totalBytes;
 
-            ScenePresence sp1 
+            ScenePresence sp1
                 = ClientStackHelpers.AddChildClient(
                     scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -265,8 +265,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
 
             AssertThrottles(
-                udpClient1, 
-                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                udpClient1,
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2,
                 textureBytes / 2, assetBytes / 2, totalBytes, 0, 0);
 
             // Test: Now add another client
@@ -281,13 +281,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
 
             AssertThrottles(
-                udpClient1, 
-                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                udpClient1,
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4,
                 textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
 
             AssertThrottles(
-                udpClient2, 
-                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                udpClient2,
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4,
                 textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
         }
 
@@ -307,14 +307,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             int taskBytes = 12000;
             int textureBytes = 14000;
             int assetBytes = 16000;
-            int totalBytes 
+            int totalBytes
                 = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
 
             Scene scene = new SceneHelpers().SetupScene();
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
             udpServer.ThrottleRates.Total = totalBytes;
 
-            ScenePresence sp 
+            ScenePresence sp
                 = ClientStackHelpers.AddChildClient(
                     scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -325,8 +325,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
 
             AssertThrottles(
-                udpClient, 
-                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                udpClient,
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2,
                 textureBytes / 2, assetBytes / 2, totalBytes, 0, totalBytes);
         }
 
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             udpServer.ThrottleRates.Total = (int)(totalBytes * 1.1);
             udpServer.Throttle.RequestedDripRate = (int)(totalBytes * 1.5);
 
-            ScenePresence sp1 
+            ScenePresence sp1
                 = ClientStackHelpers.AddChildClient(
                     scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -363,8 +363,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
 
             AssertThrottles(
-                udpClient1, 
-                resendBytes, landBytes, windBytes, cloudBytes, taskBytes, 
+                udpClient1,
+                resendBytes, landBytes, windBytes, cloudBytes, taskBytes,
                 textureBytes, assetBytes, totalBytes, 0, totalBytes * 1.1);
 
             // Now add another client
@@ -379,25 +379,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                 udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
 
             AssertThrottles(
-                udpClient1, 
-                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                udpClient1,
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75,
                 textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
 
             AssertThrottles(
-                udpClient2, 
-                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                udpClient2,
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75,
                 textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
         }
 
         private void AssertThrottles(
-            LLUDPClient udpClient, 
+            LLUDPClient udpClient,
             double resendBytes, double landBytes, double windBytes, double cloudBytes, double taskBytes, double textureBytes, double assetBytes,
             double totalBytes, double targetBytes, double maxBytes)
         {
             ClientInfo ci = udpClient.GetClientInfo();
 
 //                            Console.WriteLine(
-//                                "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}", 
+//                                "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}",
 //                                ci.resendThrottle, ci.landThrottle, ci.windThrottle, ci.cloudThrottle, ci.taskThrottle, ci.textureThrottle, ci.assetThrottle, ci.totalThrottle);
 
             Assert.AreEqual((int)resendBytes, ci.resendThrottle, "Resend");
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 6278e36..f8ec97a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -58,14 +58,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>Flag used to enable adaptive throttles</summary>
         public bool AdaptiveThrottlesEnabled;
- 
+
         /// <summary>
         /// Set the minimum rate that the adaptive throttles can set. The viewer
         /// can still throttle lower than this, but the adaptive throttles will
         /// never decrease rates below this no matter how many packets are dropped
         /// </summary>
         public Int64 MinimumAdaptiveThrottleRate;
- 
+
         /// <summary>Amount of the texture throttle to steal for the task throttle</summary>
         public double CannibalizeTextureRate;
 
@@ -109,7 +109,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
 //                CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
                 CannibalizeTextureRate = 0f;
-    
+
             }
             catch (Exception) { }
         }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
index cac57b2..1daf091 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
@@ -44,24 +44,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Int32 m_counter = 0;
-        
-//        private Int32 m_identifier;      
-  
+
+//        private Int32 m_identifier;
+
         protected const float m_timeScale = 1e-3f;
 
         /// <summary>
-        /// This is the number of m_minimumDripRate bytes 
+        /// This is the number of m_minimumDripRate bytes
         /// allowed in a burst
         /// roughtly, with this settings, the maximum time system will take
         /// to recheck a bucket in ms
-        /// 
+        ///
         /// </summary>
         protected const float m_quantumsPerBurst = 5;
-                
+
         /// <summary>
         /// </summary>
         protected const float m_minimumDripRate = 1500;
-        
+
         /// <summary>Time of the last drip</summary>
         protected double m_lastDrip;
 
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
 
         protected Dictionary<TokenBucket, float> m_children = new Dictionary<TokenBucket, float>();
-        
+
 #region Properties
 
         /// <summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
         /// <summary>
         /// This is the maximum number
-        /// of tokens that can accumulate in the bucket at any one time. This 
+        /// of tokens that can accumulate in the bucket at any one time. This
         /// also sets the total request for leaf nodes
         /// </summary>
         protected float m_burst;
@@ -127,14 +127,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return (float)rate;
             }
         }
-               
+
         /// <summary>
         /// The requested drip rate for this particular bucket.
         /// </summary>
         /// <remarks>
         /// 0 then TotalDripRequest is used instead.
         /// Can never be above MaxDripRate.
-        /// Tokens are added to the bucket at any time 
+        /// Tokens are added to the bucket at any time
         /// <seealso cref="RemoveTokens"/> is called, at the granularity of
         /// the system tick interval (typically around 15-22ms)</remarks>
         protected float m_dripRate;
@@ -170,12 +170,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// The current total of the requested maximum burst rates of children buckets.
         /// </summary>
         protected float m_totalDripRequest;
-        public float TotalDripRequest 
+        public float TotalDripRequest
         {
             get { return m_totalDripRequest; }
             set { m_totalDripRequest = value; }
         }
-        
+
 #endregion Properties
 
 #region Constructor
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// zero if this bucket has no maximum capacity</param>
         /// <param name="dripRate">Rate that the bucket fills, in bytes per
         /// second. If zero, the bucket always remains full</param>
-        public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst) 
+        public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst)
         {
             m_counter++;
 
@@ -240,7 +240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 foreach (KeyValuePair<TokenBucket, float> cref in m_children)
                     m_totalDripRequest += cref.Value;
             }
-            
+
             // Pass the new values up to the parent
             if (m_parent != null)
                 m_parent.RegisterRequest(this, Math.Min(RequestedDripRate, TotalDripRequest));
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (Parent != null)
                 Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
         }
-        
+
         /// <summary>
         /// Remove a given number of tokens from the bucket
         /// </summary>
@@ -302,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>
         /// Add tokens to the bucket over time. The number of tokens added each
-        /// call depends on the length of time that has passed since the last 
+        /// call depends on the length of time that has passed since the last
         /// call to Drip
         /// </summary>
         /// <returns>True if tokens were added to the bucket, otherwise false</returns>
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0 for {0}", m_counter);
                 return;
             }
-            
+
             double now = Util.GetTimeStampMS();
             double deltaMS = now - m_lastDrip;
             m_lastDrip = now;
@@ -333,13 +333,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
     public class AdaptiveTokenBucket : TokenBucket
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);               
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public bool AdaptiveEnabled { get; set; }
 
         /// <summary>
         /// The minimum rate for flow control. Minimum drip rate is one
-        /// packet per second. 
+        /// packet per second.
         /// </summary>
 
         protected const float m_minimumFlow = 50000;
@@ -361,7 +361,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private bool m_enabled = false;
 
         // <summary>
-        // Adjust drip rate in response to network conditions. 
+        // Adjust drip rate in response to network conditions.
         // </summary>
         public float AdjustedDripRate
         {
@@ -374,10 +374,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_parent.RegisterRequest(this, m_dripRate);
             }
         }
-                
-   
+
+
         // <summary>
-        // 
+        //
         // </summary>
         public AdaptiveTokenBucket(TokenBucket parent, float maxDripRate, float maxBurst, bool enabled)
             : base(parent, maxDripRate, maxBurst)
@@ -393,7 +393,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_parent != null)
                 m_parent.RegisterRequest(this, m_dripRate);
         }
-                
+
         /// <summary>
         /// Reliable packets sent to the client for which we never received an ack adjust the drip rate down.
         /// <param name="packets">Number of packets that expired without successful delivery</param>
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         // <summary>
-        // 
+        //
         // </summary>
         public void AcknowledgePackets(Int32 count)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
index c9d5697..76f4c6f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_packets.Clear();
             m_pendingAdds = null;
             m_pendingAcknowledgements = null;
-            m_pendingRemoves = null;           
+            m_pendingRemoves = null;
         }
 
         /// <summary>
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void Add(OutgoingPacket packet)
         {
             m_pendingAdds.Enqueue(packet);
-            Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);            
+            Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);
         }
 
         /// <summary>
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Marks a packet as no longer needing acknowledgement without a received acknowledgement.
         /// This method is called when a packet expires and we no longer need an acknowledgement.
-        /// When some reliable packet types expire, they are handled in a way other than simply 
+        /// When some reliable packet types expire, they are handled in a way other than simply
         /// resending them. The only effect of removal this way is to update unacked byte count.
         /// </summary>
         /// <param name="sequenceNumber">Sequence number of the packet to
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 foreach (OutgoingPacket packet in m_packets.Values)
                 {
-                    // TickCount of zero means a packet is in the resend queue 
+                    // TickCount of zero means a packet is in the resend queue
                     // but hasn't actually been sent over the wire yet
                     if (packet.TickCount == 0)
                         continue;
@@ -172,7 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // As with other network applications, assume that an expired packet is
                         // an indication of some network problem, slow transmission
                         packet.Client.FlowThrottle.ExpirePackets(1);
-                        
+
                         expiredPackets.Add(packet);
                     }
                 }
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             while (m_pendingAdds.TryDequeue(out pendingAdd))
                 if (pendingAdd != null)
                     m_packets[pendingAdd.SequenceNumber] = pendingAdd;
-            
+
             // Process all the pending removes, including updating statistics and round-trip times
             PendingAck pendingAcknowledgement;
             while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 else
                 {
                     // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack",
-                    //                  pendingAcknowledgement.SequenceNumber);                    
+                    //                  pendingAcknowledgement.SequenceNumber);
                 }
             }
 
diff --git a/OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs
index 0b6ee2f..e859653 100644
--- a/OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ClientStack")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 1a19585..f48710f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                     if (estateModule.IsTerrainXfer(xferID))
                         return;
                 }
-                
+
                 m_log.ErrorFormat(
                     "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}",
                     xferID, packetID, data.Length);
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index f489262..89fdf09 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             IAgentAssetTransactions
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_Scene;
         private bool m_dumpAssetsToFile = false;
         private int  m_levelUpload = 0;
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// </summary>
         private Dictionary<UUID, AgentAssetTransactions> AgentTransactions =
             new Dictionary<UUID, AgentAssetTransactions>();
-        
+
         #region Region Module interface
 
         public void Initialise(IConfigSource source)
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 //            m_log.DebugFormat(
 //                "[ASSET TRANSACTION MODULE]: HandleUDPUploadRequest - assetID: {0}, transaction {1}, type {2}, storeLocal {3}, tempFile {4}, data.Length {5}",
 //                assetID, transactionID, type, storeLocal, tempFile, data.Length);
-            
+
             if (((AssetType)type == AssetType.Texture ||
                 (AssetType)type == AssetType.Sound ||
                 (AssetType)type == AssetType.TextureTGA ||
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 60a254e..d2aa177 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
     public class AssetXferUploader
     {
-       
+
         private List<UUID> defaultIDs = new List<UUID> {
                 // Viewer's notion of the default texture
                 new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default blank
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index 4b457b1..ff71593 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")]
-    public class IPBanModule : ISharedRegionModule 
+    public class IPBanModule : ISharedRegionModule
     {
         #region Implementation of ISharedRegionModule
 
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
 
         public void Close()
         {
-            
+
         }
 
         public string Name
@@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
         /// matching domain (including "betasomewhere.com", "beta.somewhere.com",
         /// "somewhere.com.beta") - make sure to be reasonably specific in DNS
         /// bans.
-        /// 
+        ///
         /// IP address bans match on first characters, so,
-        /// "127.0.0.1" will ban only that address, 
+        /// "127.0.0.1" will ban only that address,
         /// "127.0.1" will ban "127.0.10.0"
         /// but "127.0.1." will ban only the "127.0.1.*" network
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 6d1f0c2..2242e42 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                 // Cache Decoded layers
                 SaveFileCacheForAsset(assetID, layers);
             }
-            
+
             // Notify Interested Parties
             lock (m_notifyList)
             {
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 1391013..1b6401a 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         private double  lastTimeTick = 0.0;
         private double  lastFilesExpire = 0.0;
         private bool    inTimeTick = false;
-  
+
         public struct XferRequest
         {
             public IClientAPI remoteClient;
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public int refsCount;
             public double timeStampMS;
         }
-       
+
         #region INonSharedRegionModule Members
 
         public void Initialise(IConfigSource config)
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                 }
             }
         }
-        
+
         public void NewClient(IClientAPI client)
         {
             client.OnRequestXfer += RequestXfer;
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                             int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Asset) >> 11;
                             if(Transfers.Count > 1)
                                 burstSize /= Transfers.Count;
-                            XferDownLoad transaction = 
+                            XferDownLoad transaction =
                                 new XferDownLoad(fileName, fileData, xferID, remoteClient, burstSize);
 
                             Transfers.Add(xferID, transaction);
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     }
                 }
                 else
-                    m_log.WarnFormat("[Xfer]: {0} not found", fileName);               
+                    m_log.WarnFormat("[Xfer]: {0} not found", fileName);
             }
         }
 
@@ -381,9 +381,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                             lastBytes = 1024;
                             LastPacket--;
                         }
-                        
+
                     }
-                
+
                     lastAckPacket = -1;
                     lastSentPacket = -1;
 
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 14b0280..23c1f03 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -41,16 +41,16 @@ namespace OpenSim.Region.CoreModules.Asset
     /// </summary>
     /// <remarks>
     /// <para>
-    /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". 
-    /// When cache is successfully enable log should have message 
+    /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache".
+    /// When cache is successfully enable log should have message
     /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".
     /// </para>
     /// <para>
     /// Cache's size is limited by two parameters:
-    /// maximal allowed size in bytes and maximal allowed asset count. When new asset 
+    /// maximal allowed size in bytes and maximal allowed asset count. When new asset
     /// is added to cache that have achieved either size or count limitation, cache
     /// will automatically remove less recently used assets from cache. Additionally
-    /// asset's lifetime is controlled by expiration time. 
+    /// asset's lifetime is controlled by expiration time.
     /// </para>
     /// <para>
     /// <list type="table">
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Asset
     public class CenomeMemoryAssetCache : IAssetCache, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Cache's default maximal asset count.
         /// </summary>
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Asset
         /// Asset's default expiration time in the cache.
         /// </summary>
         public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0);
-        
+
         /// <summary>
         /// Cache object.
         /// </summary>
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Asset
             if (asset != null)
             {
 //                m_log.DebugFormat("[CENOME ASSET CACHE]: Caching asset {0}", asset.ID);
-                
+
                 long size = asset.Data != null ? asset.Data.Length : 1;
                 m_cache.Set(asset.ID, asset, size);
                 m_cachedCount++;
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Get asset stored 
+        /// Get asset stored
         /// </summary>
         /// <param name="id">
         /// The asset's id.
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
 //            if (null == assetBase)
 //                m_log.DebugFormat("[CENOME ASSET CACHE]: Asset {0} not in cache", id);
-            
+
             return assetBase;
         }
 
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Asset
             get { return "CenomeMemoryAssetCache"; }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
             if (name != Name)
                 return;
-            
+
             long maxSize = DefaultMaxSize;
             int maxCount = DefaultMaxCount;
             TimeSpan expirationTime = DefaultExpirationTime;
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 82bc5cc..51fc3d1 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Asset
             get { return "CoreAssetCache"; }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 84e13a0..187f090 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Uncomment to make asset Get requests for existing 
+// Uncomment to make asset Get requests for existing
 // #define WAIT_ON_INPROGRESS_REQUESTS
 
 using System;
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset
         private IAssetService m_AssetService;
         private List<Scene> m_Scenes = new List<Scene>();
         private object timerLock = new object();
-        
+
         private Dictionary<string,WeakReference> weakAssetReferences = new Dictionary<string, WeakReference>();
         private object weakAssetReferencesLock = new object();
         private bool m_updateFileTimeOnCacheHit = false;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Asset
             m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.Asset
         public void Initialise(IConfigSource source)
         {
             IConfig moduleConfig = source.Configs["Modules"];
-            
+
             if (moduleConfig != null)
             {
                 string name = moduleConfig.GetString("AssetCaching", String.Empty);
@@ -169,11 +169,11 @@ namespace OpenSim.Region.CoreModules.Asset
                         m_negativeExpiration = assetConfig.GetInt("NegativeCacheTimeout", m_negativeExpiration);
                         m_negativeCacheSliding = assetConfig.GetBoolean("NegativeCacheSliding", m_negativeCacheSliding);
                         m_updateFileTimeOnCacheHit = assetConfig.GetBoolean("UpdateFileTimeOnCacheHit", m_updateFileTimeOnCacheHit);
-    
+
     #if WAIT_ON_INPROGRESS_REQUESTS
                         m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000);
     #endif
-    
+
                         m_LogLevel = assetConfig.GetInt("LogLevel", m_LogLevel);
                         m_HitRateDisplay = (ulong)assetConfig.GetLong("HitRateDisplay", (long)m_HitRateDisplay);
 
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Asset
                         {
                             m_CacheCleanTimer = new System.Timers.Timer(m_FileExpirationCleanupTimer.TotalMilliseconds);
                             m_CacheCleanTimer.AutoReset = false;
-                            m_CacheCleanTimer.Elapsed += CleanupExpiredFiles;                       
+                            m_CacheCleanTimer.Elapsed += CleanupExpiredFiles;
                             m_CacheCleanTimer.Start();
                             m_timerRunning = true;
                         }
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.Asset
                  }
                 if (m_MemoryCacheEnabled)
                     m_MemoryCache = new ExpiringCache<string, AssetBase>();
-            
+
                 lock(weakAssetReferencesLock)
                     weakAssetReferences = new Dictionary<string, WeakReference>();
             }
@@ -306,11 +306,11 @@ namespace OpenSim.Region.CoreModules.Asset
                 if (File.Exists(filename))
                 {
                     UpdateFileLastAccessTime(filename);
-                } 
-                else 
+                }
+                else
                 {
                     // Once we start writing, make sure we flag that we're writing
-                    // that object to the cache so that we don't try to write the 
+                    // that object to the cache so that we don't try to write the
                     // same file multiple times.
                     lock (m_CurrentlyWriting)
                     {
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Asset
         /// <param name="id"></param>
         /// <returns>An asset retrieved from the file cache.  null if there was a problem retrieving an asset.</returns>
         private AssetBase GetFromFileCache(string id)
-        {          
+        {
             string filename = GetFileName(id);
 
 #if WAIT_ON_INPROGRESS_REQUESTS
@@ -649,7 +649,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 m_MemoryCache = new ExpiringCache<string, AssetBase>();
             if (m_negativeCacheEnabled)
                 m_negativeCache = new ExpiringCache<string, object>();
-            
+
             lock(weakAssetReferencesLock)
                 weakAssetReferences = new Dictionary<string, WeakReference>();
         }
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Asset
             if (m_LogLevel >= 2)
                 m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Checking for expired files older then {0}.", m_FileExpiration);
 
-            lock(timerLock)           
+            lock(timerLock)
             {
                 if(!m_timerRunning || m_cleanupRunning)
                     return;
@@ -687,8 +687,8 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Recurses through specified directory checking for asset files last 
-        /// accessed prior to the specified purge line and deletes them.  Also 
+        /// Recurses through specified directory checking for asset files last
+        /// accessed prior to the specified purge line and deletes them.  Also
         /// removes empty tier directories.
         /// </summary>
         /// <param name="dir"></param>
@@ -720,7 +720,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 else if (dirSize >= m_CacheWarnAt)
                 {
                     m_log.WarnFormat(
-                        "[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration", 
+                        "[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration",
                         dir, dirSize);
                 }
             }
@@ -760,7 +760,7 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Writes a file to the file cache, creating any nessesary 
+        /// Writes a file to the file cache, creating any nessesary
         /// tier directories along the way
         /// </summary>
         /// <param name="filename"></param>
@@ -772,7 +772,7 @@ namespace OpenSim.Region.CoreModules.Asset
             // Make sure the target cache directory exists
             string directory = Path.GetDirectoryName(filename);
 
-            // Write file first to a temp name, so that it doesn't look 
+            // Write file first to a temp name, so that it doesn't look
             // like it's already cached while it's still writing.
             string tempname = Path.Combine(directory, Path.GetRandomFileName());
 
@@ -784,7 +784,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     {
                         Directory.CreateDirectory(directory);
                     }
-    
+
                     stream = File.Open(tempname, FileMode.Create);
                     BinaryFormatter bformatter = new BinaryFormatter();
                     bformatter.Serialize(stream, asset);
@@ -818,7 +818,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     // This situation occurs fairly rarely anyway.  We assume in this that moves are atomic on the
                     // filesystem.
                     File.Move(tempname, filename);
-    
+
                     if (m_LogLevel >= 2)
                         m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Cache Stored :: {0}", asset.ID);
                 }
@@ -875,7 +875,7 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             string RegionCacheStatusFile = Path.Combine(m_CacheDirectory, "RegionStatus_" + regionID.ToString() + ".fac");
 
-            try 
+            try
             {
                 if (File.Exists(RegionCacheStatusFile))
                 {
@@ -884,7 +884,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 else
                 {
                     File.WriteAllText(
-                        RegionCacheStatusFile, 
+                        RegionCacheStatusFile,
                         "Please do not delete this file unless you are manually clearing your Flotsam Asset Cache.");
                 }
             }
@@ -892,14 +892,14 @@ namespace OpenSim.Region.CoreModules.Asset
             {
                 m_log.Warn(
                     string.Format(
-                        "[FLOTSAM ASSET CACHE]: Could not stamp region status file for region {0}.  Exception  ", 
-                        regionID), 
+                        "[FLOTSAM ASSET CACHE]: Could not stamp region status file for region {0}.  Exception  ",
+                        regionID),
                     e);
             }
         }
 
         /// <summary>
-        /// Iterates through all Scenes, doing a deep scan through assets 
+        /// Iterates through all Scenes, doing a deep scan through assets
         /// to update the access time of all assets present in the scene or referenced by assets
         /// in the scene.
         /// </summary>
@@ -918,7 +918,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 StampRegionStatusFile(s.RegionInfo.RegionID);
 
                 s.ForEachSOG(delegate(SceneObjectGroup e)
-                {            
+                {
                     if(!m_timerRunning && !storeUncached)
                         return;
 
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
             double weakHitRate = m_weakRefHits * invReq;
             int weakEntries = weakAssetReferences.Count;
-            
+
             double fileHitRate = m_DiskHits * invReq;
             double TotalHitRate = weakHitRate + fileHitRate;
 
@@ -1073,9 +1073,9 @@ namespace OpenSim.Region.CoreModules.Asset
                         if (m_FileCacheEnabled)
                         {
                             con.Output("Deep scans have previously been performed on the following regions:");
-    
+
                             foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
-                            {                                    
+                            {
                                 string RegionID = s.Remove(0,s.IndexOf("_")).Replace(".fac","");
                                 DateTime RegionDeepScanTMStamp = File.GetLastWriteTime(s);
                                 con.OutputFormat("Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
@@ -1118,7 +1118,7 @@ namespace OpenSim.Region.CoreModules.Asset
                                 con.Output("Memory cache not enabled.");
                             }
                         }
-    
+
                         if (clearFile)
                         {
                             if (m_FileCacheEnabled)
@@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         con.Output("FloatSam Ensuring assets are cached for all scenes.");
 
-                        WorkManager.RunInThread(delegate 
+                        WorkManager.RunInThread(delegate
                         {
                             bool wasRunning= false;
                             lock(timerLock)
@@ -1167,7 +1167,7 @@ namespace OpenSim.Region.CoreModules.Asset
                                 if(wasRunning)
                                 {
                                     m_CacheCleanTimer.Start();
-                                    m_timerRunning = true;                               
+                                    m_timerRunning = true;
                                 }
                                 m_cleanupRunning = false;
                             }
@@ -1247,12 +1247,12 @@ namespace OpenSim.Region.CoreModules.Asset
         public bool[] AssetsExist(string[] ids)
         {
             bool[] exist = new bool[ids.Length];
-            
+
             for (int i = 0; i < ids.Length; i++)
             {
                 exist[i] = Check(ids[i]);
             }
-            
+
             return exist;
         }
 
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 195bdaa..208963d 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Asset
         // Instrumentation
         private uint m_DebugRate;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 73e4431..dbb7941 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             AssetBase asset = AssetHelpers.CreateNotecardAsset();
             asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d5c81ce..f4a8a6b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// A value of 0 will apply no pause.  The pause is specified in milliseconds.
         /// </remarks>
         public int ThrottlePer100PrimsRezzed { get; set; }
-        
+
         private Scene m_scene;
         private IInventoryAccessModule m_invAccessModule;
 
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// Are attachments enabled?
         /// </summary>
         public bool Enabled { get; private set; }
-        
+
         public string Name { get { return "Attachments Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
@@ -87,14 +87,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 Enabled = true;
             }
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             if (Enabled)
             {
                 // Only register module with scene if it is enabled. All callers check for a null attachments module.
-                // Ideally, there should be a null attachments module for when this core attachments module has been 
+                // Ideally, there should be a null attachments module for when this core attachments module has been
                 // disabled. Registering only when enabled allows for other attachments module implementations.
                 m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
                 m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private void HandleScriptStateChange(uint localID, bool started)
         {
             SceneObjectGroup sog = m_scene.GetGroupByPrim(localID);
-            if (sog != null && sog.IsAttachment) 
+            if (sog != null && sog.IsAttachment)
             {
                 if (!started)
                 {
@@ -198,21 +198,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             m_scene.UnregisterModuleInterface<IAttachmentsModule>(this);
 
             if (Enabled)
                 m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-        
+
         public void RegionLoaded(Scene scene)
         {
             m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>();
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     ((SceneObjectGroup)so).RootPart.ClearUpdateSchedule();
 
 //                    m_log.DebugFormat(
-//                        "[ATTACHMENTS MODULE]: Copying script state with {0} bytes for object {1} for {2} in {3}", 
+//                        "[ATTACHMENTS MODULE]: Copying script state with {0} bytes for object {1} for {2} in {3}",
 //                        ad.AttachmentObjectStates[i].Length, so.Name, sp.Name, m_scene.Name);
 
                     so.SetState(ad.AttachmentObjectStates[i++], m_scene);
@@ -295,7 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 if (DebugLevel > 0)
                     m_log.DebugFormat(
-                        "[ATTACHMENTS MODULE]: Not doing simulator-side attachment rez for {0} in {1} as their viewer has already rezzed attachments", 
+                        "[ATTACHMENTS MODULE]: Not doing simulator-side attachment rez for {0} in {1} as their viewer has already rezzed attachments",
                         m_scene.Name, sp.Name);
 
                   return;
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down
                 // But they're not used anyway, the item is being looked up for now, so let's proceed.
-                //if (UUID.Zero == assetID) 
+                //if (UUID.Zero == assetID)
                 //{
                 //    m_log.DebugFormat("[ATTACHMENT]: Cannot rez attachment in point {0} with itemID {1}", p, itemID);
                 //    continue;
@@ -434,7 +434,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         UpdateDetachedObject(sp, so, String.Empty);
                     sp.ClearAttachments();
                 }
-            }           
+            }
         }
 
         public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent)
@@ -445,7 +445,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (DebugLevel > 0)
                 m_log.DebugFormat(
                     "[ATTACHMENTS MODULE]: Deleting attachments from scene {0} for {1}, silent = {2}",
-                    m_scene.RegionInfo.RegionName, sp.Name, silent);            
+                    m_scene.RegionInfo.RegionName, sp.Name, silent);
 
             foreach (SceneObjectGroup sop in sp.GetAttachments())
             {
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             sp.ClearAttachments();
         }
-        
+
         public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent,
                     bool addToInventory, bool append)
         {
@@ -505,7 +505,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
             // be removed when that functionality is implemented in opensim
             attachmentPt &= 0x7f;
-            
+
             // If the attachment point isn't the same as the one previously used
             // set it's offset position = 0 so that it appears on the attachment point
             // and not in a weird location somewhere unknown.
@@ -583,7 +583,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 if (addToInventory && sp.PresenceType != PresenceType.Npc)
                     UpdateUserInventoryWithAttachment(sp, group, attachmentPt, append);
-    
+
                 AttachToAgent(sp, group, attachmentPt, attachPos, silent);
 
                 if (resumeScripts)
@@ -616,11 +616,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         }
 
         public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
-                {
-                        return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
-                }
+        {
+            return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
+        }
 
-                public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
+        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
         {
             if (!Enabled)
                 return null;
@@ -631,8 +631,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     (AttachmentPoint)AttachmentPt, itemID, sp.Name, m_scene.Name);
 
             // We check the attachments in the avatar appearance here rather than the objects attached to the
-            // ScenePresence itself so that we can ignore calls by viewer 2/3 to attach objects on startup.  We are 
-            // already doing this in ScenePresence.MakeRootAgent().  Simulator-side attaching needs to be done 
+            // ScenePresence itself so that we can ignore calls by viewer 2/3 to attach objects on startup.  We are
+            // already doing this in ScenePresence.MakeRootAgent().  Simulator-side attaching needs to be done
             // because pre-outfit folder viewers (most version 1 viewers) require it.
             bool alreadyOn = false;
             List<AvatarAttachment> existingAttachments = sp.Appearance.GetAttachments();
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Rezzing {0} attachments from inventory for {1} in {2}", 
+                    "[ATTACHMENTS MODULE]: Rezzing {0} attachments from inventory for {1} in {2}",
                     rezlist.Count, sp.Name, m_scene.Name);
 
             foreach (KeyValuePair<UUID, uint> rez in rezlist)
@@ -727,7 +727,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
                 so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
-                
+
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
@@ -744,7 +744,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
 
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
-                
+
                 so.ApplyPhysics();
 
                 rootPart.Rezzed = DateTime.Now;
@@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", 
+                    "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}",
                     so.Name, so.LocalId, so.FromItemID, sp.Name, m_scene.Name);
 
             // Scripts MUST be snapshotted before the object is
@@ -827,14 +827,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 UpdateDetachedObject(sp, so, scriptedState);
             }
         }
-        
+
         public void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos)
         {
             if (!Enabled)
                 return;
 
             sog.UpdateGroupPosition(pos);
-            sog.HasGroupChanged = true;            
+            sog.HasGroupChanged = true;
         }
 
         #endregion
@@ -843,7 +843,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         // This is public but is not part of the IAttachmentsModule interface.
         // RegionCombiner module needs to poke at it to deliver client events.
-        // This breaks the encapsulation of the module and should get fixed somehow. 
+        // This breaks the encapsulation of the module and should get fixed somehow.
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnRezSingleAttachmentFromInv += Client_OnRezSingleAttachmentFromInv;
@@ -856,7 +856,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         // This is public but is not part of the IAttachmentsModule interface.
         // RegionCombiner module needs to poke at it to deliver client events.
-        // This breaks the encapsulation of the module and should get fixed somehow. 
+        // This breaks the encapsulation of the module and should get fixed somehow.
         public void UnsubscribeFromClientEvents(IClientAPI client)
         {
             client.OnRezSingleAttachmentFromInv -= Client_OnRezSingleAttachmentFromInv;
@@ -936,7 +936,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// Attach this scene object to the given avatar.
         /// </summary>
         /// <remarks>
-        /// This isn't publicly available since attachments should always perform the corresponding inventory 
+        /// This isn't publicly available since attachments should always perform the corresponding inventory
         /// operation (to show the attach in user inventory and update the asset with positional information).
         /// </remarks>
         /// <param name="sp"></param>
@@ -997,7 +997,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 // Fudge below is an extremely unhelpful comment.  It's probably here so that the scheduled full update
                 // will succeed, as that will not update if an attachment is selected.
-                so.IsSelected = false; // fudge.... 
+                so.IsSelected = false; // fudge....
 
                 so.ScheduleGroupForFullUpdate();
             }
@@ -1041,7 +1041,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// </summary>
         /// <remarks>
         /// This involves triggering the detach event and getting the script state (which also stops the script)
-        /// This MUST be done outside sp.AttachmentsSyncLock, since otherwise there is a chance of deadlock if a 
+        /// This MUST be done outside sp.AttachmentsSyncLock, since otherwise there is a chance of deadlock if a
         /// running script is performing attachment operations.
         /// </remarks>
         /// <returns>
@@ -1088,7 +1088,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // Remove the object from the scene so no more updates
             // are sent. Doing this before the below changes will ensure
             // updates can't cause "HUD artefacts"
-           
+
             m_scene.DeleteSceneObject(so, false, false);
 
             // Prepare sog for storage
@@ -1125,7 +1125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     itemID, rezGroupID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                     false, false, sp.UUID, true);
             else
-                objatt = m_invAccessModule.RezObject(sp.ControllingClient, 
+                objatt = m_invAccessModule.RezObject(sp.ControllingClient,
                     null, rezGroupID, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                     false, false, sp.UUID, true);
 
@@ -1139,7 +1139,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
             else if (itemID == UUID.Zero)
             {
-                // We need to have a FromItemID for multiple attachments on a single attach point to appear.  This is 
+                // We need to have a FromItemID for multiple attachments on a single attach point to appear.  This is
                 // true on Singularity 1.8.5 and quite possibly other viewers as well.  As NPCs don't have an inventory
                 // we will satisfy this requirement by inserting a random UUID.
                 objatt.FromItemID = UUID.Random();
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             if (tainted)
-                objatt.HasGroupChanged = true;           
+                objatt.HasGroupChanged = true;
 
             if (ThrottlePer100PrimsRezzed > 0)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 16f1952..941853c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -485,7 +485,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Test wearing a second attachment at the same position
             // Until multiple attachments at one point is implemented, this will remove the first attachment
-            // This test relies on both attachments having the same default attachment point (in this case LeftHand 
+            // This test relies on both attachments having the same default attachment point (in this case LeftHand
             // since none other has been set).
             {
                 scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, attItem2.ID, (uint)AttachmentPoint.Default);
@@ -975,8 +975,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // Both these operations will occur on different threads and will wait for each other.
             // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
             // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
-            tc.OnTestClientSendRegionTeleport 
-                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+            tc.OnTestClientSendRegionTeleport
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL)
                     => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
 
             m_numberOfAttachEventsFired = 0;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 67256ee..0826a08 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
                 m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
                 m_reusetextures = appearanceConfig.GetBoolean("ReuseTextures",m_reusetextures);
-                
+
                 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
             }
 
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         }
 
         /// <summary>
-        /// Set appearance data (texture asset IDs and slider settings) 
+        /// Set appearance data (texture asset IDs and slider settings)
         /// </summary>
         /// <param name="sp"></param>
         /// <param name="texture"></param>
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 {
                     changed = sp.Appearance.SetVisualParams(visualParams);
                 }
-            
+
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             WearableCacheItem[] items = sp.Appearance.WearableCacheItems;
             //foreach (WearableCacheItem item in items)
             //{
-               
+
             //}
             return items;
         }
@@ -468,7 +468,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
 
             sp.Appearance.WearableCacheItems = wearableCache;
-           
+
             if (missing.Count > 0)
             {
                 foreach (UUID id in missing)
@@ -493,7 +493,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
             {
                 int j = AvatarAppearance.BAKE_INDICES[iter];
-                m_log.Debug("[UpdateBCache] {" + iter + "/" + 
+                m_log.Debug("[UpdateBCache] {" + iter + "/" +
                                     sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
                                     sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
                                     sp.Appearance.WearableCacheItems[j].TextureID);
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                             wearableCacheValid = false;
                         }
                     }
-                   
+
                     wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
                     if (wearableCacheValid)
                         m_log.Debug("[ValidateBakedCache] have valid local cache");
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (!wearableCacheValid)
                 {
                     hits = 0;
-                    // only use external bake module on login condition check                  
+                    // only use external bake module on login condition check
 //                    ScenePresence ssp = null;
 //                    if (sp is ScenePresence)
                     {
@@ -816,7 +816,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 foreach (KeyValuePair<UUID, long> kvp in saves)
                 {
                     // We have to load the key and value into local parameters to avoid a race condition if we loop
-                    // around and load kvp with a different value before FireAndForget has launched its thread.                    
+                    // around and load kvp with a different value before FireAndForget has launched its thread.
                     UUID avatarID = kvp.Key;
                     long sendTime = kvp.Value;
 
@@ -869,13 +869,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             m_scene.AvatarService.SetAppearance(agentid, sp.Appearance);
 
-            // Trigger this here because it's the final step in the set/queue/save process for appearance setting. 
+            // Trigger this here because it's the final step in the set/queue/save process for appearance setting.
             // Everything has been updated and stored. Ensures bakes have been persisted (if option is set to persist bakes).
             m_scene.EventManager.TriggerAvatarAppearanceChanged(sp);
         }
 
         /// <summary>
-        /// For a given set of appearance items, check whether the items are valid and add their asset IDs to 
+        /// For a given set of appearance items, check whether the items are valid and add their asset IDs to
         /// appearance data.
         /// </summary>
         /// <param name='userID'></param>
@@ -893,7 +893,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
                         {
                             m_log.WarnFormat(
-                                "[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero.  Ignoring.", 
+                                "[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero.  Ignoring.",
                                 i, j, userID);
 
                             continue;
@@ -967,7 +967,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                                case WearableType.Skin:
 //                                //case WearableType.Underpants:
 //                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
-//                            
+//
 //                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
 //                                    resetwearable = true;
 //                                    break;
@@ -975,7 +975,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                            }
 //                            continue;
 //                        }
-//                        
+//
 //                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
 //                        baseItem = invService.GetItem(baseItem);
 //
@@ -1002,7 +1002,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //
 //                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
 //                            resetwearable = true;
-//                            
+//
 //                        }
 //                    }
 //                }
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                if (appearance.Wearables[(int) WearableType.Eyes] == null)
 //                {
 //                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
-//                    
+//
 //                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
 //                    resetwearable = true;
 //                }
@@ -1213,7 +1213,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
             }, null, "AvatarFactoryModule.OnClientRequestWearables");
         }
-        
+
         /// <summary>
         /// Set appearance data (texture asset IDs and slider settings) received from a client
         /// </summary>
@@ -1299,12 +1299,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 UUID texture = UUID.Zero;
                 int index = request.BakedTextureIndex;
-                
+
                 if (m_reusetextures)
                 {
                     // this is the most insanely dumb way to do this... however it seems to
                     // actually work. if the appearance has been reset because wearables have
-                    // changed then the texture entries are zero'd out until the bakes are 
+                    // changed then the texture entries are zero'd out until the bakes are
                     // uploaded. on login, if the textures exist in the cache (eg if you logged
                     // into the simulator recently, then the appearance will pull those and send
                     // them back in the packet and you won't have to rebake. if the textures aren't
@@ -1320,7 +1320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                     // m_log.WarnFormat("[AVFACTORY]: reuse texture {0} for index {1}",texture,index);
                 }
-                
+
                 CachedTextureResponseArg response = new CachedTextureResponseArg();
                 response.BakedTextureIndex = index;
                 response.BakedTextureID = texture;
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 cachedTextureResponse.Add(response);
             }
-            
+
             // m_log.WarnFormat("[AVFACTORY]: serial is {0}",serial);
             // The serial number appears to be used to match requests and responses
             // in the texture transaction. We just send back the serial number
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index dd93449..33489d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             // TODO: Use the actual BunchOfCaps functionality once we slot in the CapabilitiesModules
             AssetBase bakedTextureAsset;
-            bakedTextureAsset 
+            bakedTextureAsset
                 = new AssetBase(
                     bakedTextureID, "Test Baked Texture", (sbyte)AssetType.Texture, userId.ToString());
             bakedTextureAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = bakedTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
 
             AssetBase eyesBake = scene.AssetService.Get(bakedTextureID.ToString());
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// Test appearance setting where the baked texture UUID are library alpha textures.
         /// </summary>
         /// <remarks>
-        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to 
+        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to
         /// rebake.
         /// </remarks>
         [Test]
@@ -113,14 +113,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
             AssetBase libraryAsset;
-            libraryAsset 
+            libraryAsset
                 = new AssetBase(
                     alphaTextureID, "Default Alpha Layer Texture", (sbyte)AssetType.Texture, userId.ToString());
             libraryAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = alphaTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
         }
 
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index 6d97251..27e84b0 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
         private UTF8Encoding enc = new UTF8Encoding();
         private string m_URL = String.Empty;
         private static XmlSerializer m_serializer = new XmlSerializer(typeof(AssetBase));
-                private static bool m_enabled = false;
+        private static bool m_enabled = false;
 
         private static IServiceAuth m_Auth;
 
@@ -64,18 +64,18 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
                 return;
 
             m_URL = config.GetString("URL", String.Empty);
-                        if (m_URL == String.Empty)
-                                return;
+            if (m_URL == String.Empty)
+                return;
 
-                        m_enabled = true;
+            m_enabled = true;
 
             m_Auth = ServiceAuth.Create(configSource, "XBakes");
         }
 
         public void AddRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             // m_log.InfoFormat("[XBakes]: Enabled for region {0}", scene.RegionInfo.RegionName);
             m_Scene = scene;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
 
             int numberWears = 0;
             MemoryStream reqStream;
-           
+
             using (MemoryStream bakeStream = new MemoryStream())
             using (XmlTextWriter bakeWriter = new XmlTextWriter(bakeStream, null))
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 5164289..53800bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     m_enabled = false;
                     return;
                 }
- 
+
             m_whisperdistance = m_config.GetInt("whisper_distance", m_whisperdistance);
             m_saydistance = m_config.GetInt("say_distance", m_saydistance);
             m_shoutdistance = m_config.GetInt("shout_distance", m_shoutdistance);
@@ -123,7 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 }
             }
         }
-        
+
         public virtual void Close()
         {
         }
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         {
         }
 
-        public virtual Type ReplaceableInterface 
+        public virtual Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            switch (sourceType) 
+            switch (sourceType)
             {
                 case ChatSourceType.Agent:
                     ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     }
                     destination = UUID.Zero; // Avatars cant "SayTo"
                     ownerID = c.Sender.AgentId;
-                
+
                     hidePos = fromPos;
                     break;
 
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}",
 //                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
@@ -317,13 +317,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                         }
                     }
                 });
-            
+
             scene.EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
 
         static protected Vector3 CenterOfRegion = new Vector3(128, 128, 30);
-        
+
         public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
         {
             if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
@@ -341,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             // broadcast chat works by redistributing every incoming chat
             // message to each avatar in the scene.
             string fromName = c.From;
-            
+
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
             ChatSourceType sourceType = ChatSourceType.Object;
@@ -353,15 +353,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 ownerID = c.Sender.AgentId;
                 sourceType = ChatSourceType.Agent;
             }
-            else if (c.SenderUUID != UUID.Zero) 
+            else if (c.SenderUUID != UUID.Zero)
             {
                 fromID = c.SenderUUID;
                 ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
             }
-            
+
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-            
+
             if (c.Scene != null)
             {
                 ((Scene)c.Scene).ForEachRootClient
@@ -374,7 +374,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             (null != c.SenderObject) &&
                             (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
                             return;
-                        
+
                         client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
                                                (byte)sourceType, (byte)ChatAudibleLevel.Fully);
                         receiverIDs.Add(client.AgentId);
@@ -400,7 +400,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// <param name="type"></param>
         /// <param name="message"></param>
         /// <param name="src"></param>
-        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a 
+        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a
         /// precondition</returns>
         protected virtual bool TrySendChatMessage(
             ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
@@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             presence.ControllingClient.SendChatMessage(
                 message, (byte) type, fromPos, fromName,
                 fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
-            
+
             return true;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
index a720ad9..5457dc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 {
     [TestFixture]
     public class ChatModuleTests : OpenSimTestCase
-    {  
+    {
         [TestFixtureSetUp]
         public void FixtureInit()
         {
@@ -66,14 +66,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
         }
 
         private void SetupNeighbourRegions(TestScene sceneA, TestScene sceneB)
-        {            
-            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the 
+        {
+            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the
             // CapabilitiesModule complain when it can't set up HTTP endpoints.
             BaseHttpServer httpServer = new BaseHttpServer(99999);
             MainServer.AddHttpServer(httpServer);
             MainServer.Instance = httpServer;
 
-            // We need entity transfer modules so that when sp2 logs into the east region, the region calls 
+            // We need entity transfer modules so that when sp2 logs into the east region, the region calls
             // EntityTransferModuleto set up a child agent on the west region.
             // XXX: However, this is not an entity transfer so is misleading.
             EntityTransferModule etmA = new EntityTransferModule();
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             modulesConfig.Set("SimulationServices", lscm.Name);
 
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
-            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());           
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB, new ChatModule());
         }
 
@@ -111,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(250, 128, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);            
+            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);
 
             SetupNeighbourRegions(sceneWest, sceneEast);
 
@@ -124,12 +124,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneWest, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -147,19 +147,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z), 
+                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
@@ -202,8 +202,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(128, 6, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);            
+            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);
 
             SetupNeighbourRegions(sceneNorth, sceneSouth);
 
@@ -215,12 +215,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneSouth, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneSouth, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneNorth, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -238,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z), 
+                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -266,13 +266,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
             TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
         }
-    
+
         private void TestUserInRange(TestClient speakClient, string testMessage, ref string receivedMessage)
         {
             receivedMessage = "";
diff --git a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
index 764adf9..cf65c47 100644
--- a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
@@ -62,19 +62,19 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
         private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
 
         public string Name { get { return "User Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: CLOSED MODULE");
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index aaa331b..7980de3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_Enabled = true;
                     m_log.DebugFormat("[FRIENDS MODULE]: {0} enabled.", Name);
                 }
-            }            
+            }
         }
 
         protected virtual void InitModule(IConfigSource config)
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
-            { 
+            {
                 // we got a friendship offer
                 UUID principalID = new UUID(im.fromAgentID);
                 UUID friendID = new UUID(im.toAgentID);
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             im.imSessionID = im.fromAgentID;
             im.fromAgentName = GetFriendshipRequesterName(agentID);
 
-            // Try the local sim            
+            // Try the local sim
             if (LocalFriendshipOffered(friendID, im))
                 return true;
 
@@ -648,7 +648,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
             }
 
-            // Update the local cache. 
+            // Update the local cache.
             RecacheFriends(client);
 
             //
@@ -704,7 +704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 }
             }
         }
-        
+
         public void RemoveFriendship(IClientAPI client, UUID exfriendID)
         {
             if (!DeleteFriendship(client.AgentId, exfriendID))
@@ -732,7 +732,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     m_FriendsSimConnector.FriendshipTerminated(region, client.AgentId, exfriendID);
                 }
-            }            
+            }
         }
 
         public void FindFriend(IClientAPI remoteClient,UUID HunterID ,UUID PreyID)
@@ -740,7 +740,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UUID requester = remoteClient.AgentId;
             if(requester != HunterID) // only allow client agent to be the hunter (?)
                 return;
-            
+
             FriendInfo[] friends = GetFriendsFromCache(requester);
             if (friends.Length == 0)
                 return;
@@ -773,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { PreyID.ToString() });
-            
+
             if (friendSessions == null || friendSessions.Length == 0)
                 return;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index c421740..81aa882 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID);
             string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
 
-            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 
+            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID,
                 (byte)InstantMessageDialog.FriendshipOffered, message, false, Vector3.Zero);
 
             // !! HACK
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 9954749..ac05a6e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -539,8 +539,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         //            m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
         //              agentUUI, friendUUI, agentFriendService, friendFriendService);
 
-                }                
-                
+                }
+
                 // Delete any previous friendship relations
                 DeletePreviousRelations(agentID, friendID);
 
@@ -641,11 +641,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a1, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a1.ToString());
-                        }                            
+                        }
                     }
                 }
             }
-                        
+
             finfos = GetFriendsFromCache(a1);
             if (finfos != null)
             {
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a2, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a2.ToString());
-                        }                            
+                        }
                     }
                 }
             }
@@ -783,7 +783,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL);
                     GridRegion region = new GridRegion();
                     region.ServerURI = friendsURL;
-                    
+
                     string name = im.fromAgentName;
                     if (m_uMan.IsLocalGridUser(agentID))
                     {
@@ -815,7 +815,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     }
 
                     m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name);
-                 
+
                     return true;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
index 1fa4dd6..3fae271 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             {
                 if (kvp.Key != "local")
                 {
-                    // For the others, call the user agent service 
+                    // For the others, call the user agent service
                     List<string> ids = new List<string>();
                     foreach (FriendInfo f in kvp.Value)
                         ids.Add(f.Friend);
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index e6fd54e..3d9bd35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
             // so that different services and simulator can share the data in standalone mode.  This is pretty horrible
             // effectively the statics are global variables.
             NullFriendsData.Clear();
-                
+
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             // Not strictly necessary since FriendsModule assumes it is the default (!)
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 4efcd3b..03e2c5a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -42,11 +42,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GesturesModule")]
     public class GesturesModule : INonSharedRegionModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             m_scene.EventManager.OnNewClient -= OnNewClient;
             m_scene = null;
         }
-        
+
         public void Close() {}
         public string Name { get { return "Gestures Module"; } }
 
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             client.OnActivateGesture += ActivateGesture;
             client.OnDeactivateGesture += DeactivateGesture;
         }
-        
+
         public virtual void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId)
         {
             IInventoryService invService = m_scene.InventoryService;
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                 item.Flags |= 1;
                 invService.UpdateItem(item);
             }
-            else 
+            else
                 m_log.WarnFormat(
                     "[GESTURES]: Unable to find gesture {0} to activate for {1}", gestureId, client.Name);
         }
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                 item.Flags &= ~(uint)1;
                 invService.UpdateItem(item);
             }
-            else 
+            else
                 m_log.ErrorFormat(
                     "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index db02379..8d3c10d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -112,19 +112,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnGodKickUser += KickUser;
             client.OnRequestGodlikePowers += RequestGodlikePowers;
         }
-        
+
         public void UnsubscribeFromClientEvents(IClientAPI client)
         {
             client.OnGodKickUser -= KickUser;
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
-        
+
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
             string uri = "/CAPS/" + UUID.Random();
 
             caps.RegisterHandler(
-                "UntrustedSimulatorMessage", 
+                "UntrustedSimulatorMessage",
                 new RestStreamHandler("POST", uri, HandleUntrustedSimulatorMessage, "UntrustedSimulatorMessage", null));
         }
 
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if (godLike && sp.GodLevel < 200 && DialogModule != null)
                DialogModule.SendAlertToUser(agentID, "Request for god powers denied");
         }
-        
+
         /// <summary>
         /// Kicks or freezes User specified from the simulator. This logs them off of the grid
         /// </summary>
@@ -261,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if(sp.IsDeleted || sp.IsChildAgent)
                 return;
             sp.ControllingClient.Kick(reason);
-            sp.Scene.CloseAgent(sp.UUID, true); 
+            sp.Scene.CloseAgent(sp.UUID, true);
         }
 
         private void OnIncomingInstantMessage(GridInstantMessage msg)
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 543410e..7f91a61 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                 return;
 
 //            m_log.Debug("[GROUPS]: Shutting down group module.");
-            
+
             lock (m_ClientMap)
             {
                 m_ClientMap.Clear();
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 63b3dba..16e2ec3 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -144,11 +144,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (Scene scene in m_Scenes)
             {
 //                m_log.DebugFormat(
-//                    "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
+//                    "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}",
 //                    toAgentID.ToString(), scene.RegionInfo.RegionName);
-                ScenePresence sp = scene.GetScenePresence(toAgentID); 
+                ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null && !sp.IsChildAgent && !sp.IsDeleted)
-                {                                        
+                {
                     // Local message
 //                  m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
                     sp.ControllingClient.SendInstantMessage(im);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 7d54a00..71c0a8a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// Is this module enabled?
         /// </value>
         protected bool m_enabled = false;
-        
+
         protected readonly List<Scene> m_scenes = new List<Scene>();
 
         #region Region Module interface
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule")
                     return;
             }
-            
+
             m_enabled = true;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 6b120fb..efb9421 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -207,10 +207,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             bool successful = false;
-            
+
             // TODO: For now, as IMs seem to be a bit unreliable on OSGrid, catch all exception that
             // happen here and aren't caught and log them.
-            try 
+            try
             {
                 // various rational defaults
                 UUID fromAgentID = UUID.Zero;
@@ -475,7 +475,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// </summary>
 
         /// <param name="prevRegionHandle">
-        /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
+        /// Pass in 0 the first time this method is called.  It will be called recursively with the last
         /// regionhandle tried
         /// </param>
         private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 315d372..2d57193 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             get { return null; }
         }
-        
+
         public void Close()
         {
         }
-       
+
         private void OnNewClient(IClientAPI client)
         {
             client.OnMuteListRequest += OnMuteListRequest;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 369d480..d1f6054 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             get { return null; }
         }
-        
+
         public void Close()
         {
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 4a06fd1..3838316 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// bumps here should be compatible.
         /// </summary>
         public static int MAX_MAJOR_VERSION = 1;
-        
+
         protected TarArchiveReader archive;
 
         private UserAccount m_userInfo;
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// ID of this request
         /// </value>
         protected UUID m_id;
-        
+
         /// <summary>
         /// Do we want to merge this load with existing inventory?
         /// </summary>
@@ -82,41 +82,41 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The stream from which the inventory archive will be loaded.
         /// </value>
         private Stream m_loadStream;
-        
+
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
         public bool ControlFileLoaded { get; private set; }
-        
+
         /// <summary>
         /// Do we want to enforce the check.  IAR versions before 0.2 and 1.1 do not guarantee this order, so we can't
         /// enforce.
         /// </summary>
         public bool EnforceControlFileCheck { get; private set; }
-        
+
         protected bool m_assetsLoaded;
         protected bool m_inventoryNodesLoaded;
-        
+
         protected int m_successfulAssetRestores;
         protected int m_failedAssetRestores;
-        protected int m_successfulItemRestores;                
-        
+        protected int m_successfulItemRestores;
+
         /// <summary>
         /// Root destination folder for the IAR load.
         /// </summary>
         protected InventoryFolderBase m_rootDestinationFolder;
-        
+
         /// <summary>
         /// Inventory nodes loaded from the iar.
         /// </summary>
-        protected HashSet<InventoryNodeBase> m_loadedNodes = new HashSet<InventoryNodeBase>();   
-        
+        protected HashSet<InventoryNodeBase> m_loadedNodes = new HashSet<InventoryNodeBase>();
+
         /// <summary>
         /// In order to load identically named folders, we need to keep track of the folders that we have already
         /// resolved.
         /// </summary>
-        Dictionary <string, InventoryFolderBase> m_resolvedFolders = new Dictionary<string, InventoryFolderBase>();        
-                
+        Dictionary <string, InventoryFolderBase> m_resolvedFolders = new Dictionary<string, InventoryFolderBase>();
+
         /// <summary>
         /// Record the creator id that should be associated with an asset.  This is used to adjust asset creator ids
         /// after OSP resolution (since OSP creators are only stored in the item
@@ -163,9 +163,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_invPath = invPath;
             m_loadStream = loadStream;
             m_module = module;
-            
+
             // FIXME: Do not perform this check since older versions of OpenSim do save the control file after other things
-            // (I thought they weren't).  We will need to bump the version number and perform this check on all 
+            // (I thought they weren't).  We will need to bump the version number and perform this check on all
             // subsequent IAR versions only
             ControlFileLoaded = true;
         }
@@ -188,19 +188,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 Exception reportedException = null;
 
                 string filePath = "ERROR";
-               
+
                 List<InventoryFolderBase> folderCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(
                         m_InventoryService, m_userInfo.PrincipalID, m_invPath);
-    
+
                 if (folderCandidates.Count == 0)
                 {
                     // Possibly provide an option later on to automatically create this folder if it does not exist
                     m_log.ErrorFormat("[INVENTORY ARCHIVER]: Inventory path {0} does not exist", m_invPath);
-    
+
                     return m_loadedNodes;
                 }
-                
+
                 m_rootDestinationFolder = folderCandidates[0];
                 archive = new TarArchiveReader(m_loadStream);
                 byte[] data;
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
                         LoadControlFile(filePath, data);
-                    }                    
+                    }
                     else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
                     {
                         LoadAssetFile(filePath, data);
@@ -221,17 +221,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         LoadInventoryFile(filePath, entryType, data);
                     }
                 }
-                
+
                 archive.Close();
 
                 m_log.DebugFormat(
-                    "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
+                    "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures",
                     m_successfulAssetRestores, m_failedAssetRestores);
 
                 //Alicia: When this is called by LibraryModule or Tests, m_module will be null as event is not required
                 if(m_module != null)
                     m_module.TriggerInventoryArchiveLoaded(m_id, true, m_userInfo, m_invPath, m_loadStream, reportedException, m_successfulItemRestores);
-                
+
                 return m_loadedNodes;
             }
             catch(Exception Ex)
@@ -268,8 +268,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </param>
         /// <returns>The last user inventory folder created or found for the archive path</returns>
         public InventoryFolderBase ReplicateArchivePathToUserInventory(
-            string iarPath, 
-            InventoryFolderBase rootDestFolder, 
+            string iarPath,
+            InventoryFolderBase rootDestFolder,
             Dictionary <string, InventoryFolderBase> resolvedFolders,
             HashSet<InventoryNodeBase> loadedNodes)
         {
@@ -277,27 +277,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
 //            m_log.DebugFormat(
 //                "[INVENTORY ARCHIVER]: Loading folder {0} {1}", rootDestFolder.Name, rootDestFolder.ID);
-                        
-            InventoryFolderBase destFolder 
+
+            InventoryFolderBase destFolder
                 = ResolveDestinationFolder(rootDestFolder, ref iarPathExisting, resolvedFolders);
-            
+
 //            m_log.DebugFormat(
-//                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]", 
+//                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]",
 //                iarPath, iarPathExisting);
-            
+
             string iarPathToCreate = iarPath.Substring(iarPathExisting.Length);
             CreateFoldersForPath(destFolder, iarPathExisting, iarPathToCreate, resolvedFolders, loadedNodes);
-            
+
             return destFolder;
         }
 
         /// <summary>
         /// Resolve a destination folder
         /// </summary>
-        /// 
+        ///
         /// We require here a root destination folder (usually the root of the user's inventory) and the archive
         /// path.  We also pass in a list of previously resolved folders in case we've found this one previously.
-        /// 
+        ///
         /// <param name="archivePath">
         /// The item archive path to resolve.  The portion of the path passed back is that
         /// which corresponds to the resolved desintation folder.
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             while (archivePath.Length > 0)
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
-                
+
                 if (resolvedFolders.ContainsKey(archivePath))
                 {
 //                    m_log.DebugFormat(
@@ -332,13 +332,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     if (m_merge)
                     {
-                        // TODO: Using m_invPath is totally wrong - what we need to do is strip the uuid from the 
+                        // TODO: Using m_invPath is totally wrong - what we need to do is strip the uuid from the
                         // iar name and try to find that instead.
                         string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath);
                         List<InventoryFolderBase> folderCandidates
                             = InventoryArchiveUtils.FindFoldersByPath(
                                 m_InventoryService, m_userInfo.PrincipalID, plainPath);
-            
+
                         if (folderCandidates.Count != 0)
                         {
                             InventoryFolderBase destFolder = folderCandidates[0];
@@ -346,7 +346,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             return destFolder;
                         }
                     }
-                    
+
                     // Don't include the last slash so find the penultimate one
                     int penultimateSlashIndex = archivePath.LastIndexOf("/", archivePath.Length - 2);
 
@@ -365,10 +365,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     }
                 }
             }
-            
+
             return rootDestFolder;
         }
-        
+
         /// <summary>
         /// Create a set of folders for the given path.
         /// </summary>
@@ -388,10 +388,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Track the inventory nodes created.
         /// </param>
         protected void CreateFoldersForPath(
-            InventoryFolderBase destFolder, 
+            InventoryFolderBase destFolder,
             string iarPathExisting,
-            string iarPathToReplicate, 
-            Dictionary <string, InventoryFolderBase> resolvedFolders, 
+            string iarPathToReplicate,
+            Dictionary <string, InventoryFolderBase> resolvedFolders,
             HashSet<InventoryNodeBase> loadedNodes)
         {
             string[] rawDirsToCreate = iarPathToReplicate.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
@@ -402,7 +402,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 if (!rawDirsToCreate[i].Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
                     continue;
-                
+
                 int identicalNameIdentifierIndex
                     = rawDirsToCreate[i].LastIndexOf(
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);
                 UUID newFolderId = UUID.Random();
 
-                destFolder 
+                destFolder
                     = new InventoryFolderBase(
                         newFolderId, newFolderName, m_userInfo.PrincipalID,
                         (short)FolderType.None, destFolder.ID, 1);
@@ -427,7 +427,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     loadedNodes.Add(destFolder);
             }
         }
-        
+
         /// <summary>
         /// Load an item from the archive
         /// </summary>
@@ -438,7 +438,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected InventoryItemBase LoadItem(byte[] data, InventoryFolderBase loadFolder)
         {
             InventoryItemBase item = UserInventoryItemSerializer.Deserialize(data);
-            
+
             // Don't use the item ID that's in the file
             item.ID = UUID.Random();
 
@@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (UUID.Zero != ospResolvedId) // The user exists in this grid
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
-                
+
 //                item.CreatorIdAsUuid = ospResolvedId;
 
                 // Don't preserve the OSPA in the creator id (which actually gets persisted to the
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             if (!m_InventoryService.AddItem(item))
                 m_log.WarnFormat("[INVENTORY ARCHIVER]: Unable to save item {0} in folder {1}", item.Name, item.Folder);
-        
+
             return item;
         }
 
@@ -519,7 +519,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         data = SceneObjectSerializer.ModifySerializedObject(assetId, data,
                             sog => {
                                 bool modified = false;
-                                
+
                                 foreach (SceneObjectPart sop in sog.Parts)
                                 {
                                     if (string.IsNullOrEmpty(sop.CreatorData))
@@ -528,10 +528,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                                         modified = true;
                                     }
                                 }
-                                
+
                                 return modified;
                             });
-                        
+
                         if (data == null)
                             return false;
                     }
@@ -568,7 +568,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             int majorVersion = int.Parse(archiveElement.Attribute("major_version").Value);
             int minorVersion = int.Parse(archiveElement.Attribute("minor_version").Value);
             string version = string.Format("{0}.{1}", majorVersion, minorVersion);
-                        
+
             if (majorVersion > MAX_MAJOR_VERSION)
             {
                 throw new Exception(
@@ -576,38 +576,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         "The IAR you are trying to load has major version number of {0} but this version of OpenSim can only load IARs with major version number {1} and below",
                         majorVersion, MAX_MAJOR_VERSION));
             }
-            
-            ControlFileLoaded = true;            
-            m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version);                        
+
+            ControlFileLoaded = true;
+            m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version);
         }
-        
+
         /// <summary>
         /// Load inventory file
         /// </summary>
         /// <param name="path"></param>
         /// <param name="entryType"></param>
-        /// <param name="data"></param>        
+        /// <param name="data"></param>
         protected void LoadInventoryFile(string path, TarArchiveReader.TarEntryType entryType, byte[] data)
         {
             if (!ControlFileLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load", 
+                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load",
                         ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.INVENTORY_PATH));
-            
+
             if (m_assetsLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load", 
-                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));                            
-            
+                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load",
+                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));
+
             path = path.Substring(ArchiveConstants.INVENTORY_PATH.Length);
-            
+
             // Trim off the file portion if we aren't already dealing with a directory path
             if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
                 path = path.Remove(path.LastIndexOf("/") + 1);
-            
-            InventoryFolderBase foundFolder 
+
+            InventoryFolderBase foundFolder
                 = ReplicateArchivePathToUserInventory(
                     path, m_rootDestinationFolder, m_resolvedFolders, m_loadedNodes);
 
@@ -618,17 +618,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (item != null)
                 {
                     m_successfulItemRestores++;
-                    
-                    // If we aren't loading the folder containing the item then well need to update the 
+
+                    // If we aren't loading the folder containing the item then well need to update the
                     // viewer separately for that item.
                     if (!m_loadedNodes.Contains(foundFolder))
                         m_loadedNodes.Add(item);
                 }
             }
-            
-            m_inventoryNodesLoaded = true;            
+
+            m_inventoryNodesLoaded = true;
         }
-        
+
         /// <summary>
         /// Load asset file
         /// </summary>
@@ -639,15 +639,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (!ControlFileLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load", 
+                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load",
                         ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.ASSETS_PATH));
-            
+
             if (!m_inventoryNodesLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load", 
-                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));                            
-            
+                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load",
+                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));
+
             if (LoadAsset(path, data))
                 m_successfulAssetRestores++;
             else
@@ -655,10 +655,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             if ((m_successfulAssetRestores) % 50 == 0)
                 m_log.DebugFormat(
-                    "[INVENTORY ARCHIVER]: Loaded {0} assets...", 
-                    m_successfulAssetRestores);                       
-            
-            m_assetsLoaded = true;            
-        }                 
+                    "[INVENTORY ARCHIVER]: Loaded {0} assets...",
+                    m_successfulAssetRestores);
+
+            m_assetsLoaded = true;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index dbaf2aa..b66aad5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
-        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an 
+        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an
         /// unspecified one will be returned.  If no such folder eixsts then null is returned</returns>
         public static InventoryFolderBase FindFolderByPath(
             IInventoryService inventoryService, UUID userId, string path)
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
-        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an 
+        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an
         /// unspecified one will be returned.  If no such folder eixsts then null is returned</returns>
         public static InventoryFolderBase FindFolderByPath(
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return FindFoldersByPath(inventoryService, rootFolder, path);
         }
-        
+
         /// <summary>
         /// Find a set of folders given a PATH_DELIMITER delimited path starting from this folder
         /// </summary>
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
         {
             List<InventoryFolderBase> foundFolders = new List<InventoryFolderBase>();
-            
+
             if (path == string.Empty)
             {
                 foundFolders.Add(startFolder);
@@ -189,17 +189,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 foundFolders.Add(startFolder);
                 return foundFolders;
             }
-                        
+
             // If the path isn't just / then trim any starting extraneous slashes
             path = path.TrimStart(new char[] { PATH_DELIMITER });
-            
+
 //            m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Adjusted path in FindFolderByPath() is [{0}]", path);
 
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
 
             //string[] components = path.Split(new string[] { PATH_DELIMITER.ToString() }, 2, StringSplitOptions.None);
-            
+
             InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
 
 //            m_log.DebugFormat(
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
         /// </remarks>
-        /// 
+        ///
         /// <param name="inventoryService">
         /// Inventory service to query
         /// </param>
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
         /// </remarks>
-        /// 
+        ///
         /// <param name="inventoryService">Inventory service to query</param>
         /// <param name="startFolder">The folder from which the path starts</param>
         /// <param name="path">The path to the required item.</param>
@@ -313,10 +313,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             // If the path isn't just / then trim any starting extraneous slashes
             path = path.TrimStart(new char[] { PATH_DELIMITER });
-            
+
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
-                            
+
             //string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
 
             if (components.Length == 1)
@@ -324,15 +324,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                m_log.DebugFormat(
 //                    "FOUND SINGLE COMPONENT [{0}].  Looking for this in [{1}] {2}",
 //                    components[0], startFolder.Name, startFolder.ID);
-                
+
                 List<InventoryItemBase> items = inventoryService.GetFolderItems(startFolder.Owner, startFolder.ID);
 
 //                m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Found {0} items in FindItemByPath()", items.Count);
-                
+
                 foreach (InventoryItemBase item in items)
                 {
 //                    m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Inspecting item {0} {1}", item.Name, item.ID);
-                    
+
                     if (item.Name == components[0])
                         foundItems.Add(item);
                 }
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                m_log.DebugFormat("FOUND COMPONENTS [{0}] and [{1}]", components[0], components[1]);
 
                 InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
-                
+
                 foreach (InventoryFolderBase folder in contents.Folders)
                 {
                     if (folder.Name == components[0])
@@ -365,9 +365,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static string[] SplitEscapedPath(string path)
         {
 //            m_log.DebugFormat("SPLITTING PATH {0}", path);
-            
+
             bool singleEscapeChar = false;
-            
+
             for (int i = 0; i < path.Length; i++)
             {
                 if (path[i] == ESCAPE_CHARACTER && !singleEscapeChar)
@@ -395,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static string UnescapePath(string path)
         {
 //            m_log.DebugFormat("ESCAPING PATH {0}", path);
-            
+
             StringBuilder sb = new StringBuilder();
 
             bool singleEscapeChar = false;
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
 //            m_log.DebugFormat("ESCAPED PATH TO {0}", sb);
-            
+
             return sb.ToString();
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 8847414..be59eb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         public string Name { get { return "Inventory Archiver Module"; } }
 
-        #endregion 
+        #endregion
 
         /// <summary>
         /// Trigger the inventory archive saved event.
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
index c2e645f..f559c2e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
@@ -56,23 +56,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            
+
             // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
             Scene scene = new SceneHelpers().SetupScene();
-            
+
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
 
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood");
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
 
-            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
-            
-            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");            
+
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 
             // Now try loading to a root child folder
             UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false);
@@ -90,9 +90,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryItemBase foundItem3
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name);
-            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");            
+            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
         }
-        
+
         /// <summary>
         /// Test that things work when the load path specified starts with a slash
         /// </summary>
@@ -101,22 +101,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
             Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-            
+
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
             archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
                     scene.InventoryService, m_uaMT.PrincipalID, "/Objects/" + m_item1Name);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()");
         }
- 
+
         [Test]
         public void TestLoadIarPathWithEscapedChars()
         {
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userLastName = "Stirrup";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
             UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
-            
+
             // Create asset
             SceneObjectGroup object1;
             SceneObjectPart part1;
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.Name = itemName;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             scene.AddInventoryItem(item1);
@@ -189,16 +189,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
                     scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 //            Assert.That(
-//                foundItem1.CreatorId, Is.EqualTo(userUuid), 
+//                foundItem1.CreatorId, Is.EqualTo(userUuid),
 //                "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
-                foundItem1.Name, Is.EqualTo(itemName), 
+                foundItem1.Name, Is.EqualTo(itemName),
                 "Loaded item name doesn't match saved name");
         }
-        
+
         /// <summary>
         /// Test replication of an archive path to the user's inventory.
         /// </summary>
@@ -207,21 +207,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
             HashSet<InventoryNodeBase> nodesLoaded = new HashSet<InventoryNodeBase>();
-            
+
             string folder1Name = "1";
             string folder2aName = "2a";
             string folder2bName = "2b";
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
             string folder2aArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2aName, UUID.Random());
             string folder2bArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2bName, UUID.Random());
-            
+
             string iarPath1 = string.Join("", new string[] { folder1ArchiveName, folder2aArchiveName });
             string iarPath2 = string.Join("", new string[] { folder1ArchiveName, folder2bArchiveName });
 
@@ -229,42 +229,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 // Test replication of path1
                 new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
-                        iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                        iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                         foldersCreated, nodesLoaded);
-    
+
                 List<InventoryFolderBase> folder1Candidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
                 Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-                
+
                 InventoryFolderBase folder1 = folder1Candidates[0];
-                List<InventoryFolderBase> folder2aCandidates 
+                List<InventoryFolderBase> folder2aCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2aName);
                 Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
             }
-            
+
             {
                 // Test replication of path2
                 new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
-                        iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                        iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                         foldersCreated, nodesLoaded);
-    
+
                 List<InventoryFolderBase> folder1Candidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
                 Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-                
-                InventoryFolderBase folder1 = folder1Candidates[0]; 
-                
-                List<InventoryFolderBase> folder2aCandidates 
+
+                InventoryFolderBase folder1 = folder1Candidates[0];
+
+                List<InventoryFolderBase> folder2aCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2aName);
                 Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
-                
-                List<InventoryFolderBase> folder2bCandidates 
+
+                List<InventoryFolderBase> folder2bCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2bName);
                 Assert.That(folder2bCandidates.Count, Is.EqualTo(1));
             }
         }
-        
+
         /// <summary>
         /// Test replication of a partly existing archive path to the user's inventory.  This should create
         /// a duplicate path without the merge option.
@@ -274,31 +274,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             string folder1ExistingName = "a";
             string folder2Name = "b";
-            
-            InventoryFolderBase folder1 
+
+            InventoryFolderBase folder1
                 = UserInventoryHelpers.CreateInventoryFolder(
                     scene.InventoryService, ua1.PrincipalID, folder1ExistingName, false);
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-            
+
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
             new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                 .ReplicateArchivePathToUserInventory(
-                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
 
-            List<InventoryFolderBase> folder1PostCandidates 
+            List<InventoryFolderBase> folder1PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
             Assert.That(folder1PostCandidates.Count, Is.EqualTo(2));
-            
+
             // FIXME: Temporarily, we're going to do something messy to make sure we pick up the created folder.
             InventoryFolderBase folder1Post = null;
             foreach (InventoryFolderBase folder in folder1PostCandidates)
@@ -311,11 +311,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             }
 //            Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
 
-            List<InventoryFolderBase> folder2PostCandidates 
+            List<InventoryFolderBase> folder2PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1Post, "b");
             Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
         }
-        
+
         /// <summary>
         /// Test replication of a partly existing archive path to the user's inventory.  This should create
         /// a merged path.
@@ -325,33 +325,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             string folder1ExistingName = "a";
             string folder2Name = "b";
-            
-            InventoryFolderBase folder1 
+
+            InventoryFolderBase folder1
                 = UserInventoryHelpers.CreateInventoryFolder(
                     scene.InventoryService, ua1.PrincipalID, folder1ExistingName, false);
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-            
+
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
             new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true)
                 .ReplicateArchivePathToUserInventory(
-                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
 
-            List<InventoryFolderBase> folder1PostCandidates 
+            List<InventoryFolderBase> folder1PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
             Assert.That(folder1PostCandidates.Count, Is.EqualTo(1));
             Assert.That(folder1PostCandidates[0].ID, Is.EqualTo(folder1.ID));
 
-            List<InventoryFolderBase> folder2PostCandidates 
+            List<InventoryFolderBase> folder2PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1PostCandidates[0], "b");
             Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
index 57b4f80..d0bdc91 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
     [TestFixture]
     public class InventoryArchiveLoadTests : InventoryArchiveTestCase
-    {               
+    {
         protected TestScene m_scene;
         protected InventoryArchiverModule m_archiverModule;
 
@@ -55,12 +55,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public override void SetUp()
         {
             base.SetUp();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
+            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
         }
 
         [Test]
@@ -68,35 +68,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
-            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
-            
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);
+
             InventoryItemBase coaItem
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
-            
-            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");            
-            
+
+            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");
+
             string assetXml = AssetHelpers.ReadAssetAsString(m_scene.AssetService, coaItem.AssetID);
-            
-            CoalescedSceneObjects coa;            
+
+            CoalescedSceneObjects coa;
             bool readResult = CoalescedSceneObjectsSerializer.TryFromXml(assetXml, out coa);
-            
+
             Assert.That(readResult, Is.True);
             Assert.That(coa.Count, Is.EqualTo(2));
-            
+
             List<SceneObjectGroup> coaObjects = coa.Objects;
             Assert.That(coaObjects[0].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000120")));
             Assert.That(coaObjects[0].AbsolutePosition, Is.EqualTo(new Vector3(15, 30, 45)));
-            
+
             Assert.That(coaObjects[1].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000140")));
-            Assert.That(coaObjects[1].AbsolutePosition, Is.EqualTo(new Vector3(25, 50, 75)));            
-        }   
+            Assert.That(coaObjects[1].AbsolutePosition, Is.EqualTo(new Vector3(25, 50, 75)));
+        }
 
         /// <summary>
         /// Test case where a creator account exists for the creator UUID embedded in item metadata and serialized
         /// objects.
-        /// </summary>        
+        /// </summary>
         [Test]
         public void TestLoadIarCreatorAccountPresent()
         {
@@ -105,26 +105,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
 
-            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);            
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_item1Name);
 
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaLL1.PrincipalID.ToString()), 
-                "Loaded item non-uuid creator doesn't match original");            
+                foundItem1.CreatorId, Is.EqualTo(m_uaLL1.PrincipalID.ToString()),
+                "Loaded item non-uuid creator doesn't match original");
             Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL1.PrincipalID), 
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL1.PrincipalID),
                 "Loaded item uuid creator doesn't match original");
             Assert.That(foundItem1.Owner, Is.EqualTo(m_uaLL1.PrincipalID),
                 "Loaded item owner doesn't match inventory reciever");
-            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+
+            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
             string xmlData = Utils.BytesToString(asset1.Data);
             SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));            
+
+            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));
         }
-        
+
 //        /// <summary>
 //        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
 //        /// an account exists with the same name as the creator, though not the same id.
@@ -137,24 +137,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
-//            
-//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+//
+//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
 //            InventoryItemBase foundItem1
 //                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
 //
 //            Assert.That(
-//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
-//                "Loaded item non-uuid creator doesn't match original");            
+//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()),
+//                "Loaded item non-uuid creator doesn't match original");
 //            Assert.That(
-//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
+//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID),
 //                "Loaded item uuid creator doesn't match original");
 //            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
 //                "Loaded item owner doesn't match inventory reciever");
-//            
-//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+//
+//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
 //            string xmlData = Utils.BytesToString(asset1.Data);
 //            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-//            
+//
 //            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
 //        }
 
@@ -167,26 +167,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");
             m_archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()), 
+                foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()),
                 "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID), 
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID),
                 "Loaded item uuid creator doesn't match that of the loading user");
-            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+
+            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
             string xmlData = Utils.BytesToString(asset1.Data);
             SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));            
+
+            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index 7265405..bd112b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -50,19 +50,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     {
         protected TestScene m_scene;
         protected InventoryArchiverModule m_archiverModule;
-            
+
         [SetUp]
         public override void SetUp()
         {
             base.SetUp();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
+            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
         }
-        
+
         /// <summary>
         /// Test that the IAR has the required files in the right order.
         /// </summary>
@@ -73,20 +73,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public void TestOrder()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();            
-            
+//            log4net.Config.XmlConfigurator.Configure();
+
             MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes);
-            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);            
+            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
-            
+
             InventoryArchiveReadRequest iarr
                 = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false);
             iarr.LoadControlFile(filePath, data);
-            
+
             Assert.That(iarr.ControlFileLoaded, Is.True);
         }
 
@@ -119,22 +119,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            InventoryArchiveUtils.
             bool gotObjectsFolder = false;
 
-            string objectsFolderName 
+            string objectsFolderName
                 = string.Format(
-                    "{0}{1}", 
-                    ArchiveConstants.INVENTORY_PATH, 
+                    "{0}{1}",
+                    ArchiveConstants.INVENTORY_PATH,
                     InventoryArchiveWriteRequest.CreateArchiveFolderName(
                         UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, userId, "Objects")));
 
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
 //                Console.WriteLine("Got {0}", filePath);
 
                 // Lazily, we only bother to look for the system objects folder created when we call CreateUserWithInventory()
-                // XXX: But really we need to stop all that stuff being created in tests or check for such folders 
+                // XXX: But really we need to stop all that stuff being created in tests or check for such folders
                 // more thoroughly
                 if (filePath == objectsFolderName)
                     gotObjectsFolder = true;
@@ -157,19 +157,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
 
             // Create base folder
-            InventoryFolderBase f1 
+            InventoryFolderBase f1
                 = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1", true);
-            
+
             // Create item1
-            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5);         
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5);
             InventoryItemBase i1 = UserInventoryHelpers.AddInventoryItem(m_scene, so1, 0x50, 0x60, "f1");
 
             // Create embedded folder
-            InventoryFolderBase f1_1 
+            InventoryFolderBase f1_1
                 = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1/f1.1", true);
 
             // Create embedded item
-            SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6);         
+            SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6);
             InventoryItemBase i2 = UserInventoryHelpers.AddInventoryItem(m_scene, so1_1, 0x500, 0x600, "f1/f1.1");
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -188,18 +188,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            InventoryArchiveUtils.
             bool gotf1 = false, gotf1_1 = false, gotso1 = false, gotso2 = false;
 
-            string f1FileName 
+            string f1FileName
                 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1));
-            string f1_1FileName 
+            string f1_1FileName
                 = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1_1));
-            string so1FileName 
+            string so1FileName
                 = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i1));
             string so2FileName
                 = string.Format("{0}{1}", f1_1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i2));
 
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
 //                Console.WriteLine("Got {0}", filePath);
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             // TODO: Test presence of more files and contents of files.
         }
-        
+
         /// <summary>
         /// Test saving a single inventory item to an IAR
         /// (subject to change since there is no fixed format yet).
@@ -239,10 +239,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userPassword = "troll";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
             UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
-            
+
             // Create asset
             UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             m_scene.AddInventoryItem(item1);
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TarArchiveReader.TarEntryType tarEntryType;
 
 //            Console.WriteLine("Reading archive");
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 Console.WriteLine("Got {0}", filePath);
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //                {
 //                    gotControlFile = true;
 //                }
-                
+
                 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
                 {
 //                    string fileName = filePath.Remove(0, "Objects/".Length);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 519c697..0b65829 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -49,35 +49,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     public class InventoryArchiveTestCase : OpenSimTestCase
     {
         protected ManualResetEvent mre = new ManualResetEvent(false);
-        
+
         /// <summary>
         /// A raw array of bytes that we'll use to create an IAR memory stream suitable for isolated use in each test.
         /// </summary>
         protected byte[] m_iarStreamBytes;
-                
+
         /// <summary>
         /// Stream of data representing a common IAR for load tests.
         /// </summary>
         protected MemoryStream m_iarStream;
-        
-        protected UserAccount m_uaMT 
-            = new UserAccount { 
+
+        protected UserAccount m_uaMT
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"),
                 FirstName = "Mr",
                 LastName = "Tiddles" };
-        
+
         protected UserAccount m_uaLL1
-            = new UserAccount { 
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"),
                 FirstName = "Lord",
-                LastName = "Lucan" }; 
-        
+                LastName = "Lucan" };
+
         protected UserAccount m_uaLL2
-            = new UserAccount { 
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000777"),
                 FirstName = "Lord",
-                LastName = "Lucan" };       
-        
+                LastName = "Lucan" };
+
         protected string m_item1Name = "Ray Gun Item";
         protected string m_coaItemName = "Coalesced Item";
 
@@ -105,72 +105,72 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             base.SetUp();
             m_iarStream = new MemoryStream(m_iarStreamBytes);
         }
-        
+
         protected void ConstructDefaultIarBytesForTestLoad()
         {
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
             Scene scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(scene, archiverModule);            
-            
+            SceneHelpers.SetupSceneModules(scene, archiverModule);
+
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
 
             MemoryStream archiveWriteStream = new MemoryStream();
-            
+
             // Create scene object asset
             UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
-            scene.AssetService.Store(asset1);            
+            scene.AssetService.Store(asset1);
 
             // Create scene object item
             InventoryItemBase item1 = new InventoryItemBase();
             item1.Name = m_item1Name;
-            item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");            
+            item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");
             item1.AssetID = asset1.FullID;
             item1.GroupID = UUID.Random();
             item1.CreatorId = m_uaLL1.PrincipalID.ToString();
             item1.Owner = m_uaLL1.PrincipalID;
-            item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
+            item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
             scene.AddInventoryItem(item1);
-            
+
             // Create coalesced objects asset
             SceneObjectGroup cobj1 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object1", 0x120);
             cobj1.AbsolutePosition = new Vector3(15, 30, 45);
-            
+
             SceneObjectGroup cobj2 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object2", 0x140);
-            cobj2.AbsolutePosition = new Vector3(25, 50, 75);               
-            
+            cobj2.AbsolutePosition = new Vector3(25, 50, 75);
+
             CoalescedSceneObjects coa = new CoalescedSceneObjects(m_uaLL1.PrincipalID, cobj1, cobj2);
-            
+
             AssetBase coaAsset = AssetHelpers.CreateAsset(0x160, coa);
-            scene.AssetService.Store(coaAsset);            
-            
+            scene.AssetService.Store(coaAsset);
+
             // Create coalesced objects inventory item
             InventoryItemBase coaItem = new InventoryItemBase();
             coaItem.Name = m_coaItemName;
-            coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");            
+            coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");
             coaItem.AssetID = coaAsset.FullID;
             coaItem.GroupID = UUID.Random();
             coaItem.CreatorId = m_uaLL1.PrincipalID.ToString();
             coaItem.Owner = m_uaLL1.PrincipalID;
-            coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
-            scene.AddInventoryItem(coaItem);            
-            
+            coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
+            scene.AddInventoryItem(coaItem);
+
             archiverModule.ArchiveInventory(
-                UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);            
-            
+                UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);
+
             m_iarStreamBytes = archiveWriteStream.ToArray();
         }
-        
+
         protected void SaveCompleted(
-            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
             Exception reportedException, int SaveCount, int FilterCount)
         {
             mre.Set();
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 46da5a9..5d7f25c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -149,10 +149,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
 //            m_log.DebugFormat(
-//                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", 
+//                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}",
 //                (InstantMessageDialog)im.dialog, client.Name,
 //                im.fromAgentID, im.fromAgentName, im.toAgentID);
-          
+
             Scene scene = FindClientScene(client.AgentId);
 
             if (scene == null) // Something seriously wrong here.
@@ -164,31 +164,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
                 ScenePresence user = scene.GetScenePresence(recipientID);
                 UUID copyID;
 
                 // First byte is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
-                    
+
                     m_log.DebugFormat(
                         "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory",
                         folderID, new UUID(im.toAgentID));
-                    
+
                     InventoryFolderBase folderCopy
                         = scene.GiveInventoryFolder(client, recipientID, client.AgentId, folderID, UUID.Zero);
-                    
+
                     if (folderCopy == null)
                     {
                         client.SendAgentAlertMessage("Can't find folder to give. Nothing given.", false);
                         return;
                     }
-                                                           
+
                     // The outgoing binary bucket should contain only the byte which signals an asset folder is
                     // being copied and the following bytes for the copied folder's UUID
                     copyID = folderCopy.ID;
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.binaryBucket = new byte[1 + copyIDBytes.Length];
                     im.binaryBucket[0] = (byte)AssetType.Folder;
                     Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
-                    
+
                     if (user != null)
                         user.ControllingClient.SendBulkUpdateInventory(folderCopy);
 
@@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         client.SendAgentAlertMessage(message, false);
                         return;
                     }
-                    
+
                     copyID = itemCopy.ID;
                     Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);
-                    
+
                     if (user != null)
                         user.ControllingClient.SendBulkUpdateInventory(itemCopy);
 
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 else
                 {
                     if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) 
+                        m_TransferModule.SendInstantMessage(im, delegate(bool success)
                         {
                             if (!success)
                                 client.SendAlertMessage("User not online. Inventory has been saved");
@@ -308,8 +308,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             }
 
             // XXX: This code was placed here to try and accomodate RLV which moves given folders named #RLV/~<name>
-            // to the requested folder, which in this case is #RLV.  However, it is the viewer that appears to be 
-            // response from renaming the #RLV/~example folder to ~example.  For some reason this is not yet 
+            // to the requested folder, which in this case is #RLV.  However, it is the viewer that appears to be
+            // response from renaming the #RLV/~example folder to ~example.  For some reason this is not yet
             // happening, possibly because we are not sending the correct inventory update messages with the correct
             // transaction IDs
             else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID);
                 InventoryFolderBase folder = null;
                 UUID? previousParentFolderID = null;
-                
+
                 if (item != null && trashFolder != null)
                 {
                     previousParentFolderID = item.Folder;
@@ -404,18 +404,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         client.SendBulkUpdateInventory(folder);
                     }
                 }
-                
+
                 if ((null == item && null == folder) | null == trashFolder)
                 {
                     string reason = String.Empty;
-                    
+
                     if (trashFolder == null)
                         reason += " Trash folder not found.";
                     if (item == null)
                         reason += " Item not found.";
                     if (folder == null)
                         reason += " Folder not found.";
-                    
+
                     client.SendAgentAlertMessage("Unable to delete "+
                             "received inventory" + reason, false);
                 }
@@ -471,12 +471,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             {
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
 
                 // First byte is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
@@ -505,12 +505,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             {
                 if (im.binaryBucket.Length < 1) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
 
                 // Bucket is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.imSessionID);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
index 7ddc396..82ed091 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -44,9 +44,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
 {
     [TestFixture]
     public class InventoryTransferModuleTests : OpenSimTestCase
-    {    
-        protected TestScene m_scene;       
-            
+    {
+        protected TestScene m_scene;
+
         [SetUp]
         public override void SetUp()
         {
@@ -56,9 +56,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             config.AddConfig("Messaging");
             config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
 
-            m_scene = new SceneHelpers().SetupScene();            
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, new InventoryTransferModule());
-        } 
+        }
 
         [Test]
         public void TestAcceptGivenItem()
@@ -69,9 +69,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID itemId = TestHelpers.ParseTail(0x100);
             UUID assetId = TestHelpers.ParseTail(0x200);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the object to test give
-            InventoryItemBase originalItem 
+            InventoryItemBase originalItem
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
 
@@ -89,35 +89,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = itemId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
-            GridInstantMessage acceptIm 
+            // These details might not all be correct.
+            GridInstantMessage acceptIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryAccepted,
                     false,
-                    "inventory accepted msg", 
+                    "inventory accepted msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Objects/givenObj");
 
             Assert.That(receivedItem, Is.Not.Null);
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterDelete, Is.Not.Null);
 
             // TODO: Test scenario where giver deletes their item first.
-        }       
+        }
 
         /// <summary>
         /// Test user rejection of a given item.
@@ -165,9 +165,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID itemId = TestHelpers.ParseTail(0x100);
             UUID assetId = TestHelpers.ParseTail(0x200);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the object to test give
-            InventoryItemBase originalItem 
+            InventoryItemBase originalItem
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
 
@@ -188,36 +188,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = itemId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
+            // These details might not all be correct.
             // Session ID is now the created item ID (!)
-            GridInstantMessage rejectIm 
+            GridInstantMessage rejectIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryDeclined,
                     false,
-                    "inventory declined msg", 
+                    "inventory declined msg",
                     new UUID(receivedIm.imSessionID),
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj");
 
             InventoryFolderBase trashFolder
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
 
             Assert.That(originalItemAfterDelete, Is.Not.Null);
-        }  
+        }
 
         [Test]
         public void TestAcceptGivenFolder()
@@ -261,9 +261,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID initialSessionId = TestHelpers.ParseTail(0x10);
             UUID folderId = TestHelpers.ParseTail(0x100);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
-            InventoryFolderBase originalFolder 
+            InventoryFolderBase originalFolder
                 = UserInventoryHelpers.CreateInventoryFolder(
                     m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
 
@@ -281,35 +281,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = folderId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
-            GridInstantMessage acceptIm 
+            // These details might not all be correct.
+            GridInstantMessage acceptIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryAccepted,
                     false,
-                    "inventory accepted msg", 
+                    "inventory accepted msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryFolderBase receivedFolder 
+            InventoryFolderBase receivedFolder
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "f1");
 
             Assert.That(receivedFolder, Is.Not.Null);
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterDelete, Is.Not.Null);
 
             // TODO: Test scenario where giver deletes their item first.
-        }       
+        }
 
         /// <summary>
         /// Test user rejection of a given item.
@@ -357,9 +357,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID initialSessionId = TestHelpers.ParseTail(0x10);
             UUID folderId = TestHelpers.ParseTail(0x100);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the folder to test give
-            InventoryFolderBase originalFolder 
+            InventoryFolderBase originalFolder
                 = UserInventoryHelpers.CreateInventoryFolder(
                     m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
 
@@ -381,36 +381,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = folderId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
+            // These details might not all be correct.
             // Session ID is now the created item ID (!)
-            GridInstantMessage rejectIm 
+            GridInstantMessage rejectIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryDeclined,
                     false,
-                    "inventory declined msg", 
+                    "inventory declined msg",
                     new UUID(receivedIm.imSessionID),
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -426,7 +426,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
 
             // Test for folder successfully making it into the receiver's inventory
-            InventoryFolderBase receivedFolder 
+            InventoryFolderBase receivedFolder
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1");
 
             InventoryFolderBase trashFolder
@@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
 
             Assert.That(originalFolderAfterDelete, Is.Not.Null);
-        }  
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 24286a4..10781e9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                 {
                     m_Enabled = true;
 
-                    m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 
+                    m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                         new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty);
                     // Legacy. Remove soon!
                     m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         void OnIncomingInstantMessage(GridInstantMessage im)
         {
-            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport 
+            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport
                 || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport)
             {
                 UUID sessionID = new UUID(im.imSessionID);
@@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
             m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message);
             m_PendingLures.Add(sessionID, m, 7200); // 2 hours
-                    
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index 0b1dbc7..1e1caca 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
         {
             if (!m_Enabled)
                 return;
-            
+
             lock (m_Scenes)
             {
                 if (!m_Scenes.Contains(scene))
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index df5265c..138c0f7 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// The configuration
         /// </value>
-        public IConfigSource Config 
+        public IConfigSource Config
         {
             get;
             set;
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// The profile server URI.
         /// </value>
-        public string ProfileServerUri 
+        public string ProfileServerUri
         {
             get;
             set;
@@ -120,13 +120,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// <c>true</c> if enabled; otherwise, <c>false</c>.
         /// </value>
-        public bool Enabled 
+        public bool Enabled
         {
             get;
             set;
         }
 
-        public string MyGatekeeper 
+        public string MyGatekeeper
         {
             get; private set;
         }
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <summary>
         ///  This is called to initialize the region module. For shared modules, this is called exactly once, after
         /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after
-        /// the instace for the region has been created. 
+        /// the instace for the region has been created.
         /// </summary>
         /// <param name='source'>
         /// Source.
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 Enabled = false;
                 return;
             }
-            
+
             m_allowUserProfileWebURLs = profileConfig.GetBoolean("AllowUserProfileWebURLs", m_allowUserProfileWebURLs);
 
             m_log.Debug("[PROFILES]: Full Profiles Enabled");
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         ///  This will be called once for every scene loaded. In a shared module this will be multiple times in one
         /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion
         /// has been called in all modules for that scene, providing an opportunity to request another module's
-        /// interface, or hook an event from another module. 
+        /// interface, or hook an event from another module.
         /// </summary>
         /// <param name='scene'>
         /// Scene.
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// module has registered the interface by then, this module will be activated, else it will remain inactive,
         /// letting the other module take over. This should return non-null ONLY in modules that are intended to be
         /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party
-        /// provided modules. 
+        /// provided modules.
         /// </summary>
         /// <value>
         /// The replaceable interface.
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         }
 
         /// <value>
-        ///  The name of the module 
+        ///  The name of the module
         /// </value>
         /// <summary>
         /// Gets the module name.
@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         }
 
         public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient)
-        {    
+        {
             UUID target = remoteClient.AgentId;
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
@@ -459,7 +459,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             lock (m_classifiedCache)
             {
                 if (m_classifiedCache.ContainsKey(queryClassifiedID))
-                {   
+                {
                     target = m_classifiedCache[queryClassifiedID];
 
                     m_classifiedInterest[queryClassifiedID] --;
@@ -870,7 +870,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             string theirGatekeeperURI;
             GetUserGatekeeperURI(targetID, out theirGatekeeperURI);
-                
+
             object Pick = (object)pick;
             if (!rpc.JsonRpcRequest (ref Pick, "pickinforequest", serverURI, UUID.Random ().ToString ())) {
                 remoteClient.SendAgentAlertMessage (
@@ -880,11 +880,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             pick = (UserProfilePick)Pick;
             if(foreign)
                 cacheForeignImage(targetID, pick.SnapshotId);
-            
+
             Vector3 globalPos = new Vector3(Vector3.Zero);
             Vector3.TryParse(pick.GlobalPos, out globalPos);
-            
-            if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper) 
+
+            if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper)
             {
                 // Setup the illusion
                 string region = string.Format("{0} {1}",pick.Gatekeeper,pick.SimName);
@@ -896,7 +896,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 }
                 else
                 {
-                    // we have a proxy on map 
+                    // we have a proxy on map
                     ulong oriHandle;
                     uint oriX;
                     uint oriY;
@@ -909,7 +909,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     }
                     else
                     {
-                        // this is a fail on large regions                  
+                        // this is a fail on large regions
                         uint gtmp = (uint)globalPos.X >> 8;
                         globalPos.X -= (gtmp << 8);
 
@@ -975,7 +975,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// Enabled.
         /// </param>
         public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled)
-        {        
+        {
             m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
 
             UserProfilePick pick = new UserProfilePick();
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             else
             {
                 m_log.WarnFormat(
-                    "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}", 
+                    "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}",
                     avaPos.X, avaPos.Y, p.Scene.Name);
             }
 
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
                 return;
             }
-            note = (UserProfileNotes) Note;               
+            note = (UserProfileNotes) Note;
             remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
         }
 
@@ -1225,10 +1225,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             {
                 m_log.InfoFormat("[PROFILES]: UserPreferences update error");
                 remoteClient.SendAgentAlertMessage("Error updating preferences", false);
-                return;   
+                return;
             }
         }
-        
+
         /// <summary>
         /// Users the preferences request.
         /// </summary>
@@ -1256,7 +1256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             pref = (UserPreferences) Pref;
 
             remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
-       
+
         }
         #endregion User Preferences
 
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             {
                 props.AboutText ="Profile not available at this time. User may still be unknown to this grid";
             }
-            
+
             if(!m_allowUserProfileWebURLs)
                 props.WebUrl ="";
 
@@ -1568,7 +1568,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     {
                         m_log.Debug(
                             string.Format(
-                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed", 
+                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed",
                                 properties.UserId, serverURI),
                             e);
 
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     return false;
                 }
             }
-                      
+
             properties = (UserProfileProperties)Prop;
             if(foreign)
             {
@@ -1704,7 +1704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         {
             bool local;
             local = UserManagementModule.IsLocalGridUser(userID);
-            
+
             if (!local)
             {
                 serverURI = UserManagementModule.GetUserServerURL(userID, "GatekeeperURI");
@@ -1761,13 +1761,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             string imageIDstr = imageID.ToString();
 
-            
+
             if(m_assetCache != null && m_assetCache.Check(imageIDstr))
                 return;
 
             if(Scene.AssetService.Get(imageIDstr) != null)
                 return;
-                    
+
             Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, imageIDstr));
         }
 
@@ -1876,7 +1876,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             if (mret.ContainsKey("error"))
                 return false;
-            
+
             // get params...
             OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
             return true;
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 386694a..292099d 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -47,23 +47,23 @@ namespace OpenSim.Region.CoreModules.Framework
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")]
     public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_showCapsCommandFormat = "   {0,-38} {1,-60}\n";
-        
+
         protected Scene m_scene;
-        
+
         /// <summary>
         /// Each agent has its own capabilities handler.
         /// </summary>
         protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>();
-        
+
         protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>();
 
-        protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds 
+        protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds
             = new Dictionary<UUID, Dictionary<ulong, string>>();
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -101,16 +101,16 @@ namespace OpenSim.Region.CoreModules.Framework
         {
             m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this);
         }
-        
-        public void PostInitialise() 
+
+        public void PostInitialise()
         {
         }
 
         public void Close() {}
 
-        public string Name 
-        { 
-            get { return "Capabilities Module"; } 
+        public string Name
+        {
+            get { return "Capabilities Module"; }
         }
 
         public Type ReplaceableInterface
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework
                         // new object created below
                         oldCaps.DeregisterHandlers();
 
-                        // Better safe ... should not be needed but also 
+                        // Better safe ... should not be needed but also
                         // no big deal
                         m_capsObjects.Remove(circuitCode);
                     }
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 }
             }
         }
-        
+
         public Caps GetCapsForUser(uint circuitCode)
         {
             lock (m_capsObjects)
@@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Framework
                     return m_capsObjects[circuitCode];
                 }
             }
-            
+
             return null;
         }
-        
+
         public void ActivateCaps(uint circuitCode)
         {
             lock (m_capsObjects)
@@ -246,10 +246,10 @@ namespace OpenSim.Region.CoreModules.Framework
                 m_capsPaths[agent.AgentID] = agent.CapsPath;
 
             lock (m_childrenSeeds)
-                m_childrenSeeds[agent.AgentID] 
+                m_childrenSeeds[agent.AgentID]
                     = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
         }
-        
+
         public string GetCapsPath(UUID agentId)
         {
             lock (m_capsPaths)
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
             return null;
         }
-        
+
         public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
         {
             Dictionary<ulong, string> seeds = null;
@@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.Framework
                     {
                         receivedStats[sp.Name] = reqHandler.RequestsReceived;
                         handledStats[sp.Name] = reqHandler.RequestsHandled;
-                    }        
-                    else 
+                    }
+                    else
                     {
                         PollServiceEventArgs pollHandler = null;
                         if (caps.TryGetPollHandler(capName, out pollHandler))
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework
                     Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
 
                     if (caps == null)
-                        return;            
+                        return;
 
                     foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values)
                     {
@@ -490,7 +490,7 @@ namespace OpenSim.Region.CoreModules.Framework
                     }
                 }
             );
-                    
+
             foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value))
                 cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]);
 
@@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled));
 
             foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived))
-                cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);            
+                cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);
 
             sb.Append(cdt.ToString());
             */
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework
                         totalRequestsReceived += handler.RequestsReceived;
                         totalRequestsHandled += handler.RequestsHandled;
                     }
-                    
+
                     cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled);
                 }
             );
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
index 0c632b1..d652f43 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
@@ -53,12 +53,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
 
         protected Scene m_scene;
         protected IDialogModule m_dialogMod;
-        
-        public string Name { get { return "DAExample Module"; } }        
-        public Type ReplaceableInterface { get { return null; } }        
+
+        public string Name { get { return "DAExample Module"; } }
+        public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             if (ENABLED)
@@ -70,22 +70,22 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
                 m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name);
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             if (ENABLED)
             {
                 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
             }
         }
-        
+
         public void RegionLoaded(Scene scene) {}
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
-        
+
         protected bool OnSceneGroupMove(UUID groupId, Vector3 delta)
         {
             OSDMap attrs = null;
@@ -96,28 +96,28 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
 
             if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs))
                 attrs = new OSDMap();
-            
+
             OSDInteger newValue;
 
             // We have to lock on the entire dynamic attributes map to avoid race conditions with serialization code.
-            lock (sop.DynAttrs)            
+            lock (sop.DynAttrs)
             {
                 if (!attrs.ContainsKey("moves"))
                     newValue = new OSDInteger(1);
                 else
                     newValue = new OSDInteger(attrs["moves"].AsInteger() + 1);
-                        
+
                 attrs["moves"] = newValue;
 
                 sop.DynAttrs.SetStore(Namespace, StoreName, attrs);
             }
 
             sop.ParentGroup.HasGroupChanged = true;
-    
+
             string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue);
             m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg);
             m_dialogMod.SendGeneralAlert(msg);
-            
+
             return true;
         }
     }
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
index 166a994..3364cbc 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
         private Scene m_scene;
         private IDialogModule m_dialogMod;
 
-        public string Name { get { return "DO"; } }        
-        public Type ReplaceableInterface { get { return null; } }        
+        public string Name { get { return "DO"; } }
+        public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             if (ENABLED)
@@ -80,18 +80,18 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
                 m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>();
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             if (ENABLED)
             {
                 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
             }
         }
-        
+
         public void RegionLoaded(Scene scene) {}
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
 
             rootPart.DynObjs.Add(DAExampleModule.Namespace, Name, new MyObject(movesSoFar));
         }
-        
+
         private bool OnSceneGroupMove(UUID groupId, Vector3 delta)
         {
             SceneObjectGroup so = m_scene.GetSceneObjectGroup(groupId);
@@ -129,11 +129,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
             if (rawObj != null)
             {
                 MyObject myObj = (MyObject)rawObj;
-               
+
                 m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", so.Name, so.UUID, ++myObj.Moves));
             }
-            
+
             return true;
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 58d6cf2..6b1eb54 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -72,9 +72,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// If true then we ask the viewer to disable teleport cancellation and ignore teleport requests.
         /// </summary>
         /// <remarks>
-        /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a 
+        /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a
         /// situation where avatars can be come 'stuck' due to a failed teleport cancellation.  Unfortunately, the
-        /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport 
+        /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport
         /// cancellation consistently suceed.
         /// </remarks>
         public bool DisableInterRegionTeleportCancellation { get; set; }
@@ -221,12 +221,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             IConfig transferConfig = source.Configs["EntityTransfer"];
             if (transferConfig != null)
             {
-                DisableInterRegionTeleportCancellation 
+                DisableInterRegionTeleportCancellation
                     = transferConfig.GetBoolean("DisableInterRegionTeleportCancellation", false);
 
                 WaitForAgentArrivedAtDestination
                     = transferConfig.GetBoolean("wait_for_callback", WaitForAgentArrivedAtDestinationDefault);
-                
+
                 MaxTransferDistance = transferConfig.GetInt("max_distance", DefaultMaxTransferDistance);
             }
             else
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             Scene = scene;
 
-            m_interRegionTeleportAttempts = 
+            m_interRegionTeleportAttempts =
                 new Stat(
                     "InterRegionTeleportAttempts",
                     "Number of inter-region teleports attempted.",
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportAborts = 
+            m_interRegionTeleportAborts =
                 new Stat(
                     "InterRegionTeleportAborts",
                     "Number of inter-region teleports aborted due to client actions.",
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportCancels = 
+            m_interRegionTeleportCancels =
                 new Stat(
                     "InterRegionTeleportCancels",
                     "Number of inter-region teleports cancelled by the client.",
@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportFailures = 
+            m_interRegionTeleportFailures =
                 new Stat(
                     "InterRegionTeleportFailures",
                     "Number of inter-region teleports that failed due to server/client/network issues.",
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public virtual void Close() {}
 
-        public virtual void RemoveRegion(Scene scene) 
+        public virtual void RemoveRegion(Scene scene)
         {
             if (m_Enabled)
             {
@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", 
+                    "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout",
                     client.Name, Scene.Name);
             }
         }
@@ -672,7 +672,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.ControllingClient.SendTeleportFailed("Agent is already in transit.");
                 return;
             }
-            
+
             try
             {
                 DoTeleportInternal(sp, reg, finalDestination, position, lookAt, teleportFlags);
@@ -766,7 +766,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_interRegionTeleportAttempts.Value++;
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}", 
+                "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}",
                 sp.Scene.Name, finalDestination.RegionName, ctx.OutboundVersion, ctx.InboundVersion);
 
             // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
@@ -797,7 +797,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
             agentCircuit.startpos = position;
             agentCircuit.child = true;
-            
+
 //            agentCircuit.Appearance = sp.Appearance;
 //            agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false);
             agentCircuit.Appearance = new AvatarAppearance();
@@ -814,7 +814,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             IClientIPEndpoint ipepClient;
-       
+
             uint newRegionX, newRegionY, oldRegionX, oldRegionY;
             Util.RegionHandleToRegionLoc(destinationHandle, out newRegionX, out newRegionY);
             Util.RegionHandleToRegionLoc(sourceRegion.RegionHandle, out oldRegionX, out oldRegionY);
@@ -853,7 +853,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (ctx.OutboundVersion >= 0.2f)
                 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange , ctx, out reason);
             else
-                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason);           
+                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason);
         }
 
         private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
@@ -863,12 +863,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", 
+                "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}",
                 sp.Name, Scene.Name, finalDestination.RegionName);
 
             string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
-            // Let's create an agent there if one doesn't exist yet. 
+            // Let's create an agent there if one doesn't exist yet.
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
             if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout))
@@ -953,7 +953,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
 
-            // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to 
+            // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to
             // establish th econnection to the destination which makes it return true.
             if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
             {
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            // A common teleport failure occurs when we can send CreateAgent to the 
+            // A common teleport failure occurs when we can send CreateAgent to the
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
             // there's a further 10 second wait whilst we attempt to tell the destination to delete the agent in Fail().
@@ -1010,7 +1010,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
-            // where that neighbour simulator could otherwise request a child agent create on the source which then 
+            // where that neighbour simulator could otherwise request a child agent create on the source which then
             // closes our existing agent which is still signalled as root.
             sp.IsChildAgent = true;
 
@@ -1071,7 +1071,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentHasMovedAway(sp, logout);
 
             sp.HasMovedAway(!(OutSideViewRange || logout));
-            
+
 //            ulong sourceRegionHandle = sp.RegionHandle;
 
              // Now let's make it officially a child agent
@@ -1107,7 +1107,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);;
 
-            // Let's create an agent there if one doesn't exist yet. 
+            // Let's create an agent there if one doesn't exist yet.
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
             if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout))
@@ -1150,7 +1150,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
-            // where that neighbour simulator could otherwise request a child agent create on the source which then 
+            // where that neighbour simulator could otherwise request a child agent create on the source which then
             // closes our existing agent which is still signalled as root.
             //sp.IsChildAgent = true;
 
@@ -1166,7 +1166,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
-            // Let's send a full update of the agent. 
+            // Let's send a full update of the agent.
             AgentData agent = new AgentData();
             sp.CopyTo(agent,false);
             agent.Position = agentCircuit.startpos;
@@ -1207,7 +1207,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.IsInTransit = false;
                 return;
             }
-            
+
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
             // Need to signal neighbours whether child agents may need closing irrespective of whether this
@@ -1248,7 +1248,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //                Thread.Sleep(1000);
 
                 // OK, it got this agent. Let's close everything
-                // If we shouldn't close the agent due to some other region renewing the connection 
+                // If we shouldn't close the agent due to some other region renewing the connection
                 // then this will be handled in IncomingCloseAgent under lock conditions
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name);
@@ -1258,7 +1258,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 /*
             else
             {
-                // now we have a child agent in this region. 
+                // now we have a child agent in this region.
                 sp.Reset();
             }
  */
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </summary>
         /// <param name='sp'></param>
         /// <param name='logout'></param>
-        /// 
+        ///
         /// now just a HG hook
         protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
         {
@@ -1375,7 +1375,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         // HG Hook
         protected virtual bool NeedsClosing(GridRegion reg, bool OutViewRange)
-           
+
         {
             return OutViewRange;
         }
@@ -1399,11 +1399,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 remoteClient.SendTeleportFailed("The teleport destination could not be found.");
                 return;
             }
-            ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position, 
+            ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position,
                 Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
         }
 
-        #endregion 
+        #endregion
 
         #region Teleport Home
 
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     client.SendTeleportFailed("Your home region could not be found.");
                     return false;
                 }
-                
+
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
                     client.Name, regionInfo.RegionName, regionInfo.RegionCoordX, regionInfo.RegionCoordY);
 
@@ -1475,7 +1475,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             Scene ascene = agent.Scene;
             string homeURI = ascene.GetAgentHomeURI(agentID);
- 
+
 
             if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position,
                    agent.Scene.GetFormatsOffered(), ctx, out reason))
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         // Given a position relative to the current region and outside of it
         // find the new region that the point is actually in.
-        // returns 'null' if new region not found or if information 
+        // returns 'null' if new region not found or if information
         // and new position relative to it
         // now only works for crossings
 
@@ -1611,14 +1611,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Thread.Sleep(10000);
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}", 
+                "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",
                 agent.Name, regionX, regionY, position, initiatingScene.Name);
 
             agent.Scene.RequestTeleportLocation(
-                agent.ControllingClient, 
+                agent.ControllingClient,
                 Util.RegionGridLocToHandle(regionX, regionY),
-                position, 
-                agent.Lookat, 
+                position,
+                agent.Lookat,
                 (uint)Constants.TeleportFlags.ViaLocation);
 
             /*
@@ -1662,7 +1662,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             icon.EndInvoke(iar);
         }
 
- 
+
 
         /// <summary>
         /// This Closes child agents on neighbouring regions
@@ -1708,7 +1708,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             int ts = Util.EnvironmentTickCount();
             try
             {
-                AgentData cAgent = new AgentData(); 
+                AgentData cAgent = new AgentData();
                 agent.CopyTo(cAgent,true);
 
 //                agent.Appearance.WearableCacheItems = null;
@@ -1731,7 +1731,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
                     m_log.WarnFormat(
-                        "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.", 
+                        "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.",
                         neighbourRegion.RegionName, agent.Name);
 
                     ReInstantiateScripts(agent);
@@ -1827,7 +1827,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             return;
         }
-         
+
         private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
         {
             CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
@@ -2167,7 +2167,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return false;
                 }
             }
-            
+
             private void DoExpiration()
             {
                 List<ulong> m_toRemove = new List<ulong>();;
@@ -2179,7 +2179,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         if (kvp.Value < now)
                             m_toRemove.Add(kvp.Key);
                     }
- 
+
                     if (m_toRemove.Count > 0)
                     {
                         foreach (ulong u in m_toRemove)
@@ -2199,7 +2199,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             //    to find possible regions.
             return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize);
         }
- 
+
         // Given a world position, get the GridRegion info for
         //   the region containing that point.
         // for compatibility with old grids it does a scan to find large regions
@@ -2285,7 +2285,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (newAgent)
             {
                 // we may already had lost this sp
-                if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened 
+                if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
                    return;
 
                 Scene scene = sp.Scene;
@@ -2303,13 +2303,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (regionAccepted)
                 {
-                    // give  time for createAgent to finish, since it is async and does grid services access              
+                    // give  time for createAgent to finish, since it is async and does grid services access
                     Thread.Sleep(500);
 
                     if (m_eqModule != null)
                     {
                         #region IP Translation for NAT
-                        if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened 
+                        if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
                             return;
 
                         IClientIPEndpoint ipepClient;
@@ -2344,7 +2344,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         reg.RegionName, sp.Name, sp.UUID, reason);
                 }
             }
- 
+
         }
 
         /// <summary>
@@ -2353,7 +2353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="avatar"></param>
         /// <param name="pRegionLocX"></param>
         /// <param name="pRegionLocY"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected List<GridRegion> GetNeighbors(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
         {
             Scene pScene = avatar.Scene;
@@ -2588,7 +2588,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (Scene.RegionInfo.EstateSettings.IsBanned(so.OwnerID))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}", 
+                    "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}",
                     so.Name, so.UUID, Scene.Name, so.OwnerID);
 
                 return false;
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (!Scene.AddSceneObject(so))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ", 
+                    "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ",
                     so.Name, so.UUID, Scene.Name);
 
                 return false;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
index acfdaef..0a24555 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
                     else
                     {
-                        if (newState == AgentTransferState.Cancelling 
+                        if (newState == AgentTransferState.Cancelling
                             && (oldState == AgentTransferState.Preparing || oldState == AgentTransferState.Transferring))
                         {
                             transitionOkay = true;
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
 
                     if (!transitionOkay)
-                        failureMessage 
+                        failureMessage
                             = string.Format(
                                 "Agent with ID {0} is not allowed to move from old transit state {1} to new state {2} in {3}",
                                 id, oldState, newState, m_mod.Scene.RegionInfo.RegionName);
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_agentsInTransit[id] = newState;
 
 //                    m_log.DebugFormat(
-//                        "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", 
+//                        "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}",
 //                        id, oldState, newState, m_mod.Scene.Name);
                 }
                 else if (failIfNotOkay)
@@ -204,11 +204,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //                {
 //                    if (oldState != null)
 //                        m_log.DebugFormat(
-//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", 
+//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}",
 //                            id, oldState, newState, m_mod.Scene.Name);
 //                    else
 //                        m_log.DebugFormat(
-//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", 
+//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit",
 //                            id, newState, m_mod.Scene.Name);
 //                }
             }
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             if (!m_mod.WaitForAgentArrivedAtDestination)
                 return true;
-            
+
             lock (m_agentsInTransit)
             {
                 AgentTransferState? currentState = GetAgentTransferState(id);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index a9aaf12..4ad500a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 scene.RegisterModuleInterface<IUserAgentVerificationModule>(this);
                 //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject;
 
-                m_incomingSceneObjectEngine 
+                m_incomingSceneObjectEngine
                     = new JobEngine(
-                        string.Format("HG Incoming Scene Object Engine ({0})", scene.Name), 
+                        string.Format("HG Incoming Scene Object Engine ({0})", scene.Name),
                         "HG INCOMING SCENE OBJECT ENGINE");
 
                 StatsManager.RegisterStat(
@@ -291,7 +291,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                     GridRegion source = new GridRegion(Scene.RegionInfo);
                     source.RawServerURI = m_GatekeeperURI;
-                    
+
                     bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason);
                     logout = success; // flag for later logout from this grid; this is an HG TP
 
@@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                     break;
                                 }
 
-                            if (!found) 
+                            if (!found)
                             {
                                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
                                return false;
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //            // Rez needed npc attachments
         //            Scene.AttachmentsModule.RezAttachments(sp);
 
-                   
+
         //            IAvatarFactoryModule module = Scene.RequestModuleInterface<IAvatarFactoryModule>();
         //            //module.SendAppearance(sp.UUID);
         //            module.RequestRebake(sp, false);
@@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
-                          
+
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
@@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             // Foreign user wants to go home
-            // 
+            //
             AgentCircuitData aCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
             if (aCircuit == null || (aCircuit != null && !aCircuit.ServiceURLs.ContainsKey("HomeURI")))
             {
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_log.Debug("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e);
             }
-            
+
             if (finalDestination == null)
             {
                 client.SendTeleportFailed("Your home region could not be found");
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
-            
+
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="position"></param>
         public override void RequestTeleportLandmark(IClientAPI remoteClient, AssetLandmark lm)
         {
-            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}", 
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}",
                 (lm.Gatekeeper == string.Empty) ? "local" : lm.Gatekeeper, lm.RegionID, lm.Position);
 
             if (lm.Gatekeeper == string.Empty)
@@ -521,7 +521,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     remoteClient, info.RegionHandle, lm.Position,
                     Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
             }
-            else 
+            else
             {
                 // Foreign region
                 GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
@@ -581,7 +581,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 jobsRemoved, commonIdToRemove, jobsToReinsert.Count);
 
             if (jobsToReinsert.Count > 0)
-            {                                        
+            {
                 foreach (JobEngine.Job jobToReinsert in jobsToReinsert)
                     m_incomingSceneObjectEngine.QueueJob(jobToReinsert);
             }
@@ -611,16 +611,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
                     {
                         m_incomingSceneObjectEngine.QueueJob(
-                            string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name), 
-                            () => 
+                            string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name),
+                            () =>
                             {
                                 string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
     //                            m_log.DebugFormat(
-    //                                "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", 
+    //                                "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}",
     //                                so.Name, so.AttachedAvatar, url);
 
                                 IDictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
-                                HGUuidGatherer uuidGatherer 
+                                HGUuidGatherer uuidGatherer
                                     = new HGUuidGatherer(Scene.AssetService, url, ids);
                                 uuidGatherer.AddForInspection(so);
 
@@ -646,7 +646,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                         RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
 
                                         return;
-                                    }                                                           
+                                    }
                                 }
 
     //                            m_log.DebugFormat(
@@ -657,7 +657,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                 {
                                     int tickStart = Util.EnvironmentTickCount();
 
-                                    uuidGatherer.FetchAsset(kvp.Key);   
+                                    uuidGatherer.FetchAsset(kvp.Key);
 
                                     int ticksElapsed = Util.EnvironmentTickCountSubtract(tickStart);
 
@@ -670,15 +670,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                         RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
 
                                         return;
-                                    }   
+                                    }
                                 }
 
                                 base.HandleIncomingSceneObject(so, newPosition);
 
     //                            m_log.DebugFormat(
-    //                                "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}", 
+    //                                "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}",
     //                                so.Name, so.OwnerID, url);
-                            },                             
+                            },
                             so.OwnerID.ToString());
                     }
                 }
@@ -698,7 +698,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
                 return security.VerifyClient(aCircuit.SessionID, token);
-            } 
+            }
             else
             {
                 m_log.DebugFormat(
@@ -746,7 +746,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion region = new GridRegion();
 
             Uri uri = null;
-            if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") || 
+            if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") ||
                 (aCircuit.ServiceURLs.ContainsKey("HomeURI") && !Uri.TryCreate(aCircuit.ServiceURLs["HomeURI"].ToString(), UriKind.Absolute, out uri)))
                 return null;
 
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index b5a4005..63dbb19 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -41,34 +41,34 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
     public class Commander : ICommander
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         /// <value>
         /// Used in runtime class generation
         /// </summary>
         private string m_generatedApiClassName;
-        
+
         public string Name
         {
             get { return m_name; }
         }
         private string m_name;
-        
+
         public string Help
         {
             get
             {
                 StringBuilder sb = new StringBuilder();
-                
+
                 sb.AppendLine("=== " + m_name + " ===");
-                
+
                 foreach (ICommand com in m_commands.Values)
                 {
                     sb.AppendLine("* " + Name + " " + com.Name + " - " + com.Help);
                 }
-                
+
                 return sb.ToString();
             }
-        }        
+        }
 
         /// <summary>
         /// Constructor
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
         {
             m_name = name;
             m_generatedApiClassName = m_name[0].ToString().ToUpper();
-            
+
             if (m_name.Length > 1)
                 m_generatedApiClassName += m_name.Substring(1);
         }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
         {
             get { return m_commands; }
         }
-        private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();        
+        private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();
 
         #region ICommander Members
 
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
                 {
                     if (function != "help")
                         Console.WriteLine("ERROR: Invalid command - No such command exists");
-                    
+
                     Console.Write(Help);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index f54298c..51ae217 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             {
                 UUID uuid = UUID.Zero;
                 UUID.TryParse(meta.CreatorID, out uuid);
-                UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid); 
+                UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
                 if (creator != null)
                     meta.CreatorID = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
             }
@@ -300,8 +300,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         {
                             m_log.Error(
                                 string.Format(
-                                    "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception  ", 
-                                    asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL), 
+                                    "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception  ",
+                                    asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL),
                                 e);
 
                             // For debugging purposes for now we will continue to throw the exception up the stack as was already happening.  However, after
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 else
                 {
                     m_log.DebugFormat(
-                        "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}", 
+                        "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}",
                         uuid, assetID, userAssetURL);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 4d7c25b..f89e446 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -91,9 +91,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (name == Name)
                 {
                     m_Enabled = true;
-                    
+
                     InitialiseCommon(source);
-                        
+
                     m_log.InfoFormat("[HG INVENTORY ACCESS MODULE]: {0} enabled.", Name);
 
                     IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
 
                     m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions",
-                                            new string[] { "Startup", "Permissions" }, true); 
+                                            new string[] { "Startup", "Permissions" }, true);
 
                 }
             }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         }
 
 
-        /// 
+        ///
         /// CapsUpdateInventoryItemAsset
         ///
         public override UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
@@ -268,7 +268,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return newAssetID;
         }
 
-        /// 
+        ///
         /// UpdateInventoryItemAsset
         ///
         public override bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
@@ -317,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     RezSelected, RemoveItem, fromTaskID, attachment);
         }
 
-        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, 
+        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID,
                             UUID groupID, Vector3 RayEnd, Vector3 RayStart,
                             UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
@@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (!m_CheckSeparateAssets)
                 {
                     if (!UserManagementModule.IsLocalGridUser(userID))
-                    { // foreign 
+                    { // foreign
                         ScenePresence sp = null;
                         if (m_Scene.TryGetScenePresence(userID, out sp))
                         {
@@ -524,7 +524,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         foreach (InventoryItemBase it in content.Items)
                             it.Name = it.Name + " (Unavailable)"; ;
 
-                        // Send the new names 
+                        // Send the new names
                         inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray());
 
                     }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 771e5fe..fcf373b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 return m_UserManagement;
             }
         }
-        
+
         public bool CoalesceMultipleObjectsToInventory { get; set; }
 
         #region INonSharedRegionModule
@@ -92,14 +92,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (name == Name)
                 {
                     m_Enabled = true;
-                    
+
                     InitialiseCommon(source);
-                        
-                    m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name);                                        
+
+                    m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name);
                 }
             }
         }
-        
+
         /// <summary>
         /// Common module config for both this and descendant classes.
         /// </summary>
@@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected virtual void InitialiseCommon(IConfigSource source)
         {
             IConfig inventoryConfig = source.Configs["Inventory"];
-            
+
             if (inventoryConfig != null)
-                CoalesceMultipleObjectsToInventory 
+                CoalesceMultipleObjectsToInventory
                     = inventoryConfig.GetBoolean("CoalesceMultipleObjectsToInventory", true);
             else
                 CoalesceMultipleObjectsToInventory = true;
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (item != null && item.Owner == ownerID && asset != null)
             {
 //                m_log.DebugFormat(
-//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", 
+//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}",
 //                    item.Name, item.ID, asset.ID);
 
                 item.AssetID = asset.FullID;
@@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             List<InventoryItemBase> copiedItems = new List<InventoryItemBase>();
 
             Dictionary<UUID, List<SceneObjectGroup>> bundlesToCopy = new Dictionary<UUID, List<SceneObjectGroup>>();
-            
+
             if (CoalesceMultipleObjectsToInventory)
             {
                 // The following code groups the SOG's by owner. No objects
@@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     if (!bundlesToCopy.ContainsKey(g.OwnerID))
                         bundlesToCopy[g.OwnerID] = new List<SceneObjectGroup>();
-    
+
                     bundlesToCopy[g.OwnerID].Add(g);
                 }
             }
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     List<SceneObjectGroup> bundle = new List<SceneObjectGroup>();
                     bundle.Add(g);
-                    bundlesToCopy[g.UUID] = bundle;                    
+                    bundlesToCopy[g.UUID] = bundle;
                 }
             }
 
@@ -384,10 +384,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // with distinct destinations as well.
             foreach (List<SceneObjectGroup> bundle in bundlesToCopy.Values)
                 copiedItems.Add(CopyBundleToInventory(action, folderID, bundle, remoteClient, asAttachment));
-            
+
             return copiedItems;
         }
-        
+
         /// <summary>
         /// Copy a bundle of objects to inventory.  If there is only one object, then this will create an object
         /// item.  If there are multiple objects then these will be saved as a single coalesced item.
@@ -408,7 +408,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             Dictionary<UUID, Quaternion> originalRotations = new Dictionary<UUID, Quaternion>();
             // this possible is not needed if keyframes are saved
             Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
- 
+
             foreach (SceneObjectGroup objectGroup in objlist)
             {
                 if (objectGroup.RootPart.KeyframeMotion != null)
@@ -457,7 +457,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                          (uint)PermissionMask.Export);
                 objectGroup.RootPart.NextOwnerMask |=
                         (uint)PermissionMask.Move;
-                
+
                 coa.Add(objectGroup);
             }
 
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 itemXml = CoalescedSceneObjectsSerializer.ToXml(coa, !asAttachment);
             else
                 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
-            
+
             // Restore the position of each group now that it has been stored to inventory.
             foreach (SceneObjectGroup objectGroup in objlist)
             {
@@ -493,11 +493,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
             item.CreatorData = objlist[0].RootPart.CreatorData;
-                            
+
             if (objlist.Count > 1)
             {
                 item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
-                
+
                 // If the objects have different creators then don't specify a creator at all
                 foreach (SceneObjectGroup objectGroup in objlist)
                 {
@@ -513,8 +513,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             else
             {
                 item.SaleType = objlist[0].RootPart.ObjectSaleType;
-                item.SalePrice = objlist[0].RootPart.SalePrice;                    
-            }              
+                item.SalePrice = objlist[0].RootPart.SalePrice;
+            }
 
             AssetBase asset = CreateAsset(
                 objlist[0].GetPartName(objlist[0].RootPart.LocalId),
@@ -523,7 +523,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 Utils.StringToBytes(itemXml),
                 objlist[0].OwnerID.ToString());
             m_Scene.AssetService.Store(asset);
-            
+
             item.AssetID = asset.FullID;
 
             if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -562,7 +562,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // This is a hook to do some per-asset post-processing for subclasses that need that
             if (remoteClient != null && action != DeRezAction.Delete)
                 ExportAsset(remoteClient.AgentId, asset.FullID);
-            
+
             return item;
         }
 
@@ -580,7 +580,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="remoteClient"></param>
         /// <returns></returns>
         protected InventoryItemBase AddPermissions(
-            InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, 
+            InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions,
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7;
@@ -614,7 +614,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 item.NextPermissions = perms & so.RootPart.NextOwnerMask;
                 item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
                 item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
-                
+
                 // apply next owner perms on rez
                 item.CurrentPermissions |= SceneObjectGroup.SLAM;
             }
@@ -642,11 +642,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                          7); // Preserve folded permissions
             }
 
-            //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);            
+            //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);
 
             return item;
         }
-        
+
         /// <summary>
         /// Create an item using details for the given scene object.
         /// </summary>
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID)
         {
 //            m_log.DebugFormat(
-//                "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", 
+//                "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}",
 //                so.Name, so.UUID, folderID, action);
 //
             // Get the user info of the item destination
@@ -707,7 +707,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // Delete is treated like return in this case
             // Deleting your own items makes them go to trash
             //
-            
+
             InventoryFolderBase folder = null;
             InventoryItemBase item = null;
 
@@ -723,7 +723,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     m_log.DebugFormat(
                         "[INVENTORY ACCESS MODULE]:  Object {0} {1} scheduled for save to inventory has already been deleted.",
                         so.Name, so.UUID);
-                    
+
                     return null;
                 }
             }
@@ -805,13 +805,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
                 }
 
-                item = new InventoryItemBase();                
+                item = new InventoryItemBase();
                 item.ID = UUID.Random();
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = folder.ID;
                 item.Owner = userID;
-            }   
-            
+            }
+
             return item;
         }
         // compatibility do not use
@@ -863,7 +863,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 byte BypassRayCast, bool RayEndIsIntersection,
                 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
-            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());           
+            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());
 
             if (rezAsset == null)
             {
@@ -891,7 +891,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     "[INVENTORY ACCESS MODULE]: missing data in asset {0} to RezObject()",
                     assetID, remoteClient.Name);
                 remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: missing data in asset {0} ", assetID), false);
-                return null;           
+                return null;
             }
 
             SceneObjectGroup group = null;
@@ -903,7 +903,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
             Vector3 pos;
 
-            bool single 
+            bool single
                 = m_Scene.GetObjectsToRez(
                     rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
 
@@ -1055,7 +1055,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="isAttachment"></param>
         /// <returns>true if we can processed with rezzing, false if we need to abort</returns>
         private bool DoPreRezWhenFromItem(
-            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist, 
+            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist,
             Vector3 pos, List<Vector3> veclist, bool isAttachment)
         {
             UUID fromUserInventoryItemId = UUID.Zero;
@@ -1142,7 +1142,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
                     rootPart.SalePrice = 10;
-    
+
                     if (m_Scene.Permissions.PropagatePermissions())
                     {
                         foreach (SceneObjectPart part in so.Parts)
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             part.RezzerID = item.Owner;
                             part.Inventory.ChangeInventoryOwner(item.Owner);
                         }
-    
+
                         so.ApplyNextOwnerPermissions();
 
                         // In case the user has changed flags on a received item
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             IInventoryService invService = m_Scene.RequestModuleInterface<IInventoryService>();
             InventoryItemBase item = invService.GetItem(agentID, itemID);
-            
+
             if (item != null && item.CreatorData != null && item.CreatorData != string.Empty)
                 UserManagementModule.AddUser(item.CreatorIdAsUuid, item.CreatorData);
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
index 007ff63..8f12331 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             scene.StartScripts();
 
             HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl);
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password");
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail);
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID");
             Assert.NotNull(uuidAttribute);
             // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task
-            // item created earlier. 
+            // item created earlier.
         }
 
         private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId)
@@ -131,9 +131,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             // immediately for tests rather than chunter through it's threaded mechanisms.
             AutoResetEvent chatEvent = new AutoResetEvent(false);
 
-            scene.EventManager.OnChatFromWorld += (s, c) => 
+            scene.EventManager.OnChatFromWorld += (s, c) =>
             {
-//                Console.WriteLine("Got chat [{0}]", c.Message);           
+//                Console.WriteLine("Got chat [{0}]", c.Message);
                 chatEvent.Set();
             };
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index b31d4df..de29ae9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -48,12 +48,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
 {
     [TestFixture]
     public class InventoryAccessModuleTests : OpenSimTestCase
-    {      
+    {
         protected TestScene m_scene;
         protected BasicInventoryAccessModule m_iam;
         protected UUID m_userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
         protected TestClient m_tc;
-            
+
         [SetUp]
         public override void SetUp()
         {
@@ -68,32 +68,32 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             SceneHelpers sceneHelpers = new SceneHelpers();
             m_scene = sceneHelpers.SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, m_iam);
-            
+
             // Create user
             string userFirstName = "Jock";
             string userLastName = "Stirrup";
             string userPassword = "troll";
-            UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword);                        
-            
+            UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword);
+
             AgentCircuitData acd = new AgentCircuitData();
             acd.AgentID = m_userId;
             m_tc = new TestClient(acd, m_scene);
         }
-        
+
         [Test]
         public void TestRezCoalescedObject()
         {
 /*
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             // Create asset
             SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20);
             object1.AbsolutePosition = new Vector3(15, 30, 45);
-            
+
             SceneObjectGroup object2 = SceneHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40);
-            object2.AbsolutePosition = new Vector3(25, 50, 75);                 
-            
+            object2.AbsolutePosition = new Vector3(25, 50, 75);
+
             CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
@@ -107,46 +107,46 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             item1.Flags |= (uint)InventoryItemFlags.ObjectHasMultipleItems;
             m_scene.AddInventoryItem(item1);
-            
-            SceneObjectGroup so 
+
+            SceneObjectGroup so
                 = m_iam.RezObject(
-                    m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
-            
+                    m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);
+
             Assert.That(so, Is.Not.Null);
-            
+
             Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(2));
-          
+
             SceneObjectPart retrievedObj1Part = m_scene.GetSceneObjectPart(object1.Name);
             Assert.That(retrievedObj1Part, Is.Null);
-            
+
             retrievedObj1Part = m_scene.GetSceneObjectPart(item1.Name);
             Assert.That(retrievedObj1Part, Is.Not.Null);
             Assert.That(retrievedObj1Part.Name, Is.EqualTo(item1.Name));
-            
+
             // Bottom of coalescence is placed on ground, hence we end up with 100.5 rather than 85 since the bottom
             // object is unit square.
             Assert.That(retrievedObj1Part.AbsolutePosition, Is.EqualTo(new Vector3(95, 90, 100.5f)));
-            
+
             SceneObjectPart retrievedObj2Part = m_scene.GetSceneObjectPart(object2.Name);
-            Assert.That(retrievedObj2Part, Is.Not.Null);            
+            Assert.That(retrievedObj2Part, Is.Not.Null);
             Assert.That(retrievedObj2Part.Name, Is.EqualTo(object2.Name));
             Assert.That(retrievedObj2Part.AbsolutePosition, Is.EqualTo(new Vector3(105, 110, 130.5f)));
 */
-        }        
-        
+        }
+
         [Test]
         public void TestRezObject()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             // Create asset
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -159,17 +159,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             m_scene.AddInventoryItem(item1);
-            
-            SceneObjectGroup so 
+
+            SceneObjectGroup so
                 = m_iam.RezObject(
-                    m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
-            
+                    m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);
+
             Assert.That(so, Is.Not.Null);
-            
+
             SceneObjectPart retrievedPart = m_scene.GetSceneObjectPart(so.UUID);
             Assert.That(retrievedPart, Is.Not.Null);
         }
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 862f0b7..df9d4f9 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                 return;
 
             // This will never run more than once, even if the region is restarted
-            if (!m_HasRunOnce) 
+            if (!m_HasRunOnce)
             {
                 LoadLibrariesFromArchives();
                 //DumpLibrary();
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 21e00b2..c1a9457 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -259,11 +259,11 @@ namespace OpenSim.Region.CoreModules.Framework.Library
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// that hold the given assetID.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="assetID"></param>
-        /// <returns>The permissions or 0 if no such asset is found in 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         public int GetAssetPermissions(UUID userID, UUID assetID) { return 0; }
     }
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index 93a7cf2..fb3d31c 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -44,7 +44,7 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.Framework.Monitoring
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")]
-    public class MonitorModule : INonSharedRegionModule 
+    public class MonitorModule : INonSharedRegionModule
     {
         /// <summary>
         /// Is this module enabled?
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
 
             if (cnfg != null)
                 Enabled = cnfg.GetBoolean("Enabled", true);
-            
+
             if (!Enabled)
                 return;
 
@@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; });
             MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; });
         }
-        
+
         private void UnRegisterStatsManagerRegionStatistics()
         {
             foreach (Stat stat in registeredStats)
@@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             }
             registeredStats.Clear();
         }
-        
+
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
index 3849996..c04d856 100644
--- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Framework.Search
 
         #endregion ISharedRegionModule
 
- 
+
         #region Event Handlers
 
         void EventManager_OnMakeRootAgent(ScenePresence sp)
diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 36fb57a..924a1a3 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private readonly List<Scene> m_scenes = new List<Scene>();
         private JobEngine m_processorJobEngine;
- 
+
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
index f3436d1..3e6c8b5 100644
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
     public class BinaryLoggingModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected bool m_collectStats;
         protected Scene m_scene = null;
-        
+
         public string Name { get { return "Binary Statistics Logging Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
-        public void Initialise(IConfigSource source) 
+        public void Initialise(IConfigSource source)
         {
             try
             {
@@ -81,23 +81,23 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
                 // if it doesn't work, we don't collect anything
             }
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
         }
-        
-        public void RegionLoaded(Scene scene) 
+
+        public void RegionLoaded(Scene scene)
         {
             if (m_collectStats)
                 m_scene.StatsReporter.OnSendStatsResult += LogSimStats;
         }
-        
-        public void Close() 
+
+        public void Close()
         {
         }
 
@@ -107,12 +107,12 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
             public string Path;
             public System.IO.BinaryWriter Log;
         }
-        
+
         static StatLogger m_statLog = null;
         static TimeSpan m_statLogPeriod = TimeSpan.FromSeconds(300);
         static string m_statsDir = String.Empty;
         static Object m_statLockObject = new Object();
-        
+
         private void LogSimStats(SimStats stats)
         {
             SimStatsPacket pack = new SimStatsPacket();
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index ea3bbe7..3e0a610 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 // This is it! Let's ask the other world
-                if (words[0].Contains(".")) 
+                if (words[0].Contains("."))
                 {
                     string[] names = words[0].Split(new char[] { '.' });
                     if (names.Length >= 2)
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         }
 
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr);
-                        
+
                         UUID userID = UUID.Zero;
                         try
                         {
@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         {
                             m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e);
                         }
-                        
+
                         if (!userID.Equals(UUID.Zero))
                         {
                             UserData ud = new UserData();
@@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             //{
             //    foreach (UserData d in m_UserCache.Values)
             //    {
-            //        if (d.LastName.StartsWith("@") && 
-            //            (d.FirstName.ToLower().StartsWith(query.ToLower()) || 
+            //        if (d.LastName.StartsWith("@") &&
+            //            (d.FirstName.ToLower().StartsWith(query.ToLower()) ||
             //             d.LastName.ToLower().StartsWith(query.ToLower())))
             //            users.Add(d);
             //    }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
index 4e3b7e5..9d91aa3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
 {
     [TestFixture]
     public class HGUserManagementModuleTests : OpenSimTestCase
-    {    
+    {
         /// <summary>
         /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 2701912..51f973a 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -345,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="uuid"></param>
         /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param>
@@ -557,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 return ret;
 
             // try grid user service
-            
+
             GridUserInfo[] pinfos = m_Scenes[0].GridUserService.GetGridUserInfo(missing.ToArray());
             if(pinfos.Length > 0)
             {
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index a5c7543..5d66d34 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
     public class HGWorldMapModule : WorldMapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         // Remember the map area that each client has been exposed to in this region
         private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>();
 
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 74dcaae..2e3ac8e 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/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.Region.CoreModules")]
@@ -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/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 665d7f7..c369d87 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -181,12 +181,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                                          string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
         {
             return AddDynamicTextureURL(simID, primID, contentType, url,
-                                          extraParams, updateTimer, SetBlending, 
+                                          extraParams, updateTimer, SetBlending,
                                          (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending, 
+                                         string extraParams, int updateTimer, bool SetBlending,
                                          int disp, byte AlphaValue, int face)
         {
             if (RenderPlugins.ContainsKey(contentType))
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
                                           string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
         {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, 
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending,
                                           (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
@@ -478,17 +478,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
                 if (part == null || data == null || data.Length <= 1)
                 {
-                    string msg = 
+                    string msg =
                         String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
                     scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
                                   0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
-                    
+
                     return UUID.Zero;
                 }
 
                 byte[] assetData = null;
                 AssetBase oldAsset = null;
-                
+
                 if (BlendWithOldTexture)
                 {
                     Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
                 Bitmap image1 = new Bitmap(image);
                 image.Dispose();
-                
+
                 if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null)
                 {
                     image1.Dispose();
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 3948667..09891f7 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
             }
-                        
+
             htc.RequestModule = this;
             htc.LocalID = localID;
             htc.ItemID = itemID;
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         }
 
         public bool StartHttpRequest(HttpRequestClass req)
-        {          
+        {
             if (!CheckAllowed(new Uri(req.Url)))
                 return false;
 
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             try
             {
                 Request = (HttpWebRequest)WebRequest.Create(Url);
-                Request.AllowAutoRedirect = false;               
+                Request.AllowAutoRedirect = false;
 
                 //This works around some buggy HTTP Servers like Lighttpd
                 Request.ServicePoint.Expect100Continue = false;
@@ -684,9 +684,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     resStream.Close();
                 if (response != null)
                     response.Close();
-                
 
-                // We need to resubmit 
+
+                // We need to resubmit
                 if (
                     (Status == (int)HttpStatusCode.MovedPermanently
                         || Status == (int)HttpStatusCode.Found
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index d22487e..7e223d7 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -45,7 +45,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 {
     class TestWebRequestCreate : IWebRequestCreate
-    {       
+    {
         public TestWebRequest NextRequest { get; set; }
 
         public WebRequest Create(Uri uri)
@@ -65,13 +65,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
         public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; }
 
-        public TestWebRequest() : base() 
+        public TestWebRequest() : base()
         {
 //            Console.WriteLine("created");
         }
 
-//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) 
-//            : base(serializationInfo, streamingContext) 
+//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext)
+//            : base(serializationInfo, streamingContext)
 //        {
 //            Console.WriteLine("created");
 //        }
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
         public string Response { get; set; }
 
 #pragma warning disable 0618
-        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 
+        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext)
             : base(serializationInfo, streamingContext) {}
 #pragma warning restore 0618
 
@@ -111,24 +111,24 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
     {
         WaitHandle m_wh = new ManualResetEvent(true);
 
-        object IAsyncResult.AsyncState 
+        object IAsyncResult.AsyncState
         {
             get {
                 throw new System.NotImplementedException ();
             }
         }
 
-        WaitHandle IAsyncResult.AsyncWaitHandle 
+        WaitHandle IAsyncResult.AsyncWaitHandle
         {
             get { return m_wh; }
         }
 
-        bool IAsyncResult.CompletedSynchronously 
+        bool IAsyncResult.CompletedSynchronously
         {
             get { return false; }
         }
 
-        bool IAsyncResult.IsCompleted 
+        bool IAsyncResult.IsCompleted
         {
             get { return true; }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
             TestHelpers.EnableLogging();
 
             if (!Util.IsPlatformMono)
-                Assert.Ignore("Ignoring test since can only currently run on Mono");           
+                Assert.Ignore("Ignoring test since can only currently run on Mono");
 
             string rawResponse = "boom";
 
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
             TestWebRequest twr = new TestWebRequest();
             //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext());
-            twr.OnEndGetResponse += ar => 
+            twr.OnEndGetResponse += ar =>
             {
                 SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter());
                 StreamingContext sc = new StreamingContext();
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index f563c68..bb80a88 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         /// </summary>
         public int TotalUrls { get; set; }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -221,10 +221,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     urlData.allowXss = true;
 
                 m_UrlMap[url] = urlData;
-                
+
                 string uri = "/lslhttp/" + urlcode.ToString() + "/";
-               
-                PollServiceEventArgs args 
+
+                PollServiceEventArgs args
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
@@ -270,12 +270,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
                 if (options != null && options["allowXss"] != null)
                     urlData.allowXss = true;
-                
+
                 m_UrlMap[url] = urlData;
-                
+
                 string uri = "/lslhttps/" + urlcode.ToString() + "/";
-               
-                PollServiceEventArgs args 
+
+                PollServiceEventArgs args
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     foreach (UUID req in data.requests.Keys)
                         m_RequestMap.Remove(req);
                 }
-                        
+
 //                m_log.DebugFormat(
 //                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
 //                    url, data.itemID, data.hostID);
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 m_UrlMap.Remove(url);
             }
         }
-        
+
         public void HttpContentType(UUID request, string type)
         {
             lock (m_UrlMap)
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 }
             }
         }
-        
+
         public void HttpResponse(UUID request, int status, string body)
         {
             lock (m_RequestMap)
@@ -403,7 +403,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public void ScriptRemoved(UUID itemID)
         {
 //            m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID);
-            
+
             lock (m_UrlMap)
             {
                 List<string> removeURLs = new List<string>();
@@ -495,14 +495,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 return response;
             }
 
-            
+
             return response;
         }
 
         private bool HasEvents(UUID requestID, UUID sessionID)
         {
             UrlData url=null;
-            
+
             lock (m_RequestMap)
             {
                 if (!m_RequestMap.ContainsKey(requestID))
@@ -545,10 +545,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             {
                 requestData = url.requests[requestID];
             }
-            
+
             if (!requestData.requestDone)
                 return NoEvents(requestID,sessionID);
-            
+
             Hashtable response = new Hashtable();
 
             if (System.Environment.TickCount - requestData.startTime > 25000)
@@ -569,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
             if (url.allowXss)
                 response["access_control_allow_origin"] = "*";
-            
+
             //remove from map
             lock (url.requests)
             {
@@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     }
 
                     //for llGetHttpHeader support we need to store original URI here
-                    //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
+                    //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers
                     //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader
 
                     RequestData requestData = new RequestData();
@@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                                     else
                                     {
                                         queryString = queryString + val + "&";
-                                    }                                    
+                                    }
                                 }
                             }
                             if (queryString.Length > 1)
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 7267515..673a453 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             return false;
         }
 
-        public void GetDrawStringSize(string text, string fontName, int fontSize, 
+        public void GetDrawStringSize(string text, string fontName, int fontSize,
                                       out double xSize, out double ySize)
         {
             xSize = 0;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         {
             if (m_scene == null)
                 m_scene = scene;
-            
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -166,15 +166,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.AllowAutoRedirect = false;
-            
-            if (!string.IsNullOrEmpty(m_proxyurl)) 
+
+            if (!string.IsNullOrEmpty(m_proxyurl))
             {
-                if (!string.IsNullOrEmpty(m_proxyexcepts)) 
+                if (!string.IsNullOrEmpty(m_proxyexcepts))
                 {
                     string[] elist = m_proxyexcepts.Split(';');
                     request.Proxy = new WebProxy(m_proxyurl, true, elist);
-                } 
-                else 
+                }
+                else
                 {
                     request.Proxy = new WebProxy(m_proxyurl, true);
                 }
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                             {
                                 imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
                             }
-                        } 
+                        }
                         catch (Exception)
                         {
                             m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed.  Empty byte data returned!");
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index ad33f23..9c3f08e 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         public void RegionLoaded(Scene scene)
         {
             m_scriptModule = scene.RequestModuleInterface<IScriptModule>();
-            
+
             if (m_scriptModule != null)
                 m_log.Info("[MODULE COMMANDS]: Script engine found, module active");
         }
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
                 }
             }
         }
-        
+
         public Delegate[] GetScriptInvocationList()
         {
             List<Delegate> ret = new List<Delegate>();
@@ -361,14 +361,14 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         public object LookupModConstant(string cname)
         {
             // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname);
-            
+
             lock (m_constants)
             {
                 object value = null;
                 if (m_constants.TryGetValue(cname,out value))
                     return value;
             }
-            
+
             return null;
         }
 
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 2fc89fc..f12286d 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return true;
         }
 
-        public void GetDrawStringSize(string text, string fontName, int fontSize, 
+        public void GetDrawStringSize(string text, string fontName, int fontSize,
                                       out double xSize, out double ySize)
         {
             lock (this)
@@ -209,32 +209,32 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             int alpha = 255; // 0 is transparent
             Color bgColor = Color.White;  // Default background color
             char altDataDelim = ';';
-            
+
             char[] paramDelimiter = { ',' };
             char[] nvpDelimiter = { ':' };
-           
+
             extraParams = extraParams.Trim();
             extraParams = extraParams.ToLower();
-            
+
             string[] nvps = extraParams.Split(paramDelimiter);
-            
+
             int temp = -1;
             foreach (string pair in nvps)
             {
                 string[] nvp = pair.Split(nvpDelimiter);
                 string name = "";
                 string value = "";
-                
+
                 if (nvp[0] != null)
                 {
                     name = nvp[0].Trim();
                 }
-                
+
                 if (nvp.Length == 2)
                 {
                     value = nvp[1].Trim();
                 }
-                
+
                 switch (name)
                 {
                     case "width":
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                          if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
                          {
                              bgColor = Color.FromArgb(hex);
-                         } 
+                         }
                          else
                          {
                              bgColor = Color.FromName(value);
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                          }
                          else
                          {
-                             // this function used to accept an int on its own that represented both 
+                             // this function used to accept an int on its own that represented both
                              // width and height, this is to maintain backwards compat, could be removed
                              // but would break existing scripts
                              temp = parseIntParam(name);
@@ -329,10 +329,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                              {
                                  if (temp > 1024)
                                     temp = 1024;
-                                    
+
                                  if (temp < 128)
                                      temp = 128;
-                                  
+
                                  width = temp;
                                  height = temp;
                              }
@@ -358,10 +358,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
                     else
                         bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
-    
+
                     graph = Graphics.FromImage(bitmap);
-        
-                    // this is really just to save people filling the 
+
+                    // this is really just to save people filling the
                     // background color in their scripts, only do when fully opaque
                     if (alpha >= 255)
                     {
@@ -370,10 +370,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                             graph.FillRectangle(bgFillBrush, 0, 0, width, height);
                         }
                     }
-        
+
                     for (int w = 0; w < bitmap.Width; w++)
                     {
-                        if (alpha <= 255) 
+                        if (alpha <= 255)
                         {
                             for (int h = 0; h < bitmap.Height; h++)
                             {
@@ -381,10 +381,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                             }
                         }
                     }
-        
+
                     GDIDraw(data, graph, altDataDelim, out reuseable);
                 }
-    
+
                 byte[] imageJ2000 = new byte[0];
 
                 // This code exists for testing purposes, please do not remove.
@@ -394,7 +394,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 //                    imageJ2000 = s_asset2Data;
 //
 //                s_flipper = !s_flipper;
-    
+
                 try
                 {
                     imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true);
@@ -420,13 +420,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 {
                     if (graph != null)
                         graph.Dispose();
-    
+
                     if (bitmap != null)
                         bitmap.Dispose();
                 }
             }
         }
-        
+
         private int parseIntParam(string strInt)
         {
             int parsed;
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString());
                 parsed = -1;
             }
-            
+
             return parsed;
         }
 
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                                     graph.DrawString("not an image. Please check URL.", errorFont,
                                                      myBrush, new Point(startPoint.X, 12 + startPoint.Y));
                                 }
-    
+
                                 graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y);
                             }
                         }
@@ -638,11 +638,11 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                     {
                         nextLine = nextLine.Remove(0, 8);
                         nextLine = nextLine.Trim();
-    
+
                         string[] fprops = nextLine.Split(partsDelimiter);
                         foreach (string prop in fprops)
                         {
-    
+
                             switch (prop)
                             {
                                 case "B":
@@ -717,7 +717,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         else if (cap[0].ToLower() != "both")
                             return;
                         string type = cap[1].ToLower();
-                        
+
                         if (end)
                         {
                             switch (type)
@@ -760,7 +760,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         nextLine = nextLine.Remove(0, 9);
                         nextLine = nextLine.Trim();
                         int hex = 0;
-    
+
                         Color newColor;
                         if (Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
                         {
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index e1c0cd7..660e03f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                         continue;
                     if (m_scene.GetSceneObjectPart(liHostID) == null)
                         continue;
-   
+
                     if (targets.Contains(liHostID))
                         QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 87f4277..aed1372 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -621,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
         private Thread httpThread;
         public int Idata;
         private UUID _itemID;
-        public UUID ItemID 
+        public UUID ItemID
         {
             get { return _itemID; }
             set { _itemID = value; }
@@ -633,7 +633,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             set { _localID = value; }
         }
         private UUID _reqID;
-        public UUID ReqID 
+        public UUID ReqID
         {
             get { return _reqID; }
             set { _reqID = value; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 7b4668a..2c882e6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
 
                 m_log.Info("[HGAssetService]: Starting...");
 
-                
+
                 Object[] args = new Object[] { m_Config, MainServer.Instance, "HGAssetService" };
 
                 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
index 2cdffe6..a8c4e3c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index 22857d0..834cbb7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index f749295..4f87595 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         private bool m_Registered = false;
         private string m_LocalServiceDll = String.Empty;
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
                 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
 
                 m_UASHandler = new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn);
-                
+
                 new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService");
 
                 new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService", friendsConn);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 0a4e736..61e37a9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 1273f0d..21483c5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
index 425febd..065dd94 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
         {
             if (!m_Enabled)
                 return;
-            
+
             if (!m_Registered)
             {
                 m_Registered = true;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
index c14bce7..a75a156 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
 
         #region Region Module interface
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index 6bf47cb..09c545c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 57d1132..7ba39d4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 4701ee6..9e75ee2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             get; private set;
         }
-        
-        public Type ReplaceableInterface 
+
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params");
         }
-        
+
         public LocalUserProfilesServicesConnector(IConfigSource source)
         {
             m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly.");
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         public void InitialiseService(IConfigSource source)
         {
             ConfigName = "UserProfilesService";
-            
+
             // Instantiate the request handler
             IHttpServer Server = MainServer.Instance;
 
@@ -107,35 +107,35 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini");
                 return;
             }
-            
+
             if(!config.GetBoolean("Enabled",false))
             {
                 Enabled = false;
                 return;
             }
-            
+
             Enabled = true;
-            
+
             string serviceDll = config.GetString("LocalServiceModule",
                                                       String.Empty);
-            
+
             if (serviceDll == String.Empty)
             {
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService");
                 return;
             }
-            
+
             Object[] args = new Object[] { source, ConfigName };
             ServiceModule =
                 ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll,
                                                      args);
-            
+
             if (ServiceModule == null)
             {
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service");
                 return;
             }
-            
+
             Enabled = true;
 
             JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             if (!Enabled)
                 return;
-            
+
             lock (regions)
             {
                 if (regions.ContainsKey(scene.RegionInfo.RegionID))
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         void IRegionModuleBase.RemoveRegion(Scene scene)
         {
             if (!Enabled)
-                return; 
+                return;
 
             lock (regions)
             {
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         void IRegionModuleBase.RegionLoaded(Scene scene)
         {
             if (!Enabled)
-                return; 
+                return;
         }
         #endregion
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
index 41ae53f..5cd68d9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
index a827c4c..d60236a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
@@ -44,14 +44,14 @@ using Nini.Config;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAgentPreferencesServicesConnector")]
-    public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector, 
+    public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector,
             ISharedRegionModule, IAgentPreferencesService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 31d1129..f5aa971 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private AssetPermissions m_AssetPerms;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             if (!m_Enabled)
                 return;
-            
+
             m_aScene = scene;
 
             m_aScene.RegisterModuleInterface<IAssetService>(this);
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
                 if (!(m_Cache is ISharedRegionModule))
                     m_Cache = null;
-                
+
             }
 
             m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName);
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             //m_log.DebugFormat("[HG ASSET CONNECTOR]: Get {0}", id);
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 asset = m_Cache.Get(id);
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public AssetMetadata GetMetadata(string id)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 if (m_Cache != null)
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public byte[] GetData(string id)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 if (m_Cache != null)
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
 
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             bool isHG = IsHG(asset.ID);
             if ((m_Cache != null) && !isHG)
-                // Don't store it in the cache if the asset is to 
+                // Don't store it in the cache if the asset is to
                 // be sent to the other grid, because this is already
                 // a copy of the local asset.
                 m_Cache.Cache(asset);
@@ -366,7 +366,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (String.IsNullOrEmpty(id))
                 return string.Empty;
-            
+
            if(asset.ID != id)
            {
                 asset.ID = id;
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool UpdateContent(string id, byte[] data)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index d5d6667..7190aa0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public AssetBase Get(string id)
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Synchronously requesting asset {0}", id);
-            
+
             AssetBase asset = null;
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //                if (null == asset)
 //                    m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not synchronously find asset with id {0}", id);
             }
-            
+
             return asset;
         }
 
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 return asset.Metadata;
 
             asset = m_AssetService.Get(id);
-            if (asset != null) 
+            if (asset != null)
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Asynchronously requesting asset {0}", id);
-                                    
+
             if (m_Cache != null)
             {
                 AssetBase asset = m_Cache.Get(id);
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             if (m_Cache != null)
                 m_Cache.Cache(asset);
-            
+
             if (asset.Local)
             {
 //                m_log.DebugFormat(
@@ -278,7 +278,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //                m_log.DebugFormat(
 //                    "[LOCAL ASSET SERVICE CONNECTOR]: Passing {0} {1} on to asset service for storage, status Temporary = {2}, Local = {3}",
 //                    asset.Name, asset.ID, asset.Temporary, asset.Local);
-                
+
                 return m_AssetService.Store(asset);
             }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index ff04f9d..1225ab5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         private bool m_Enabled = false;
         private IAssetCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index f027810..8017245 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
         {
             // Not implemented at the regions
             realID = UUID.Zero;
-            return string.Empty; 
+            return string.Empty;
         }
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             // Not implemented at the regions
-            return string.Empty; 
+            return string.Empty;
         }
 
         public bool Verify(UUID principalID, string token, int lifetime)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
index 7cb8b22..fd1d802 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index 1acb695..0be0676 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         public void Initialise(IConfigSource source)
         {
             m_log.Info("[AUTHORIZATION CONNECTOR]: Initialise");
-            
+
             IConfig moduleConfig = source.Configs["Modules"];
             if (moduleConfig != null)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index b8d409d..f312b0d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         private bool m_Enabled = false;
         private List<Scene> m_scenes = new List<Scene>();
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 m_scenes.Add(scene);
                 scene.RegisterModuleInterface<IAuthorizationService>(this);
             }
-            
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -118,16 +118,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
             m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: Enabled remote authorization for region {0}", scene.RegionInfo.RegionName);
 
         }
-        
+
         public bool IsAuthorizedForRegion(
              string userID, string firstName, string lastName, string regionID, out string message)
         {
             m_log.InfoFormat(
                 "[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID);
-            
+
             bool isAuthorized = true;
             message = String.Empty;
-            
+
             // get the scene this call is being made for
             Scene scene = null;
             lock (m_scenes)
@@ -140,11 +140,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                     }
                 }
             }
-            
+
             if (scene != null)
             {
                 string mail = String.Empty;
-                
+
                 UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID));
 
                 //if account not found, we assume its a foreign visitor from HG, else use account data...
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                     "[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0}",
                     regionID);
             }
-            
+
             return isAuthorized;
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
index c3ef588..42f6c3f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -144,12 +144,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
         {
             return m_AvatarService.GetAppearance(userID);
         }
-        
+
         public bool SetAppearance(UUID userID, AvatarAppearance appearance)
         {
             return m_AvatarService.SetAppearance(userID,appearance);
         }
-            
+
         public AvatarData GetAvatar(UUID userID)
         {
             return m_AvatarService.GetAvatar(userID);
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
         {
             return m_AvatarService.RemoveItems(userID, names);
         }
-        
+
         #endregion
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
index a087aea..37cfbbc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 70733fc..d220568 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         public LocalGridServicesConnector(IConfigSource source)
         {
             m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader);
-            InitialiseService(source, null);        
+            InitialiseService(source, null);
         }
 
         public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache)
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
-                {                   
+                {
                     if(InitialiseService(source, null))
                         m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
                 }
@@ -190,8 +190,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             // This shouldn't happen
             if (region == null)
                 return;
-            
-            m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region);           
+
+            m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region);
         }
 
         public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            return m_GridService.GetNeighbours(scopeID, regionID); 
+            return m_GridService.GetNeighbours(scopeID, regionID);
         }
 
         public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             return m_GridService.GetHyperlinks(scopeID);
         }
-        
+
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             return m_GridService.GetRegionFlags(scopeID, regionID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
index 5eb525b..84e52f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static RegionsExpiringCache m_Cache;
         private int numberInstances;
 
@@ -60,12 +60,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (rinfo != null)
                 this.Cache(rinfo.ScopeID, rinfo);
         }
-        
+
         public void Cache(UUID scopeID, GridRegion rinfo)
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS);
         }
 
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(rinfo.ScopeID, rinfo, 1e7f);
         }
 
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS);
         }
 
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, expireSeconds);
         }
 
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 inCache = true;
                 return rinfo;
             }
-            
+
             return null;
         }
 
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 inCache = true;
                 return rinfo;
             }
-            
+
             return null;
         }
     }
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private Dictionary<string, ulong> byname;
         private Dictionary<UUID, ulong> byuuid;
         // includes handles to the inside of large regions
-        private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>(); 
+        private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>();
 
         public RegionInfoForScope()
         {
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 byuuid = new Dictionary<UUID, ulong>();
 
             storage[handle] = region;
-            expires[handle] = expire; 
+            expires[handle] = expire;
             byname[region.RegionName] = handle;
             byuuid[region.RegionID] = handle;
 
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             storage[handle] = region;
             byname[region.RegionName] = handle;
             byuuid[region.RegionID] = handle;
-           
+
         }
 
         public void Remove(GridRegion region)
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if(!innerHandles.ContainsKey(handle))
                 return null;
-            
+
             ulong rhandle = innerHandles[handle];
             if(storage.ContainsKey(rhandle))
                 return storage[rhandle];
@@ -495,7 +495,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if(byname == null || !byname.ContainsKey(name))
                 return null;
-            
+
             ulong handle = byname[name];
             if(storage.ContainsKey(handle))
                 return storage[handle];
@@ -528,7 +528,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if(!innerHandles.ContainsKey(handle))
                 return null;
-            
+
             ulong rhandle = innerHandles[handle];
             if(!storage.ContainsKey(rhandle))
                 return null;
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             GridRegion r = storage[rhandle];
             if(r == null)
                 return null;
-                
+
             // extra check, possible redundant
 
             int test = r.RegionLocX;
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (y < test)
                 return r;
 
-/* 
+/*
             // next do the harder work
             foreach(KeyValuePair<ulong, GridRegion> kvp in storage)
             {
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 if(kvp.Value < now)
                     toexpire.Add(kvp.Key);
             }
- 
+
             if(toexpire.Count == 0)
                 return expires.Count;
 
@@ -597,7 +597,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 Clear();
                 return 0;
             }
-            
+
             foreach(ulong h in toexpire)
             {
                 if(storage != null)
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     innerHandles[fh.toHandle()] = handle;
                     fh.y += 256;
                 }
-                    
+
                 fh.y = startY;
                 fh.x += 256;
             }
@@ -684,18 +684,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     innerHandles.Remove(fh.toHandle());
                     fh.y += 256;
                 }
-                    
+
                 fh.y = startY;
                 fh.x += 256;
             }
         }
     }
-  
+
     public class RegionsExpiringCache
     {
         const double CACHE_PURGE_HZ = 60; // seconds
         const int MAX_LOCK_WAIT = 10000; // milliseconds
- 
+
         /// <summary>For thread safety</summary>
         object syncRoot = new object();
         /// <summary>For thread safety</summary>
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     ris = new RegionInfoForScope(region, expire);
                     InfobyScope[scope] = ris;
                 }
-                else 
+                else
                     ris.AddUpdate(region, expire);
 
                 return true;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             }
             finally { Monitor.Exit(syncRoot); }
         }
-        
+
         public bool Contains(UUID scope, GridRegion region)
         {
             if(region == null)
@@ -758,11 +758,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
-            
+
                 return ris.Contains(region);
             }
             finally { Monitor.Exit(syncRoot); }
@@ -774,11 +774,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
-            
+
                 return ris.Contains(handle);
             }
             finally { Monitor.Exit(syncRoot); }
@@ -790,7 +790,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 int count = 0;
                 foreach(RegionInfoForScope ris in InfobyScope.Values)
                     count += ris.Count();
@@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT))
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT))
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
@@ -940,7 +940,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private void PurgeCache(object sender, System.Timers.ElapsedEventArgs e)
         {
             // Only let one thread purge at once - a buildup could cause a crash
-            // This could cause the purge to be delayed while there are lots of read/write ops 
+            // This could cause the purge to be delayed while there are lots of read/write ops
             // happening on the cache
             if (!Monitor.TryEnter(isPurging))
                 return;
@@ -961,7 +961,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                         if (kvp.Value.expire(now) == 0)
                             expiredscopes.Add(kvp.Key);
                     }
-                    
+
                     if (expiredscopes.Count > 0)
                     {
                         foreach (UUID sid in expiredscopes)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 50e4c8a..ee17093 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private IGridService m_RemoteGridService;
 
         private RegionInfoCache m_RegionInfoCache;
-        
+
         public RemoteGridServicesConnector()
         {
         }
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #region ISharedRegionmodule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 return false;
             }
 
-            Object[] args = new Object[] { source }; 
+            Object[] args = new Object[] { source };
             m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args);
 
             m_LocalGridService = new LocalGridServicesConnector(source, m_RegionInfoCache);
@@ -130,11 +130,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
             // Legacy. Remove soon!
             m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
-            
-            Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper);          
+
+            Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper);
 
             return true;
-        }   
+        }
 
         public void PostInitialise()
         {
@@ -249,14 +249,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 if(string.IsNullOrWhiteSpace(m_ThisGatekeeper))
                     return rinfo; // no HG
-            
+
                 string regionURI = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName))
-                    return rinfo; // invalid 
+                    return rinfo; // invalid
                 if(m_ThisGatekeeper != regionURI)
                     return rinfo; // not local grid
             }
-                
+
             rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName);
             m_RegionInfoCache.Cache(scopeID, rinfo);
             return rinfo;
@@ -275,10 +275,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 if(string.IsNullOrWhiteSpace(m_ThisGatekeeper))
                     return rinfo; // no HG
-            
+
                 string regionURI = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName))
-                    return rinfo; // invalid 
+                    return rinfo; // invalid
                 if(m_ThisGatekeeper != regionURI)
                     return rinfo; // not local grid
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 044e0e5..1378368 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             Scene s = new Scene(new RegionInfo());
             s.RegionInfo.RegionID = r1.RegionID;
             m_LocalConnector.AddRegion(s);
-            
+
             GridRegion r2 = new GridRegion();
             r2.RegionName = "Test Region 2";
             r2.RegionID = new UUID(2);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 98ccc95..c780bcd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -37,7 +37,7 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 {
-    public class ActivityDetector 
+    public class ActivityDetector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
        {
             if (sp.isNPC)
                 return;
-            
+
             if(sp.gotCrossUpdate)
             {
                 Util.FireAndForget(delegate
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index c48186f..5efdd9b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return m_InventoryURLs[userID];
 
             return null; //it means that the methods should forward to local grid's inventory
- 
+
         }
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 0d36725..fa36b66 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             if (!m_Enabled)
                 return;
-            
+
             scene.RegisterModuleInterface<IInventoryService>(this);
 
             if (Scene == null)
@@ -261,9 +261,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public bool AddItem(InventoryItemBase item)
         {
 //            m_log.DebugFormat(
-//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", 
+//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}",
 //                item.Name, item.Owner, item.Folder);
-            
+
             return m_InventoryService.AddItem(item);
         }
 
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 //            m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
 
 //            UUID requestedItemId = item.ID;
-            
+
             InventoryItemBase item = m_InventoryService.GetItem(principalID, itemID);
 
 //            if (null == item)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 62b44b1..d8ae2c4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 9e251aa..cad2061 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 77dfa4a..68c5b64 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
         private bool m_Enabled = false;
         private LocalLandServicesConnector m_LocalService;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 1357825..9888c3b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         private int m_refreshtime = 0;
         private int m_lastrefresh = 0;
         private System.Timers.Timer m_refreshTimer;
-        
+
         #region ISharedRegionModule
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        public string Name { get { return "MapImageServiceModule"; } }        
+        public string Name { get { return "MapImageServiceModule"; } }
         public void RegionLoaded(Scene scene) { }
         public void Close() { }
         public void PostInitialise() { }
@@ -115,12 +115,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service);
                 return;
             }
-   
+
             // we don't want the timer if the interval is zero, but we still want this module enables
             if(refreshminutes > 0)
             {
                 m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms
-   
+
                 m_refreshTimer = new System.Timers.Timer();
                 m_refreshTimer.Enabled = true;
                 m_refreshTimer.AutoReset = true;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
                              refreshminutes, service);
             }
-            else 
+            else
             {
                 m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with no refresh and service object {0}", service);
             }
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         }
 
         #endregion ISharedRegionModule
-        
+
         ///<summary>
         ///
         ///</summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index bda354f..e8d01b0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         public void RemoveRegion(Scene scene)
         {
-            // Always remove 
+            // Always remove
             if (m_Scenes.Contains(scene))
                 m_Scenes.Remove(scene);
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index e6772f3..fcb5521 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
         //private string serviceDll;
         //private List<Scene> m_Scenes = new List<Scene>();
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 117f02c..aafd047 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -35,7 +35,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class PresenceDetector 
+    public class PresenceDetector
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
         {
             if (sp.isNPC)
                 return;
-            
+
             if(sp.gotCrossUpdate)
             {
                 Util.FireAndForget(delegate
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 69bac82..7838d12 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
         public void TestPresenceV0_1()
         {
             SetUp();
-            
+
                 // Let's stick in a test presence
                 /*
                 PresenceData p = new PresenceData();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 3755650..57aba05 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             }
 
 //            m_log.DebugFormat(
-//                "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate", 
+//                "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate",
 //                destination.RegionName, destination.RegionID);
 
             return false;
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                     reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
                     m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied");
                     return false;
-                
+
                 }
 
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 0ebdbce..b402d2a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         }
 
         protected virtual void InitOnce(Scene scene)
-        {            
+        {
             m_aScene = scene;
             //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
         }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_remoteConnector.CloseAgent(destination, id, auth_token);
-            
+
             return false;
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index b72ffbb..77fd70b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                     account = m_Cache.Get(uuid, out inCache);
                     if (inCache)
                         ret.Add(account);
-                    else                        
+                    else
                         missing.Add(id);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index f5eda11..b510d0a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         private bool m_Enabled = false;
         private UserAccountCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index 2afd74e..f3572a2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private ExpiringCache<UUID, UserAccount> m_UUIDCache;
         private ExpiringCache<string, UUID> m_NameCache;
         private object accessLock = new object();
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public UserAccountCache()
         {
             m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
-            m_NameCache = new ExpiringCache<string, UUID>(); 
+            m_NameCache = new ExpiringCache<string, UUID>();
         }
 
         public void Cache(UUID userID, UserAccount account)
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 {
                     m_UUIDCache.AddOrUpdate(userID, account, CACHE_ALIEN_EXPIRATION_SECONDS);
                     m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_ALIEN_EXPIRATION_SECONDS);
-                }               
+                }
             //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index f567cab..081439a 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World
     public class AccessModule : ISharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         private List<Scene> m_SceneList = new List<Scene>();
 
         public void Initialise(IConfigSource config)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f523af1..6ba8cec 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 SceneObjects = new List<SceneObjectGroup>();
             }
         }
-        
+
 
         /// <summary>
         /// The maximum major version of OAR that we can read.  Minor versions shouldn't need a max number since version
         /// bumps here should be compatible.
         /// </summary>
         public static int MAX_MAJOR_VERSION = 1;
-        
+
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             m_boundingOrigin = Vector3.Zero;
             m_boundingSize = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, float.MaxValue);
-            
+
             if (options.ContainsKey("bounding-origin"))
             {
                 Vector3 boOption = (Vector3)options["bounding-origin"];
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
-                    
+
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                         continue;
 
@@ -354,11 +354,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
                         LoadRegionSettings(scene, filePath, data, dearchivedScenes);
-                    } 
+                    }
                     else if (filePath.StartsWith(ArchiveConstants.LANDDATA_PATH) && (!m_merge || m_forceParcels))
                     {
                         sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
-                    } 
+                    }
                     else if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
                         // Ignore, because we already read the control file
@@ -406,7 +406,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     LoadParcels(sceneContext.Scene, sceneContext.SerialisedParcels);
                     LoadObjects(sceneContext.Scene, sceneContext.SerialisedSceneObjects, sceneContext.SceneObjects);
-                    
+
                     // Inform any interested parties that the region has changed. We waited until now so that all
                     // of the region's objects will be loaded when we send this notification.
                     IEstateModule estateModule = sceneContext.Scene.RequestModuleInterface<IEstateModule>();
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                     continue;
-                    
+
                 if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                 {
                     LoadControlFile(filePath, data, dearchivedScenes);
@@ -517,7 +517,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             throw new Exception("[ARCHIVER]: Control file not found");
         }
-        
+
         /// <summary>
         /// Load serialized scene objects.
         /// </summary>
@@ -545,7 +545,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Really large xml files (multi megabyte) appear to cause
                 // memory problems
                 // when loading the xml.  But don't enable this check yet
-                
+
                 if (serialisedSceneObject.Length > 5000000)
                 {
                     m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);");
@@ -745,7 +745,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 Vector3 AABBMax;
 
                 // create a new LandObject that we can use to manipulate the incoming source parcel data
-                // this is ok, but just beware that some of the LandObject functions (that we haven't used here) still 
+                // this is ok, but just beware that some of the LandObject functions (that we haven't used here) still
                 // assume we're always using the destination region size
                 LandData ld = new LandData();
                 landObject = new LandObject(ld, scene);
@@ -839,7 +839,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
                 parcel.ParcelAccessList = accessList;
 
-                if (m_debug) m_log.DebugFormat("[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}", 
+                if (m_debug) m_log.DebugFormat("[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}",
                                                     parcel.Name, parcel.LocalID, parcel.OwnerID, parcel.GroupID, parcel.IsGroupOwned, parcel.Area);
 
                 landData.Add(parcel);
@@ -939,20 +939,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
                 if(asype == -2)
                 {
-                
+
                 }
 
                 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
                 return true;
             }
-            
+
             if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
 
                 if(assetType == -2)
                 {
-                
+
                 }
                 if (assetType == (sbyte)AssetType.Unknown)
                 {
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             ModifySceneObject(m_rootScene, sog);
                             return true;
                         });
-                    
+
                     if (data == null)
                         return false;
                 }
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             currentRegionSettings.Save();
 
             scene.TriggerEstateSunUpdate();
-            
+
             IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
             if (estateModule != null)
                 estateModule.sendRegionHandshakeToAll();
@@ -1129,16 +1129,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             bool multiRegion = false;
 
-            while (xtr.Read()) 
+            while (xtr.Read())
             {
-                if (xtr.NodeType == XmlNodeType.Element) 
+                if (xtr.NodeType == XmlNodeType.Element)
                 {
                     if (xtr.Name.ToString() == "archive")
                     {
                         int majorVersion = int.Parse(xtr["major_version"]);
                         int minorVersion = int.Parse(xtr["minor_version"]);
                         string version = string.Format("{0}.{1}", majorVersion, minorVersion);
-                        
+
                         if (majorVersion > MAX_MAJOR_VERSION)
                         {
                             throw new Exception(
@@ -1146,15 +1146,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                     "The OAR you are trying to load has major version number of {0} but this version of OpenSim can only load OARs with major version number {1} and below",
                                     majorVersion, MAX_MAJOR_VERSION));
                         }
-                        
+
                         m_log.InfoFormat("[ARCHIVER]: Loading OAR with version {0}", version);
                     }
-                    else if (xtr.Name.ToString() == "datetime") 
+                    else if (xtr.Name.ToString() == "datetime")
                     {
                         int value;
                         if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
                             dearchivedScenes.LoadedCreationDateTime = value;
-                    } 
+                    }
                     else if (xtr.Name.ToString() == "row")
                     {
                         multiRegion = true;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
index d8dace2..2fb4426 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// The inner dictionaries contain each row's regions (key: X coordinate).
         /// </summary>
         public SortedDictionary<uint, SortedDictionary<uint, Scene>> Regions { get; set; }
-        
+
         /// <summary>
         /// The subdirectory where each region is stored in the archive.
         /// </summary>
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
         }
-        
+
         /// <summary>
         /// Returns the scene at position 'location'.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index 6c8f37b..8dabcee 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// The minimum major version of OAR that we can write.
         /// </summary>
-        public static int MIN_MAJOR_VERSION = 0;       
-                
+        public static int MIN_MAJOR_VERSION = 0;
+
         /// <summary>
         /// The maximum major version of OAR that we can write.
         /// </summary>
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_log.ErrorFormat("{0} {1}", e.Message, e.StackTrace);
             }
         }
-        
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
 
             int numObjectsSkippedPermissions = 0;
-         
+
             // Filter entities so that we only have scene objects.
             // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
             // end up having to do this
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
                 int prevAssets = assetUuids.Count;
-                    
+
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
                     assetGatherer.AddForInspection(sceneObject);
 
@@ -276,16 +276,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             // Make sure that we also request terrain texture assets
             RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
-    
+
             if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
                 assetUuids[regionSettings.TerrainTexture1] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
                 assetUuids[regionSettings.TerrainTexture2] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
                 assetUuids[regionSettings.TerrainTexture3] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
                 assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
@@ -398,18 +398,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                string[] parts = m_options["version"].ToString().Split('.');
 //                if (parts.Length >= 1)
 //                {
-//                    majorVersion = Int32.Parse(parts[0]);                    
-//                                        
+//                    majorVersion = Int32.Parse(parts[0]);
+//
 //                    if (parts.Length >= 2)
 //                        minorVersion = Int32.Parse(parts[1]);
 //                }
 //            }
-//            
+//
 //            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
 //            {
 //                throw new Exception(
 //                    string.Format(
-//                        "OAR version number for save must be between {0} and {1}", 
+//                        "OAR version number for save must be between {0} and {1}",
 //                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
 //            }
 //            else if (majorVersion == MAX_MAJOR_VERSION)
@@ -420,9 +420,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //            else if (majorVersion == MIN_MAJOR_VERSION)
 //            {
 //                // Force 0.4
-//                minorVersion = 4;                                        
+//                minorVersion = 4;
 //            }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
             if (majorVersion == 1)
             {
@@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
 
             String s;
-            
+
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter xtw = new XmlTextWriter(sw))
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     xtw.WriteStartElement("archive");
                     xtw.WriteAttributeString("major_version", majorVersion.ToString());
                     xtw.WriteAttributeString("minor_version", minorVersion.ToString());
-        
+
                     xtw.WriteStartElement("creation_info");
                     DateTime now = DateTime.UtcNow;
                     TimeSpan t = now - new DateTime(1970, 1, 1);
@@ -448,7 +448,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (!MultiRegionFormat)
                         xtw.WriteElementString("id", m_rootScene.RegionInfo.RegionID.ToString());
                     xtw.WriteEndElement();
-        
+
                     xtw.WriteElementString("assets_included", SaveAssets.ToString());
 
                     if (MultiRegionFormat)
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
 
                     xtw.WriteEndElement();
-        
+
                     xtw.Flush();
                 }
 
@@ -525,7 +525,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Vector2 size;
 
             size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY);
-    
+
             xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
         }
 
@@ -548,7 +548,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (ILandObject lo in landObjects)
             {
                 LandData landData = lo.LandData;
-                string landDataPath 
+                string landDataPath
                     = String.Format("{0}{1}", regionDir, ArchiveConstants.CreateOarLandDataPath(landData));
                 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
             }
@@ -578,11 +578,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_archiveWriter.WriteFile(objectPath, serializedObject);
             }
         }
-        
+
         protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids, bool timedOut)
         {
             string errorMessage;
-            
+
             if (timedOut)
             {
                 errorMessage = "Loading assets timed out";
@@ -600,10 +600,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 errorMessage = String.Empty;
             }
-            
+
             CloseArchive(errorMessage);
         }
-        
+
         /// <summary>
         /// Closes the archive and notifies that we're done.
         /// </summary>
@@ -622,7 +622,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (errorMessage == string.Empty)
                     errorMessage = e.Message;
             }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_rootScene.RegionInfo.RegionName);
 
             m_rootScene.EventManager.TriggerOarFileSaved(m_requestId, errorMessage);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 150d4ec..1305545 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ArchiverModule")]
     public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Scene Scene { get; private set; }
@@ -59,13 +59,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
 
-        public string Name 
-        { 
-            get { return "RegionArchiverModule"; } 
+        public string Name
+        {
+            get { return "RegionArchiverModule"; }
         }
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
@@ -201,9 +201,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 rready.OarLoadingAlert("load");
             }
             */
-            
+
             List<string> mainParams = options.Parse(cmdparams);
-          
+
 //            m_log.DebugFormat("MERGE OAR IS [{0}]", mergeOar);
 //
 //            foreach (string param in mainParams)
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             ArchiveRegion(path, options);
         }
-        
+
         public void ArchiveRegion(string savePath, Dictionary<string, object> options)
         {
             ArchiveRegion(savePath, Guid.Empty, options);
@@ -298,7 +298,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
-            
+
             new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
         }
 
@@ -330,7 +330,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion();
         }
-        
+
         public void DearchiveRegion(Stream loadStream)
         {
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index c1ff94d..efacae3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -51,8 +51,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <value>
         /// Keep a count of the number of assets written so that we can provide status updates
         /// </value>
-        protected int m_assetsWritten; 
-        
+        protected int m_assetsWritten;
+
         protected TarArchiveWriter m_archiveWriter;
 
         public AssetsArchiver(TarArchiveWriter archiveWriter)
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_assetsWritten++;
 
             //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten);
-            
+
             if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0)
                 m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten);
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 1526b1c..d380da8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Completed,
             Aborted
         };
-        
+
         /// <value>
         /// Timeout threshold if we still need assets or missing asset notifications but have stopped receiving them
         /// from the asset service
@@ -71,14 +71,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// If a timeout does occur, limit the amount of UUID information put to the console.
         /// </value>
         protected const int MAX_UUID_DISPLAY_ON_TIMEOUT = 3;
-       
+
         protected System.Timers.Timer m_requestCallbackTimer;
 
         /// <value>
         /// State of this request
         /// </value>
         private RequestState m_requestState = RequestState.Initial;
-        
+
         /// <value>
         /// uuids to request
         /// </value>
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// List of assets that were found.  This will be passed back to the requester.
         /// </value>
         protected List<UUID> m_foundAssetUuids = new List<UUID>();
-        
+
         /// <value>
         /// Maintain a list of assets that could not be found.  This will be passed back to the requester.
         /// </value>
@@ -109,16 +109,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         protected IAssetService m_assetService;
         protected IUserAccountService m_userAccountService;
-        protected UUID m_scopeID; // the grid ID 
+        protected UUID m_scopeID; // the grid ID
 
         protected AssetsArchiver m_assetsArchiver;
 
         protected Dictionary<string, object> m_options;
 
         protected internal AssetsRequest(
-            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids, 
-            IAssetService assetService, IUserAccountService userService, 
-            UUID scope, Dictionary<string, object> options, 
+            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids,
+            IAssetService assetService, IUserAccountService userService,
+            UUID scope, Dictionary<string, object> options,
             AssetsRequestCallback assetsRequestCallback)
         {
             m_assetsArchiver = assetsArchiver;
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         protected internal void Execute()
         {
             m_requestState = RequestState.Running;
-            
+
             m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
 
             // We can stop here if there are no assets to fetch
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         timedOut = false;
                         return;
                     }
-                    
+
                     m_requestState = RequestState.Aborted;
                 }
 
@@ -196,24 +196,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     uuids.Remove(uuid);
                 }
-    
+
                 foreach (UUID uuid in m_notFoundAssetUuids)
                 {
                     uuids.Remove(uuid);
                 }
-    
+
                 m_log.ErrorFormat(
                     "[ARCHIVER]: Asset service failed to return information about {0} requested assets", uuids.Count);
-    
+
                 int i = 0;
                 foreach (UUID uuid in uuids)
                 {
                     m_log.ErrorFormat("[ARCHIVER]: No information about asset {0} received", uuid);
-    
+
                     if (++i >= MAX_UUID_DISPLAY_ON_TIMEOUT)
                         break;
                 }
-    
+
                 if (uuids.Count > MAX_UUID_DISPLAY_ON_TIMEOUT)
                     m_log.ErrorFormat(
                         "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
@@ -251,24 +251,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void AssetRequestCallback(string id, object sender, AssetBase asset)
         {
             Culture.SetCurrentCulture();
-            
+
             try
             {
                 lock (this)
                 {
                     //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
-                    
+
                     m_requestCallbackTimer.Stop();
-                    
+
                     if ((m_requestState == RequestState.Aborted) || (m_requestState == RequestState.Completed))
                     {
                         m_log.WarnFormat(
-                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.", 
+                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.",
                             id, m_requestState);
 
                         return;
                     }
-                                                           
+
                     if (asset != null)
                     {
 //                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
                         m_notFoundAssetUuids.Add(new UUID(id));
                     }
-        
+
                     if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count >= m_repliesRequired)
                     {
                         m_requestState = RequestState.Completed;
@@ -294,8 +294,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                     "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
                             m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
 
-                        
-                        // We want to stop using the asset cache thread asap 
+
+                        // We want to stop using the asset cache thread asap
                         // as we now need to do the work of producing the rest of the archive
                         WorkManager.RunInThread(PerformAssetsRequestCallback, false, "Archive Assets Request Callback");
                     }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
index e2222fe..809d863 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             string regionDirectory = parts[1];
             relativePath = parts[2];
-            
+
             RegionInfo region;
             if (m_directory2region.TryGetValue(regionDirectory, out region))
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index caa22f7..6885299 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -65,9 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         protected SerialiserModule m_serialiserModule;
 
         protected TaskInventoryItem m_soundItem;
-        
+
         private  AutoResetEvent m_oarEvent = new AutoResetEvent(false);
-        
+
         [SetUp]
         public override void SetUp()
         {
@@ -89,10 +89,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
-                m_oarEvent.Set();                
+                m_oarEvent.Set();
             }
         }
-        
+
         private void SaveCompleted(Guid requestId, string errorMessage)
         {
             lock (this)
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on SaveCompleted");
-                 m_oarEvent.Set(); 
+                 m_oarEvent.Set();
             }
         }
 
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
         }
-       
+
         private void CreateTestObjects(Scene scene, out SceneObjectGroup sog1, out SceneObjectGroup sog2, out UUID ncAssetUuid)
         {
             SceneObjectPart part1 = CreateSceneObjectPart1();
@@ -200,10 +200,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId);
             //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
             //while (assetServer.HasWaitingRequests())
-            //    assetServer.ProcessNextRequest();              
+            //    assetServer.ProcessNextRequest();
 
             m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
 
             bool gotNcAssetFile = false;
-            
+
             string expectedNcAssetFileName = string.Format("{0}_{1}", ncAssetUuid, "notecard.txt");
 
             List<string> foundPaths = new List<string>();
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -228,9 +228,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
@@ -276,10 +276,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -314,9 +314,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -345,11 +345,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             // Put in a random blank directory to check that this doesn't upset the load process
             tar.WriteDir("ignoreme");
-            
-            // Also check that direct entries which will also have a file entry containing that directory doesn't 
+
+            // Also check that direct entries which will also have a file entry containing that directory doesn't
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
 
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
                 part1.UUID);
             tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -400,9 +400,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
- 
+
             Assert.That(m_lastErrorMessage, Is.Null);
 
             TestLoadedRegion(part1, soundItemName, soundData);
@@ -475,31 +475,31 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
             UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
             UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
-            
+
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(
-                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });               
-            
+                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
@@ -529,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene2.EventManager.OnOarFileLoaded += LoadCompleted;
                 m_oarEvent.Reset();
                 archiverModule.DearchiveRegion(archiveReadStream);
-                
+
                  m_oarEvent.WaitOne(60000);
 
                 Assert.That(m_lastErrorMessage, Is.Null);
@@ -557,16 +557,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             MockGroupsServicesConnector groupsService = new MockGroupsServicesConnector();
 
             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);
             SceneHelpers.SetupSceneModules(
                 m_scene, configSource, new object[] { new GroupsModule(), groupsService, new LandManagementModule() });
 
             // Create group in scene for loading
             // FIXME: For now we'll put up with the issue that we'll get a group ID that varies across tests.
-            UUID groupID 
+            UUID groupID
                 = groupsService.CreateGroup(UUID.Zero, "group1", "", true, UUID.Zero, 3, true, true, true, UUID.Zero);
 
             // Construct OAR
@@ -594,7 +594,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(oarStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16);
@@ -617,7 +617,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
 
             tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -666,9 +666,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastErrorMessage, Is.Null);
             RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings;
 
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.AreEqual(UUID.Zero, loadedRs.TelehubObject); // because no object was found with the original UUID
             Assert.AreEqual(0, loadedRs.SpawnPoints().Count);
         }
-        
+
         /// <summary>
         /// Test merging an OpenSim Region Archive into an existing scene
         /// </summary>
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
                 m_oarEvent.Reset();
                 m_archiverModule.ArchiveRegion(archiveWriteStream);
-                
+
                  m_oarEvent.WaitOne(60000);
             }
 
@@ -758,7 +758,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 archiveOptions.Add("merge", null);
                 m_oarEvent.Reset();
                 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
-                
+
                 m_oarEvent.WaitOne(60000);
 
                 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
@@ -819,7 +819,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                     SceneObjectGroup sog1;
                     SceneObjectGroup sog2;
                     UUID ncAssetUuid;
-                    
+
                     CreateTestObjects(scene, out sog1, out sog2, out ncAssetUuid);
 
                     expectedPaths[scene.RegionInfo.RegionID] = new List<string>();
@@ -841,7 +841,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
-            
+
              m_oarEvent.WaitOne(60000);
 
 
@@ -993,7 +993,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.Close();
 
-            
+
             // Delete the current objects, to test that they're loaded from the OAR and didn't
             // just remain in the scene.
             m_sceneHelpers.SceneManager.ForEachScene(delegate(Scene scene)
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastErrorMessage, Is.Null);
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
index 617c348..a450dd6 100644
--- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
+++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.CoreModules.World
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CloudModule")]
     public class CloudModule : ICloudModule, INonSharedRegionModule
     {
-//        private static readonly log4net.ILog m_log 
+//        private static readonly log4net.ILog m_log
 //            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private uint m_frame = 0;
         private int m_frameUpdateRate = 1000;
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World
                     columnRight = 0;
                     columnLeft = x - 1;
                 }
-                else 
+                else
                 {
                     columnRight = x + 1;
                     columnLeft = x - 1;
@@ -185,14 +185,14 @@ namespace OpenSim.Region.CoreModules.World
                         rowAbove = y + 1;
                         rowBelow = y - 1;
                     }
-                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] + 
-                                             cloudCover[y * 16 + columnLeft] + 
-                                             cloudCover[rowAbove * 16 + columnLeft] + 
-                                             cloudCover[rowBelow * 16 + x] + 
-                                             cloudCover[rowAbove * 16 + x] + 
-                                             cloudCover[rowBelow * 16 + columnRight] + 
-                                             cloudCover[y * 16 + columnRight] + 
-                                             cloudCover[rowAbove * 16 + columnRight] + 
+                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] +
+                                             cloudCover[y * 16 + columnLeft] +
+                                             cloudCover[rowAbove * 16 + columnLeft] +
+                                             cloudCover[rowBelow * 16 + x] +
+                                             cloudCover[rowAbove * 16 + x] +
+                                             cloudCover[rowBelow * 16 + columnRight] +
+                                             cloudCover[y * 16 + columnRight] +
+                                             cloudCover[rowAbove * 16 + columnRight] +
                                              cloudCover[y * 16 + x]) / 9;
                     newCover[y * 16 + x] = ((neighborAverage / m_cloudDensity) + 0.175f) % 1.0f;
                     newCover[y * 16 + x] *= m_cloudDensity;
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World
             Array.Copy(newCover, cloudCover, 16 * 16);
             m_dataVersion++;
         }
-  
+
         private void CloudUpdate()
         {
             if ((!m_ready ||  m_busy || m_cloudDensity == 0 ||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World
             }
         }
 
-       
+
         /// <summary>
         /// Calculate the cloud cover over the region.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index ad561fd..051ff71 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 foreach (Scene s in m_EstateModule.Scenes)
                 {
-                    RegionInfo sreg = s.RegionInfo;  
+                    RegionInfo sreg = s.RegionInfo;
                     if (regions.Contains(sreg.RegionID))
                     {
                         string url = sreg.ExternalHostName + ":" + sreg.HttpPort;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 702b503..7879f83 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -49,18 +49,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
     public class EstateManagementCommands
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected EstateManagementModule m_module;
 
         public EstateManagementCommands(EstateManagementModule module)
         {
             m_module = module;
         }
-        
+
         public void Initialise()
-        {            
+        {
 //            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
-            
+
             m_module.Scene.AddCommand("Regions", m_module, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
                                "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " +
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             m_module.Scene.AddCommand("Regions", m_module, "set water height",
                                "set water height <height> [<x>] [<y>]",
-                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + 
+                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " +
                                "Specify -1 in <x> or <y> to wildcard that coordinate.",
                                consoleSetWaterHeight);
 
             m_module.Scene.AddCommand(
                 "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand);
         }
-        
+
         public void Close() {}
 
         #region CommandHandlers
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected void consoleSetWaterHeight(string module, string[] args)
         {
             string heightstring = args[3];
-           
+
             int x = (args.Length > 4 ? int.Parse(args[4]) : -1);
             int y = (args.Length > 5 ? int.Parse(args[5]) : -1);
 
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " +
                                 string.Format(" {0}", selectedheight));
                     m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight;
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
+        }
         protected void consoleSetTerrainHeights(string module, string[] args)
         {
             string num = args[3];
@@ -198,31 +198,31 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
-        
+        }
+
         protected void ShowEstatesCommand(string module, string[] cmd)
         {
-            StringBuilder report = new StringBuilder();  
+            StringBuilder report = new StringBuilder();
             RegionInfo ri = m_module.Scene.RegionInfo;
             EstateSettings es = ri.EstateSettings;
-            
-            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);            
+
+            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);
             report.AppendFormat(
                 "{0,-20} {1,-7} {2,-20}\n",
                 "Estate Name",
                 "ID",
                 "Owner");
-            
+
             report.AppendFormat(
-                "{0,-20} {1,-7} {2,-20}\n", 
+                "{0,-20} {1,-7} {2,-20}\n",
                 es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner));
-            
+
             MainConsole.Instance.Output(report.ToString());
         }
         #endregion
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index efd4ca6..3c45b68 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
-        
-        protected EstateManagementCommands m_commands;                
+
+        protected EstateManagementCommands m_commands;
 
         /// <summary>
         /// If false, region restart requests from the client are blocked even if they are otherwise legitimate.
@@ -77,12 +77,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private int m_delayCount = 0;
 
         #region Region Module interface
-        
+
         public string Name { get { return "EstateManagementModule"; } }
-        
-        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(IConfigSource source) 
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void Initialise(IConfigSource source)
         {
             AllowRegionRestartFromClient = true;
 
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (config != null)
                 AllowRegionRestartFromClient = config.GetBoolean("AllowRegionRestartFromClient", true);
         }
-        
+
         public void AddRegion(Scene scene)
         {
             Scene = scene;
@@ -108,19 +108,19 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
             m_regionChangeTimer.AutoReset = false;
         }
-        
-        public void RemoveRegion(Scene scene) {}            
-        
+
+        public void RemoveRegion(Scene scene) {}
+
         public void RegionLoaded(Scene scene)
         {
             // Sets up the sun module based no the saved Estate and Region Settings
             // DO NOT REMOVE or the sun will stop working
             scene.TriggerEstateSunUpdate();
-            
-            UserManager = scene.RequestModuleInterface<IUserManagement>();            
+
+            UserManager = scene.RequestModuleInterface<IUserManagement>();
         }
 
-        public void Close() 
+        public void Close()
         {
             m_commands.Close();
         }
@@ -486,7 +486,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if((byte)maxAgents <= Scene.RegionInfo.AgentCapacity)
                 Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
-                        else
+            else
                 Scene.RegionInfo.RegionSettings.AgentLimit = Scene.RegionInfo.AgentCapacity;
 
             Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
@@ -640,7 +640,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
 
                 m_log.InfoFormat(
-                    "User {0} requested restart of region {1} in {2} seconds", 
+                    "User {0} requested restart of region {1} in {2} seconds",
                     remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
             }
         }
@@ -648,9 +648,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void handleChangeEstateCovenantRequest(IClientAPI remoteClient, UUID estateCovenantID)
         {
 //            m_log.DebugFormat(
-//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}", 
+//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}",
 //                remoteClient.Name, estateCovenantID);
-            
+
             Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID;
             Scene.RegionInfo.RegionSettings.CovenantChangedDateTime = Util.UnixTimeSinceEpoch();
             Scene.RegionInfo.RegionSettings.Save();
@@ -694,7 +694,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             }
         }
- 
+
         private void execDeltaRequests(object o)
         {
             IClientAPI remote_client;
@@ -720,23 +720,23 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if(!Scene.IsRunning)
                     break;
 
-                if(req == null) 
+                if(req == null)
                 {
                     if(changed.Count > 0)
                     {
                         foreach(EstateSettings est in changed.Values)
                             Scene.EstateDataService.StoreEstateSettings(est);
-                            
+
                         TriggerEstateInfoChange();
                     }
-                        
+
                     EstateSettings es = Scene.RegionInfo.EstateSettings;
                     foreach(KeyValuePair<IClientAPI,UUID> kvp in sendAllowedOrBanList)
                     {
                         IClientAPI cli = kvp.Key;
                         UUID invoive = kvp.Value;
                         cli.SendEstateList(invoive, (int)Constants.EstateAccessCodex.AllowedAccess, es.EstateAccess, es.EstateID);
-                        cli.SendBannedUserList(invoive, es.EstateBans, es.EstateID);                       
+                        cli.SendBannedUserList(invoive, es.EstateBans, es.EstateID);
                     }
                     sendAllowedOrBanList.Clear();
 
@@ -777,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 bool doOtherEstates = ((estateAccessType & 3) != 0);
 
                 EstateSettings thisSettings = Scene.RegionInfo.EstateSettings;
-                int thisEstateID =(int)thisSettings.EstateID; 
+                int thisEstateID =(int)thisSettings.EstateID;
 
                 UUID agentID = remote_client.AgentId;
 
@@ -811,7 +811,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     }
                     estateIDs.Clear();
                 }
-                
+
                 // the commands
                 // first the ones allowed for estate managers on this region
                 if ((estateAccessType & 4) != 0) // User add
@@ -1020,7 +1020,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                         }
                     }
-                    
+
                     if (alreadyInList && listitem != null)
                     {
                         if (doOtherEstates) // All estates
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                 if(!isadmin && !estateSettings.IsEstateOwner(agentID)) // redundante check?
                                     continue;
                                 if(estateSettings.EstateManagersCount() >= (int)Constants.EstateAccessLimits.EstateManagers)
-                                    continue;                           
+                                    continue;
                                 estateSettings.AddEstateManager(user);
                                 changed[(int)estateSettings.EstateID] = estateSettings;
                             }
@@ -1158,7 +1158,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
             IDialogModule dm = Scene.RequestModuleInterface<IDialogModule>();
-            
+
             if (dm != null)
                 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
         }
@@ -1249,7 +1249,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             });
         }
-        
+
         private void AbortTerrainXferHandler(IClientAPI remoteClient, ulong XferID)
         {
             lock (this)
@@ -1332,7 +1332,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if (TerrainUploader == null)
                 {
                     m_log.DebugFormat(
-                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}", 
+                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}",
                         Scene.Name, remote_client.Name);
 
                     TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
@@ -1352,7 +1352,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             // Save terrain here
             ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>();
-            
+
             if (terr != null)
             {
 //                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index fb4d04f..f3c8aa8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected List<Scene> m_Scenes = new List<Scene>();
         protected bool m_InInfoUpdate = false;
         private string token = "7db8eh2gvgg45jj";
-                protected bool m_enabled = false;
+        protected bool m_enabled = false;
 
         public bool InInfoUpdate
         {
@@ -74,19 +74,19 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IConfig estateConfig = config.Configs["Estates"];
             if (estateConfig != null)
             {
-                                if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
-                                        m_enabled = true;
-                                else
-                                        return;
+                if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
+                    m_enabled = true;
+                else
+                    return;
 
                 port = (uint)estateConfig.GetInt("Port", 0);
                 // this will need to came from somewhere else
                 token = estateConfig.GetString("Token", token);
             }
-                        else
-                        {
-                                m_enabled = true;
-                        }
+            else
+            {
+                m_enabled = true;
+            }
 
             m_EstateConnector = new EstateConnector(this, token, port);
 
@@ -108,8 +108,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void AddRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             lock (m_Scenes)
                 m_Scenes.Add(scene);
@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void RegionLoaded(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             IEstateModule em = scene.RequestModuleInterface<IEstateModule>();
 
@@ -131,8 +131,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void RemoveRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             lock (m_Scenes)
                 m_Scenes.Remove(scene);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 9de88d9..e4c0373 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public const int LAND_SELECT_OBJECTS_GROUP = 4;
         public const int LAND_SELECT_OBJECTS_OTHER = 8;
 
-        
+
         public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
         // types 1 to 7 are exclusive
         public const byte LAND_TYPE_OWNED_BY_OTHER = 1; //Equals 00000001
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         #endregion
 
         private readonly Scene m_scene;
-        private readonly LandManagementModule m_landManagementModule;        
+        private readonly LandManagementModule m_landManagementModule;
 
         public LandChannel(Scene scene, LandManagementModule landManagementMod)
         {
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x_float, y_float);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x, y);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             return new List<ILandObject>();
         }
-        
+
         public void Clear(bool setupDefaultParcel)
         {
             if (m_landManagementModule != null)
@@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landManagementModule.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
             }
         }
-        
+
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
             if (m_landManagementModule != null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 22bc49e..63b8de0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -52,7 +52,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.Land
 {
     // used for caching
-    internal class ExtendedLandData 
+    internal class ExtendedLandData
     {
         public LandData LandData;
         public ulong RegionHandle;
@@ -151,9 +151,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd;
             m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate;
-            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;            
+            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;
             m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate;
-            
+
             m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel;
             m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement;
             m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy;
@@ -163,14 +163,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement;
             m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage;
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
-            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
+            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
-           
+
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
             }
-            
+
             RegisterCommands();
         }
 
@@ -183,8 +183,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
-            // TODO: Release event manager listeners here      
+        {
+            // TODO: Release event manager listeners here
         }
 
 //        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 //            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
 //            reason = "You are not allowed to enter this sim.";
 //            return nearestParcel != null;
-//        }     
+//        }
 
         void EventManagerOnNewClient(IClientAPI client)
         {
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
             }
         }
-        
+
         /// <summary>
         /// Create a default parcel that spans the entire region and is owned by the estate owner.
         /// </summary>
@@ -360,7 +360,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     return false;
                 }
             }
-     
+
             if(ban)
             {
                 if (!forcedPosition.Contains(avatar.UUID))
@@ -581,13 +581,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Adds a land object to the stored list and adds them to the landIDList to what they own
         /// </summary>
         /// <param name="new_land">
-        /// The land object being added.  
+        /// The land object being added.
         /// Will return null if this overlaps with an existing parcel that has not had its bitmap adjusted.
         /// </param>
         public ILandObject AddLandObject(ILandObject land)
         {
             ILandObject new_land = land.Copy();
-            
+
             // Only now can we add the prim counts to the land object - we rely on the global ID which is generated
             // as a random UUID inside LandData initialization
             if (m_primCountModule != null)
@@ -607,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
                 else
                 {
-                    // If other land objects still believe that they occupy any parts of the same space, 
+                    // If other land objects still believe that they occupy any parts of the same space,
                     // then do not allow the add to proceed.
                     for (int x = 0; x < landBitmap.GetLength(0); x++)
                     {
@@ -642,7 +642,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             if (landBitmap[x, y])
                             {
                                 //                            m_log.DebugFormat(
-                                //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
+                                //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}",
                                 //                                new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
 
                                 m_landIDList[x, y] = newLandLocalID;
@@ -690,10 +690,10 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             m_scene.EventManager.TriggerLandObjectRemoved(land.LandData.GlobalID);
         }
-        
+
         /// <summary>
         /// Clear the scene of all parcels
-        /// </summary>        
+        /// </summary>
         public void Clear(bool setupDefaultParcel)
         {
             Dictionary<int, ILandObject> landworkList;
@@ -1077,7 +1077,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if(maxindex < 0 || selectedLandObjects.Count < 2)
                 return;
-            
+
             ILandObject masterLandObject = selectedLandObjects[maxindex];
             selectedLandObjects.RemoveAt(maxindex);
 
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                     if (currentParcelBlock != null)
                     {
-                        // types 
+                        // types
                         if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
                         {
                             //Owner Flag
@@ -1165,7 +1165,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         }
                         else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
                         {
-                            //Public type 
+                            //Public type
                             tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
                         }
                         // LAND_TYPE_IS_BEING_AUCTIONED still unsuported
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.GroupID = UUID.Zero;
                     land.LandData.IsGroupOwned = false;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-                    
+
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
                     UpdateLandObject(land.LandData.LocalID, land.LandData);
@@ -1584,7 +1584,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
 
-            new_land.SetLandBitmapFromByteArray();            
+            new_land.SetLandBitmapFromByteArray();
             AddLandObject(new_land);
 //            new_land.SendLandUpdateToAvatarsOverMe();
         }
@@ -1599,7 +1599,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     m_landList.TryGetValue(localID, out selectedParcel);
                 }
 
-                if (selectedParcel == null) 
+                if (selectedParcel == null)
                     return;
 
                 selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient);
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
         {
             IClientAPI client;
-            if (!m_scene.TryGetClient(agentID, out client)) 
+            if (!m_scene.TryGetClient(agentID, out client))
             {
                 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID);
                 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
@@ -1765,7 +1765,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land != null)
             {
-                UpdateLandProperties(land,land_update, client);               
+                UpdateLandProperties(land,land_update, client);
                 m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(land_update, parcelID, client);
             }
             else
@@ -2103,7 +2103,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             targetAvatar.TeleportWithMomentum(pos, null);
             targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
             parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-            
+
             if ((flags & 1) != 0) // Ban TODO: Remove magic number
             {
                 LandAccessEntry entry = new LandAccessEntry();
@@ -2144,7 +2144,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (// Required: local user; foreign users cannot set home
                 m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
                 (// (a) gods and land managers can set home
-                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) ||
                  m_scene.Permissions.IsGod(remoteClient.AgentId) ||
                  // (b) land owners can set home
                  remoteClient.AgentId == land.LandData.OwnerID ||
@@ -2196,8 +2196,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                 "If no local land ID is given, then summary information about all the parcels is shown.\n"
                     + "If a local land ID is given then full information about that parcel is shown.",
                 HandleShowCommand);
-        }    
-        
+        }
+
         protected void HandleClearCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
@@ -2205,9 +2205,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             string response = MainConsole.Instance.CmdPrompt(
                 string.Format(
-                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name), 
+                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name),
                 "n");
-            
+
             if (response.ToLower() == "y")
             {
                 Clear(true);
@@ -2217,14 +2217,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.Name);
             }
-        }        
-        
+        }
+
         protected void HandleShowCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
                 return;
 
-            StringBuilder report = new StringBuilder(); 
+            StringBuilder report = new StringBuilder();
 
             if (args.Length <= 2)
             {
@@ -2240,7 +2240,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 ILandObject lo;
 
                 lock (m_landList)
-                { 
+                {
                     if (!m_landList.TryGetValue(landLocalId, out lo))
                     {
                         MainConsole.Instance.OutputFormat("No parcel found with local ID {0}", landLocalId);
@@ -2265,7 +2265,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
-            
+
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
@@ -2316,7 +2316,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("GroupID", ld.GroupID);
 
             cdl.AddRow("Status", ld.Status);
-            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);           
+            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);
 
             cdl.AddRow("Landing Type", (LandingType)ld.LandingType);
             cdl.AddRow("User Location", ld.UserLocation);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 4cbc8b8..fc2282d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             return free;
         }
 
-        protected LandData m_landData;        
+        protected LandData m_landData;
         public LandData LandData
         {
             get { return m_landData; }
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 else if(testpos.Y >= maxy)
                     return null;  // will never get there
             }
-            
+
             while(!LandBitmap[(int)testpos.X, (int)testpos.Y])
             {
                 testpos += direction;
@@ -278,14 +278,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
                 LandBitmap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
 
-            LandData = new LandData(); 
+            LandData = new LandData();
             LandData.OwnerID = owner_id;
             if (is_group_owned)
                 LandData.GroupID = owner_id;
             else
                 LandData.GroupID = UUID.Zero;
             LandData.IsGroupOwned = is_group_owned;
-            
+
             m_scene.EventManager.OnFrame += OnFrame;
         }
 
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         #region Member Functions
 
         #region General Functions
-        
+
         /// <summary>
         /// Checks to see if this land object contains a point
         /// </summary>
@@ -373,12 +373,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 if(simMax > m_scene.RegionInfo.ObjectCapacity)
                     simMax = m_scene.RegionInfo.ObjectCapacity;
-                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}", 
+                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
                  //    LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax, LandData.SimwidePrims);
                 return simMax;
             }
         }
-        
+
         #endregion
 
         #region Packet Request Handling
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     needOverlay = true;
 
                 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-                return true; 
+                return true;
             }
             return false;
         }
@@ -720,11 +720,11 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if(sp==null || !sp.isNPC)
                 return true;
-            
+
             INPC npccli = (INPC)sp.ControllingClient;
             if(npccli== null)
                 return true;
-            
+
             UUID owner = npccli.Owner;
 
             if(owner == UUID.Zero)
@@ -898,7 +898,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             // update use lists flags
             // rights already checked or we wont be here
             uint parcelflags = newData.Flags;
-            
+
             if((flags & (uint)AccessList.Access) != 0)
                     parcelflags |= (uint)ParcelFlags.UseAccessList;
             if((flags & (uint)AccessList.Ban) != 0)
@@ -1024,7 +1024,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 LandData.AABBMin = new Vector3(tx, ty, 0f);
             else
                 LandData.AABBMin = new Vector3(tx, ty, (float)m_scene.Heightmap[tx, ty]);
-               
+
             max_x++;
             tx = max_x * landUnit;
             if (tx > regionSizeX)
@@ -1042,7 +1042,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 LandData.AABBMax = new Vector3(tx, ty, 0f);
             else
                 LandData.AABBMax = new Vector3(tx, ty, (float)m_scene.Heightmap[tx - 1, ty - 1]);
-                
+
             LandData.Area = tempArea * landUnit * landUnit;
         }
 
@@ -1073,7 +1073,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             return GetSquareLandBitmap(0, 0, (int)m_scene.RegionInfo.RegionSizeX, (int) m_scene.RegionInfo.RegionSizeY, true);
         }
-        
+
         public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true)
         {
             // Empty bitmap for the whole region
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
         /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt</param>
         /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
-        /// <returns>New parcel bitmap</returns>       
+        /// <returns>New parcel bitmap</returns>
         public bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax)
         {
             // get the size of the incoming bitmaps
@@ -1409,7 +1409,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 // Importing land parcel data from an OAR where the source region is a different size to the dest region requires us
                 // to make a LandBitmap that's not derived from the current region's size. We use the LandData.Bitmap size in bytes
                 // to figure out what the OAR's region dimensions are. (Is there a better way to get the src region x and y from the OAR?)
-                // This method assumes we always will have square regions 
+                // This method assumes we always will have square regions
 
                 bitmapLen = LandData.Bitmap.Length;
                 xLen = (int)Math.Abs(Math.Sqrt(bitmapLen * 8));
@@ -1550,9 +1550,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 lock (primsOverMe)
                 {
 //                    m_log.DebugFormat(
-//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region", 
+//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region",
 //                        remote_client.Name, primsOverMe.Count);
-                    
+
                     try
                     {
                         foreach (SceneObjectGroup obj in primsOverMe)
@@ -1593,7 +1593,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public Dictionary<UUID, int> GetLandObjectOwners()
         {
             Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();
-            
+
             lock (primsOverMe)
             {
                 try
@@ -1669,7 +1669,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
 //            m_log.DebugFormat(
 //                "[LAND OBJECT]: Request to return objects in {0} from {1}", LandData.Name, remote_client.Name);
-            
+
             Dictionary<UUID,List<SceneObjectGroup>> returns = new Dictionary<UUID,List<SceneObjectGroup>>();
 
             lock (primsOverMe)
@@ -1752,7 +1752,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddPrimOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Adding scene object {0} {1} over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Add(obj);
         }
@@ -1760,13 +1760,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void RemovePrimFromOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Removing scene object {0} {1} from over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Remove(obj);
         }
 
         #endregion
-        
+
         /// <summary>
         /// Set the media url for this land parcel
         /// </summary>
@@ -1777,7 +1777,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
             SendLandUpdateToAvatarsOverMe();
         }
-        
+
         /// <summary>
         /// Set the music url for this land parcel
         /// </summary>
@@ -1824,7 +1824,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 LandData.ParcelAccessList.Remove(entry);
                 ScenePresence presence;
-                
+
                 if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent))
                 {
                     ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 771fdd2..857f919 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -69,11 +69,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// For now, a simple simwide taint to get this up. Later parcel based
         /// taint to allow recounting a parcel if only ownership has changed
         /// without recounting the whole sim.
-        /// 
+        ///
         /// We start out tainted so that the first get call resets the various prim counts.
         /// </value>
         private bool m_Tainted = true;
-        
+
         private Object m_TaintLock = new Object();
 
         public Type ReplaceableInterface
@@ -88,10 +88,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddRegion(Scene scene)
         {
             m_Scene = scene;
-            
+
             m_Scene.RegisterModuleInterface<IPrimCountModule>(this);
 
-            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;            
+            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;
             m_Scene.EventManager.OnObjectBeingRemovedFromScene +=
                     OnObjectBeingRemovedFromScene;
             m_Scene.EventManager.OnParcelPrimCountTainted +=
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
+        {
         }
 
         public void Close()
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     AddObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", 
+//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted",
 //                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
@@ -140,16 +140,16 @@ namespace OpenSim.Region.CoreModules.World.Land
                     RemoveObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted", 
-//                        obj.Name, m_Scene.RegionInfo.RegionName);                
+//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted",
+//                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
 
         private void OnParcelPrimCountTainted()
         {
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);            
-            
+//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);
+
             lock (m_TaintLock)
                 m_Tainted = true;
         }
@@ -174,33 +174,33 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // NOTE: Call under Taint Lock
         private void AddObject(SceneObjectGroup obj)
-        {                       
+        {
             if (obj.IsAttachment)
                 return;
             if (((obj.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0))
-                return;                       
+                return;
 
             Vector3 pos = obj.AbsolutePosition;
             ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
-            
+
             // If for some reason there is no land object (perhaps the object is out of bounds) then we can't count it
             if (landObject == null)
             {
 //                m_log.WarnFormat(
-//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}", 
+//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}",
 //                    obj.Name, pos.X, pos.Y, m_Scene.RegionInfo.RegionName);
-                
+
                 return;
             }
-            
+
             LandData landData = landObject.LandData;
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}", 
-//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);                        
-            
+//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}",
+//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}", 
+//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}",
 //                obj.Name, obj.OwnerID, landData.OwnerID);
 
             ParcelCounts parcelCounts;
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 if (obj.IsSelected)
                 {
-                    parcelCounts.Selected += partCount;                
+                    parcelCounts.Selected += partCount;
                 }
                 else
                 {
@@ -244,8 +244,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         // NOTE: Call under Taint Lock
         private void RemoveObject(SceneObjectGroup obj)
         {
-//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);            
-            
+//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);
+
             // Currently this is being done by tainting the count instead.
         }
 
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
 //            m_log.DebugFormat(
 //                "[PRIM COUNT MODULE]: GetPrimCounts for parcel {0} in {1}", parcelID, m_Scene.RegionInfo.RegionName);
-            
+
             PrimCounts primCounts;
 
             lock (m_PrimCounts)
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             return primCounts;
         }
 
-        
+
         /// <summary>
         /// Get the number of prims on the parcel that are owned by the parcel owner.
         /// </summary>
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public int GetOwnerCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -286,11 +286,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Owner;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -298,11 +298,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that have been set to the group that owns the parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public int GetGroupCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -312,11 +312,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Group;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -324,11 +324,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that are not owned by the parcel owner or set to the parcel group.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>                
+        /// <returns></returns>
         public int GetOthersCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -338,23 +338,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Others;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the number of selected prims.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         public int GetSelectedCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -364,24 +364,24 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Selected;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the total count of owner, group and others prims on the parcel.
-        /// FIXME: Need to do selected prims once this is reimplemented.   
+        /// FIXME: Need to do selected prims once this is reimplemented.
         /// </summary>
         /// <param name="parcelID"></param>
         /// <returns></returns>
         public int GetTotalCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -396,28 +396,28 @@ namespace OpenSim.Region.CoreModules.World.Land
                     count += counts.Selected;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
-            return count;            
+
+            return count;
         }
 
         /// <summary>
         /// Get the number of prims that are in the entire simulator for the owner of this parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>              
+        /// <returns></returns>
         public int GetSimulatorCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
                     Recount();
-                
+
                 UUID owner;
                 if (m_OwnerMap.TryGetValue(parcelID, out owner))
                 {
@@ -426,11 +426,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                         count = val;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -439,11 +439,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="parcelID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>          
+        /// <returns></returns>
         public int GetUserCount(UUID parcelID, UUID userID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -459,9 +459,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
 
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}", 
+//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}",
 //                userID, parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -469,13 +469,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void Recount()
         {
 //            m_log.DebugFormat("[PRIM COUNT MODULE]: Recounting prims on {0}", m_Scene.RegionInfo.RegionName);
-            
+
             m_OwnerMap.Clear();
             m_SimwideCounts.Clear();
             m_ParcelCounts.Clear();
 
             List<ILandObject> land = m_Scene.LandChannel.AllParcels();
-            
+
             foreach (ILandObject l in land)
             {
                 LandData landData = l.LandData;
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_OwnerMap[landData.GlobalID] = landData.OwnerID;
                 m_SimwideCounts[landData.OwnerID] = 0;
 //                m_log.DebugFormat(
-//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}", 
+//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}",
 //                    landData.Name, m_Scene.RegionInfo.RegionName);
                 m_ParcelCounts[landData.GlobalID] = new ParcelCounts();
             }
@@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         m_PrimCounts.Remove(k);
                 }
             }
-            
+
             m_Tainted = false;
         }
     }
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetOthersCount(m_ParcelID);
             }
         }
-        
+
         public int Selected
         {
             get
@@ -549,7 +549,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetSelectedCount(m_ParcelID);
             }
         }
-        
+
         public int Total
         {
             get
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
index 4ed67f3..d6a3ded 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             // TODO: Should add asserts to check that land object was added properly.
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
             }
 
             {
@@ -88,8 +88,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
 
@@ -115,8 +115,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -149,8 +149,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
             Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
 
-            ILandObject loAtCoord2 
+            ILandObject loAtCoord2
                 = lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
             Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
             Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
@@ -198,8 +198,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
             }
 
             {
@@ -239,21 +239,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
 
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));
             }
 
             {
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 949acb6..0d8ece7 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -43,21 +43,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
     public class PrimCountModuleTests : OpenSimTestCase
     {
         protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
-        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");        
-        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");        
+        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");
+        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");
         protected TestScene m_scene;
         protected PrimCountModule m_pcm;
-        
+
         /// <summary>
         /// A parcel that covers the entire sim except for a 1 unit wide strip on the eastern side.
         /// </summary>
         protected ILandObject m_lo;
-        
+
         /// <summary>
         /// A parcel that covers just the eastern strip of the sim.
         /// </summary>
-        protected ILandObject m_lo2;        
-            
+        protected ILandObject m_lo2;
+
         [SetUp]
         public override void SetUp()
         {
@@ -65,24 +65,24 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             m_pcm = new PrimCountModule();
             LandManagementModule lmm = new LandManagementModule();
-            m_scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);             
-                        
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
+
             int xParcelDivider = (int)Constants.RegionSize - 1;
-            
+
             ILandObject lo = new LandObject(m_userId, false, m_scene);
             lo.LandData.Name = "m_lo";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, xParcelDivider, (int)Constants.RegionSize));
-            m_lo = lmm.AddLandObject(lo);          
-            
+            m_lo = lmm.AddLandObject(lo);
+
             ILandObject lo2 = new LandObject(m_userId, false, m_scene);
             lo2.SetLandBitmap(
                 lo2.GetSquareLandBitmap(xParcelDivider, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
             lo2.LandData.Name = "m_lo2";
             m_lo2 = lmm.AddLandObject(lo2);
-        } 
-        
+        }
+
         /// <summary>
         /// Test that counts before we do anything are correct.
         /// </summary>
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestInitialCounts()
         {
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -98,9 +98,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(0));              
-        }            
-        
+            Assert.That(pc.Simulator, Is.EqualTo(0));
+        }
+
         /// <summary>
         /// Test count after a parcel owner owned object is added.
         /// </summary>
@@ -108,13 +108,13 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestAddOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;         
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));            
-            
+            Assert.That(pc.Simulator, Is.EqualTo(3));
+
             // Add a second object and retest
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
             Assert.That(pc.Owner, Is.EqualTo(5));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(5));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(5));              
+            Assert.That(pc.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned copied object is added.
         /// </summary>
@@ -145,14 +145,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestCopyOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
+//            log4net.Config.XmlConfigurator.Configure();
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity); 
-            
+            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity);
+
             Assert.That(pc.Owner, Is.EqualTo(6));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(6));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(6));              
-        }     
-        
+            Assert.That(pc.Simulator, Is.EqualTo(6));
+        }
+
         /// <summary>
         /// Test that parcel counts update correctly when an object is moved between parcels, where that movement
         /// is not done directly by the user/
@@ -171,18 +171,18 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestMoveOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                                          
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
-            // Move the first scene object to the eastern strip parcel           
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
+            // Move the first scene object to the eastern strip parcel
             sog.AbsolutePosition = new Vector3(254, 2, 2);
-            
-            IPrimCounts pclo1 = m_lo.PrimCounts;         
-            
+
+            IPrimCounts pclo1 = m_lo.PrimCounts;
+
             Assert.That(pclo1.Owner, Is.EqualTo(2));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(2));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));                
-            
-            IPrimCounts pclo2 = m_lo2.PrimCounts;         
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
+            IPrimCounts pclo2 = m_lo2.PrimCounts;
+
             Assert.That(pclo2.Owner, Is.EqualTo(3));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -201,11 +201,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(3));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5)); 
-            
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
+
             // Now move it back again
-            sog.AbsolutePosition = new Vector3(2, 2, 2);   
-            
+            sog.AbsolutePosition = new Vector3(2, 2, 2);
+
             Assert.That(pclo1.Owner, Is.EqualTo(5));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(5));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));              
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
             Assert.That(pclo2.Owner, Is.EqualTo(0));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -222,9 +222,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(0));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5));             
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -233,14 +233,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(1));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -248,37 +248,37 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        } 
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestAddGroupObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-            
+//            log4net.Config.XmlConfigurator.Configure();
+
             m_lo.DeedToGroup(m_groupId);
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             sog.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(3));
             Assert.That(pc.Others, Is.EqualTo(0));
             Assert.That(pc.Total, Is.EqualTo(3));
             Assert.That(pc.Selected, Is.EqualTo(0));
-            
+
             // Is this desired behaviour?  Not totally sure.
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            
-            Assert.That(pc.Simulator, Is.EqualTo(3));             
+
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -287,19 +287,19 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             m_lo.DeedToGroup(m_groupId);
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             SceneObjectGroup sogToKeep = SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
-            sogToKeep.GroupID = m_groupId;            
+            sogToKeep.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sogToKeep, false);
-            
+
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(1));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -308,20 +308,20 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }        
-        
-        [Test]        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
+        [Test]
         public void TestAddOthersObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(3));
@@ -329,22 +329,22 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            Assert.That(pc.Simulator, Is.EqualTo(3));                          
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         [Test]
         public void TestRemoveOthersObject()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_otherUserId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_otherUserId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(1));
@@ -352,9 +352,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(1));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }           
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         /// <summary>
         /// Test the count is correct after is has been tainted.
         /// </summary>
@@ -363,12 +363,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
-            m_scene.AddNewSceneObject(sog, false); 
-            
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+            m_scene.AddNewSceneObject(sog, false);
+
             m_pcm.TaintPrimCount();
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -376,7 +376,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));              
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 1f2b7c4..b927cfa 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             string[] configSections = new string[] { "Map", "Startup" };
 
-            drawPrimVolume 
+            drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
-            textureTerrain 
+            textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
-            generateMaptiles 
+            generateMaptiles
                 = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles);
 
             if (generateMaptiles)
@@ -126,15 +126,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     catch (Exception)
                     {
                         m_log.ErrorFormat(
-                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 
+                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                         //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                         mapbmp = null;
                     }
 
-                    if (mapbmp != null) 
+                    if (mapbmp != null)
                         m_log.DebugFormat(
-                            "[MAPTILE]: Static map image texture file {0} found for {1}", 
+                            "[MAPTILE]: Static map image texture file {0} found for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                 }
             }
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             List<uint> z_localIDs = new List<uint>();
             Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
 
-            try 
+            try
             {
                 lock (objs)
                 {
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 0ec2053..4b3ee18 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             ManagedImage managedImage;
             Image image;
-            
+
             try
             {
                 if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 m_log.ErrorFormat("{0} OpenJpeg was unable to encode this.   Asset Data is empty for {1}", LogHeader, id);
             }
             return null;
-            
+
         }
 
         // Compute the average color of a texture.
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 46b0470..1070ae6 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
     public class MoapModule : INonSharedRegionModule, IMoapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public string Name { get { return "MoapModule"; } }
         public Type ReplaceableInterface { get { return null; } }
 
@@ -64,33 +64,33 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// Is this module enabled?
         /// </summary>
         protected bool m_isEnabled = true;
-        
+
         /// <summary>
         /// The scene to which this module is attached
         /// </summary>
         protected Scene m_scene;
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by agent.  Lock m_omCapUsers to manipulate.
         /// </summary>
         protected Dictionary<UUID, string> m_omCapUrls = new Dictionary<UUID, string>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omuCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by agent.  Lock m_omuCapUsers to manipulate
         /// </summary>
         protected Dictionary<UUID, string> m_omuCapUrls = new Dictionary<UUID, string>();
-        
-        public void Initialise(IConfigSource configSource) 
+
+        public void Initialise(IConfigSource configSource)
         {
             IConfig config = configSource.Configs["MediaOnAPrim"];
 
@@ -100,63 +100,63 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 //                m_log.Debug("[MOAP]: Initialised module.")l
         }
 
-        public void AddRegion(Scene scene) 
-        { 
+        public void AddRegion(Scene scene)
+        {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene = scene;
             m_scene.RegisterModuleInterface<IMoapModule>(this);
         }
 
         public void RemoveRegion(Scene scene) {}
 
-        public void RegionLoaded(Scene scene) 
+        public void RegionLoaded(Scene scene)
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy;
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy;
         }
-        
+
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat(
 //                "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID);
-            
+
             string omCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omCapUsers)
             {
                 m_omCapUsers[omCapUrl] = agentID;
                 m_omCapUrls[agentID] = omCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMedia",
                     new RestStreamHandler(
                         "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString()));
             }
-            
+
             string omuCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omuCapUsers)
             {
                 m_omuCapUsers[omuCapUrl] = agentID;
                 m_omuCapUrls[agentID] = omuCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMediaNavigate",
@@ -164,7 +164,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString()));
             }
         }
-        
+
         public void OnDeregisterCaps(UUID agentID, Caps caps)
         {
             lock (m_omCapUsers)
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omCapUrls.Remove(agentID);
                 m_omCapUsers.Remove(path);
             }
-            
+
             lock (m_omuCapUsers)
             {
                 string path = m_omuCapUrls[agentID];
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omuCapUsers.Remove(path);
             }
         }
-        
+
         protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
         {
             if (original.Shape.Media != null)
@@ -197,19 +197,19 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                             dupeMedia.Add(null);
                     }
                 }
-                
+
                 copy.Shape.Media = dupeMedia;
             }
         }
-            
+
         public MediaEntry GetMediaEntry(SceneObjectPart part, int face)
         {
             MediaEntry me = null;
-            
+
             CheckFaceParam(part, face);
-            
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
                 me = null;
@@ -218,17 +218,17 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             {
                 lock (media)
                     me = media[face];
-                
+
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
                 if (me != null)
                     me = MediaEntry.FromOSD(me.GetOSD());
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: GetMediaEntry for {0} face {1} found {2}", part.Name, face, me);
-            
+
             return me;
         }
-        
+
         /// <summary>
         /// Set the media entry on the face of the given part.
         /// </summary>
@@ -238,28 +238,28 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me)
         {
 //            m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face);
-            
+
             CheckFaceParam(part, face);
-            
+
             if (null == part.Shape.Media)
             {
                 if (me == null)
                     return;
-                else                            
+                else
                     part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
             }
 
             lock (part.Shape.Media)
-                part.Shape.Media[face] = me;                      
-            
+                part.Shape.Media[face] = me;
+
             UpdateMediaUrl(part, UUID.Zero);
-            
+
             SetPartMediaFlags(part, face, me != null);
-            
+
             part.ScheduleFullUpdate();
             part.TriggerScriptChangedEvent(Changed.MEDIA);
         }
-        
+
         /// <summary>
         /// Clear the media entry from the face of the given part.
         /// </summary>
@@ -267,9 +267,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// <param name="face"></param>
         public void ClearMediaEntry(SceneObjectPart part, int face)
         {
-            SetMediaEntry(part, face, null);            
+            SetMediaEntry(part, face, null);
         }
-        
+
         /// <summary>
         /// Set the media flags on the texture face of the given part.
         /// </summary>
@@ -284,9 +284,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             Primitive.TextureEntry te = part.Shape.Textures;
             Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
             teFace.MediaFlags = flag;
-            part.Shape.Textures = te;            
+            part.Shape.Textures = te;
         }
-        
+
         /// <summary>
         /// Sets or gets per face media textures.
         /// </summary>
@@ -300,11 +300,11 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request);
-         
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaMessage omm = new ObjectMediaMessage();
             omm.Deserialize(osd);
-            
+
             if (omm.Request is ObjectMediaRequest)
                 return HandleObjectMediaRequest(omm.Request as ObjectMediaRequest);
             else if (omm.Request is ObjectMediaUpdate)
@@ -312,10 +312,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 
             throw new Exception(
                 string.Format(
-                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}", 
+                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}",
                     omm.Request.GetType()));
         }
-        
+
         /// <summary>
         /// Handle a fetch request for media textures
         /// </summary>
@@ -324,36 +324,36 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaRequest(ObjectMediaRequest omr)
         {
             UUID primId = omr.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             ObjectMediaResponse resp = new ObjectMediaResponse();
-            
+
             resp.PrimID = primId;
-            
+
             lock (part.Shape.Media)
                 resp.FaceMedia = part.Shape.Media.ToArray();
-            
+
             resp.Version = part.MediaUrl;
-           
+
             string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize());
-            
+
 //            m_log.DebugFormat("[MOAP]: Got HandleObjectMediaRequestGet raw response is [{0}]", rawResp);
-            
+
             return rawResp;
         }
-        
+
         /// <summary>
         /// Handle an update of media textures.
         /// </summary>
@@ -363,46 +363,46 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaUpdate(string path, ObjectMediaUpdate omu)
         {
             UUID primId = omu.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId);
-//                       
+//
 //            for (int i = 0; i < omu.FaceMedia.Length; i++)
 //            {
 //                MediaEntry me = omu.FaceMedia[i];
 //                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
 //                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
 //            }
-            
+
             if (omu.FaceMedia.Length > part.GetNumberOfSides())
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.", 
+                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.",
                     omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omCapUsers)
-                agentId = m_omCapUsers[path]; 
-            
+                agentId = m_omCapUsers[path];
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
 //                m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name);
                 part.Shape.Media = new PrimitiveBaseShape.MediaList(omu.FaceMedia);
-                
+
                 for (int i = 0; i < omu.FaceMedia.Length; i++)
                 {
                     if (omu.FaceMedia[i] != null)
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         // directly.
                         SetPartMediaFlags(part, i, true);
 //                        m_log.DebugFormat(
-//                            "[MOAP]: Media flags for face {0} is {1}", 
+//                            "[MOAP]: Media flags for face {0} is {1}",
 //                            i, part.Shape.Textures.FaceTextures[i].MediaFlags);
                     }
                 }
@@ -420,15 +420,15 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             else
             {
 //                m_log.DebugFormat("[MOAP]: Setting existing media list for {0}", part.Name);
-                
-                // We need to go through the media textures one at a time to make sure that we have permission 
+
+                // We need to go through the media textures one at a time to make sure that we have permission
                 // to change them
-                
+
                 // FIXME: Race condition here since some other texture entry manipulator may overwrite/get
                 // overwritten.  Unfortunately, PrimitiveBaseShape does not allow us to change texture entry
                 // directly.
                 Primitive.TextureEntry te = part.Shape.Textures;
-                
+
                 lock (media)
                 {
                     for (int i = 0; i < media.Count; i++)
@@ -436,38 +436,38 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         if (m_scene.Permissions.CanControlPrimMedia(agentId, part.UUID, i))
                         {
                             media[i] = omu.FaceMedia[i];
-                            
+
                             // When a face is cleared this is done by setting the MediaFlags in the TextureEntry via a normal
                             // texture update, so we don't need to worry about clearing MediaFlags here.
                             if (null == media[i])
                                 continue;
-                            
+
                             SetPartMediaFlags(part, i, true);
-    
+
     //                        m_log.DebugFormat(
-    //                            "[MOAP]: Media flags for face {0} is {1}", 
+    //                            "[MOAP]: Media flags for face {0} is {1}",
     //                            i, face.MediaFlags);
     //                        m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name);
                         }
                     }
                 }
-                
+
                 part.Shape.Textures = te;
-                        
+
 //                for (int i2 = 0; i2 < part.Shape.Textures.FaceTextures.Length; i2++)
 //                    m_log.DebugFormat("[MOAP]: FaceTexture[{0}] is {1}", i2, part.Shape.Textures.FaceTextures[i2]);
             }
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
             // Arguably, we could avoid sending a full update to the avatar that just changed the texture.
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return string.Empty;
         }
-        
+
         /// <summary>
         /// Received from the viewer if a user has changed the url of a media texture.
         /// </summary>
@@ -481,71 +481,71 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request);
-            
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage();
             omn.Deserialize(osd);
-            
+
             UUID primId = omn.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omuCapUsers)
                 agentId = m_omuCapUsers[path];
-            
+
             if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face))
                 return string.Empty;
-            
+
 //            m_log.DebugFormat(
-//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", 
+//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}",
 //                omn.Face, part.Name, part.UUID, omn.URL);
-            
+
             // If media has never been set for this prim, then just return.
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             MediaEntry me = null;
-                
+
             lock (part.Shape.Media)
                 me = part.Shape.Media[omn.Face];
-            
+
             // Do the same if media has not been set up for a specific face
             if (null == me)
                 return string.Empty;
-            
+
             if (me.EnableWhiteList)
             {
                 if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList))
                 {
 //                    m_log.DebugFormat(
-//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", 
+//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist",
 //                        omn.Face, part.Name, part.UUID, omn.URL);
-                    
+
                     return string.Empty;
                 }
             }
-            
+
             me.CurrentURL = omn.URL;
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return OSDParser.SerializeLLSDXmlString(new OSD());
         }
-        
+
         /// <summary>
         /// Check that the face number is valid for the given prim.
         /// </summary>
@@ -555,13 +555,13 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         {
             if (face < 0)
                 throw new ArgumentException("Face cannot be less than zero");
-                               
+
             int maxFaces = part.GetNumberOfSides() - 1;
             if (face > maxFaces)
                 throw new ArgumentException(
                     string.Format("Face argument was {0} but max is {1}", face, maxFaces));
         }
-        
+
         /// <summary>
         /// Update the media url of the given part
         /// </summary>
@@ -583,10 +583,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 int version = int.Parse(rawVersion);
                 part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId);
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID);
         }
-        
+
         /// <summary>
         /// Check the given url against the given whitelist.
         /// </summary>
@@ -599,22 +599,22 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 return false;
 
             Uri url = new Uri(rawUrl);
-            
+
             foreach (string origWlUrl in whitelist)
             {
                 string wlUrl = origWlUrl;
-                
+
                 // Deal with a line-ending wildcard
                 if (wlUrl.EndsWith("*"))
                     wlUrl = wlUrl.Remove(wlUrl.Length - 1);
-                
+
 //                m_log.DebugFormat("[MOAP]: Checking whitelist URL pattern {0}", origWlUrl);
-                
+
                 // Handle a line starting wildcard slightly differently since this can only match the domain, not the path
                 if (wlUrl.StartsWith("*"))
                 {
                     wlUrl = wlUrl.Substring(1);
-                    
+
                     if (url.Host.Contains(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -624,7 +624,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 else
                 {
                     string urlToMatch = url.Authority + url.AbsolutePath;
-    
+
                     if (urlToMatch.StartsWith(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -632,7 +632,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                     }
                 }
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index ee57aed..7080705 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
     {
         protected TestScene m_scene;
         protected MoapModule m_module;
-            
+
         [SetUp]
         public override void SetUp()
         {
@@ -55,45 +55,45 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
 
             m_module = new MoapModule();
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, m_module);            
-        }        
-        
+            SceneHelpers.SetupSceneModules(m_scene, m_module);
+        }
+
         [Test]
         public void TestClearMediaUrl()
         {
-            TestHelpers.InMethod();           
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry();            
-            
+            MediaEntry me = new MediaEntry();
+
             m_module.SetMediaEntry(part, 1, me);
             m_module.ClearMediaEntry(part, 1);
-            
+
             Assert.That(part.Shape.Media[1], Is.EqualTo(null));
-            
+
             // Although we've cleared one face, other faces may still be present.  So we need to check for an
             // update media url version
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000001/" + UUID.Zero));
-            
+
             // By changing media flag to false, the face texture once again becomes identical to the DefaultTexture.
             // Therefore, when libOMV reserializes it, it disappears and we are left with no face texture in this slot.
             // Not at all confusing, eh?
             Assert.That(part.Shape.Textures.FaceTextures[1], Is.Null);
         }
-        
+
         [Test]
         public void TestSetMediaUrl()
         {
             TestHelpers.InMethod();
-            
-            string homeUrl = "opensimulator.org";            
-            
+
+            string homeUrl = "opensimulator.org";
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };            
-            
+            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };
+
             m_module.SetMediaEntry(part, 1, me);
-            
+
             Assert.That(part.Shape.Media[1].HomeURL, Is.EqualTo(homeUrl));
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000000/" + UUID.Zero));
             Assert.That(part.Shape.Textures.FaceTextures[1].MediaFlags, Is.True);
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 42141e4..b7f01be 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -49,34 +49,34 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
 
         protected Scene m_scene = null;
         protected IDialogModule m_dialogModule;
-        
+
         public string Name { get { return "Object BuySell Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IBuySellModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-        
-        public void RegionLoaded(Scene scene) 
+
+        public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
-        
+
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnObjectSaleInfo += ObjectSaleInfo;
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e53ab95..79c4713 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -53,30 +53,30 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")]
     public class ObjectCommandsModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
         private ICommandConsole m_console;
 
         public string Name { get { return "Object Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -539,13 +539,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName))
                 return;
-            
+
             using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8))
             {
                 xtw.Formatting = Formatting.Indented;
                 SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true);
             }
-            
+
             m_console.OutputFormat("Object dumped to file {0}", fileName);
         }
 
@@ -625,7 +625,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("FlexiSoftness", s.FlexiSoftness);
                 cdl.AddRow("HollowShape", s.HollowShape);
                 cdl.AddRow(
-                    "LightColor", 
+                    "LightColor",
                     string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA));
                 cdl.AddRow("LightCutoff", s.LightCutoff);
                 cdl.AddRow("LightEntry", s.LightEntry);
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("Rotation (World)", sop.GetWorldRotation());
                 cdl.AddRow("Scale", s.Scale);
                 cdl.AddRow(
-                    "SculptData", 
+                    "SculptData",
                     string.Format("{0} bytes", s.SculptData != null ? s.SculptData.Length.ToString() : "n/a"));
                 cdl.AddRow("SculptEntry", s.SculptEntry);
                 cdl.AddRow("SculptTexture", s.SculptTexture);
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
                 // TODO, need to display more information about textures but in a compact format
                 // to stop output becoming huge.
-                for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+                for (int i = 0; i < sop.GetNumberOfSides(); i++)
                 {
                     Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i];
 
@@ -765,12 +765,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.OwnerID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with owner {0}", match);
-        
+
                     break;
-        
+
                 case "creator":
                     if (!UUID.TryParse(o, out match))
                         return;
@@ -782,12 +782,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.RootPart.CreatorID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with creator {0}", match);
-        
+
                     break;
-        
+
                 case "id":
                     UUID uuid;
                     uint localId;
@@ -808,13 +808,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
-        
+
                     break;
-        
+
                 case "name":
                     deletes = GetDeleteCandidatesByName(module, cmd);
                     break;
-        
+
                 case "outside":
                     deletes = new List<SceneObjectGroup>();
 
@@ -822,7 +822,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     {
                         SceneObjectPart rootPart = g.RootPart;
                         bool delete = false;
-        
+
                         if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
                         {
                             delete = true;
@@ -831,18 +831,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         {
                             ILandObject parcel
                                 = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
-        
+
                             if (parcel == null || parcel.LandData.Name == "NO LAND")
                                 delete = true;
                         }
-        
+
                         if (delete && !g.IsAttachment && !deletes.Contains(g))
                             deletes.Add(g);
                     });
-        
+
                     if (deletes.Count == 0)
                         m_console.OutputFormat("No objects were found outside region bounds");
-        
+
                     break;
 
                 case "pos":
@@ -864,7 +864,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         "Are you sure that you want to delete {0} objects from {1}",
                         deletes.Count, m_scene.RegionInfo.RegionName),
                     "y/N");
-    
+
                 if (response.ToLower() != "y")
                 {
                     MainConsole.Instance.OutputFormat(
@@ -951,7 +951,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
                 endVector = Vector3.Zero;
-                
+
                 return false;
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 06900f0..1a61771 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
     public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         protected Scene m_scene;
         protected bool m_Enabled;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private uint PERM_MOVE = (uint)524288;
         private uint PERM_TRANS = (uint)8192;
         private uint PERM_LOCKED = (uint)540672;
-        
+
         /// <value>
         /// Different user set names that come in from the configuration file.
         /// </value>
@@ -110,17 +110,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private UserSet m_allowedScriptCreators = UserSet.All;
 
         /// <value>
-        /// The set of users that are allowed to edit (save) scripts.  This is only active if 
+        /// The set of users that are allowed to edit (save) scripts.  This is only active if
         /// permissions are not being bypassed.  This overrides normal permissions.-
         /// </value>
         private UserSet m_allowedScriptEditors = UserSet.All;
-        
+
         private Dictionary<string, bool> GrantLSL = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantCS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantVB = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantJS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantYP = new Dictionary<string, bool>();
-        
+
         private IFriendsModule m_friendsModule;
         private IFriendsModule FriendsModule
         {
@@ -169,20 +169,20 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_Enabled = true;
 
             m_allowGridGods = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
             m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_RegionOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
             m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
                 new string[] { "Startup", "Permissions" }, false);
 
             m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
 
             m_allowedScriptCreators
                 = ParseUserSetConfigSetting(config, "allowed_script_creators", m_allowedScriptCreators);
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
 
             grant = Util.GetConfigVarFromSections<string>(config, "GrantCS",
-                new string[] { "Startup", "Permissions" }, string.Empty); 
+                new string[] { "Startup", "Permissions" }, string.Empty);
             if (grant.Length > 0)
             {
                 foreach (string uuidl in grant.Split(','))
@@ -273,46 +273,46 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnIsAdministrator += IsAdministrator;
             m_scene.Permissions.OnIsEstateManager += IsEstateManager;
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnDeleteObject += CanDeleteObject; 
-            m_scene.Permissions.OnEditObject += CanEditObject; 
-            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties; 
+            m_scene.Permissions.OnDeleteObject += CanDeleteObject;
+            m_scene.Permissions.OnEditObject += CanEditObject;
+            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties;
             m_scene.Permissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; 
-            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; 
-            m_scene.Permissions.OnMoveObject += CanMoveObject; 
+            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer;
+            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand;
+            m_scene.Permissions.OnMoveObject += CanMoveObject;
             m_scene.Permissions.OnObjectEntry += CanObjectEntry;
-            m_scene.Permissions.OnReturnObjects += CanReturnObjects; 
-            m_scene.Permissions.OnRezObject += CanRezObject; 
+            m_scene.Permissions.OnReturnObjects += CanReturnObjects;
+            m_scene.Permissions.OnRezObject += CanRezObject;
             m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
-            m_scene.Permissions.OnRunScript += CanRunScript; 
+            m_scene.Permissions.OnRunScript += CanRunScript;
             m_scene.Permissions.OnCompileScript += CanCompileScript;
             m_scene.Permissions.OnSellParcel += CanSellParcel;
             m_scene.Permissions.OnTakeObject += CanTakeObject;
             m_scene.Permissions.OnSellGroupObject += CanSellGroupObject;
             m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
             m_scene.Permissions.OnTerraformLand += CanTerraformLand;
-            m_scene.Permissions.OnLinkObject += CanLinkObject; 
-            m_scene.Permissions.OnDelinkObject += CanDelinkObject; 
-            m_scene.Permissions.OnBuyLand += CanBuyLand; 
-            
-            m_scene.Permissions.OnViewNotecard += CanViewNotecard; 
-            m_scene.Permissions.OnViewScript += CanViewScript; 
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; 
-            m_scene.Permissions.OnEditScript += CanEditScript; 
-            
+            m_scene.Permissions.OnLinkObject += CanLinkObject;
+            m_scene.Permissions.OnDelinkObject += CanDelinkObject;
+            m_scene.Permissions.OnBuyLand += CanBuyLand;
+
+            m_scene.Permissions.OnViewNotecard += CanViewNotecard;
+            m_scene.Permissions.OnViewScript += CanViewScript;
+            m_scene.Permissions.OnEditNotecard += CanEditNotecard;
+            m_scene.Permissions.OnEditScript += CanEditScript;
+
             m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory;
             m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;
-            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; 
-            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; 
+            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory;
+            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory;
             m_scene.Permissions.OnResetScript += CanResetScript;
-            
-            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; 
-            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; 
-            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; 
-            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; 
-            
-            m_scene.Permissions.OnTeleport += CanTeleport; 
-            
+
+            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory;
+            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory;
+            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory;
+            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory;
+
+            m_scene.Permissions.OnTeleport += CanTeleport;
+
             m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
             m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
 
@@ -329,8 +329,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.AddCommand("Debug", this, "debug permissions",
                     "debug permissions <true / false>",
                     "Turn on permissions debugging",
-                    HandleDebugPermissions);                    
-                    
+                    HandleDebugPermissions);
+
         }
 
         public void RegionLoaded(Scene scene)
@@ -441,7 +441,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             m_scene.EventManager.TriggerPermissionError(user, reason);
         }
-        
+
         protected void DebugPermissionInformation(string permissionCalled)
         {
             if (m_debugPermissions)
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return false;
         }
-         
+
         /// <summary>
         /// Parse a user set configuration setting
         /// </summary>
@@ -483,28 +483,28 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             UserSet userSet = defaultValue;
 
-            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName, 
-                new string[] {"Startup", "Permissions"}, defaultValue.ToString()); 
-            
+            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName,
+                new string[] {"Startup", "Permissions"}, defaultValue.ToString());
+
             // Temporary measure to allow 'gods' to be specified in config for consistency's sake.  In the long term
             // this should disappear.
             if ("gods" == rawSetting.ToLower())
                 rawSetting = UserSet.Administrators.ToString();
-            
+
             // Doing it this was so that we can do a case insensitive conversion
             try
             {
                 userSet = (UserSet)Enum.Parse(typeof(UserSet), rawSetting, true);
             }
-            catch 
+            catch
             {
                 m_log.ErrorFormat(
                     "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}",
                     rawSetting, settingName, userSet);
             }
-            
+
             m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet);
-            
+
             return userSet;
         }
 
@@ -520,7 +520,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
                 return true;
-            
+
             if (IsEstateManager(user) && m_RegionManagerIsGod)
                 return true;
 
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         }
 
         protected bool IsFriendWithPerms(UUID user, UUID objectOwner)
-        {            
+        {
             if (user == UUID.Zero)
                 return false;
 
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         protected bool IsEstateManager(UUID user)
         {
             if (user == UUID.Zero) return false;
-        
+
             return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
         }
 
@@ -777,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // so just return true immediately and short circuit the more
                 // expensive group checks
                 return true;
-                
+
                 //permission = true;
             }
             else if (group.IsAttachment)
@@ -786,15 +786,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
 
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}", 
+//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}",
 //                group.GroupID,
-//                m_scene.GetSceneObjectPart(objId).GroupMask, 
-//                IsGroupMember(group.GroupID, currentUser, 0), 
+//                m_scene.GetSceneObjectPart(objId).GroupMask,
+//                IsGroupMember(group.GroupID, currentUser, 0),
 //                currentUser);
-            
+
             // Group members should be able to edit group objects
-            if ((group.GroupID != UUID.Zero) 
-                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0) 
+            if ((group.GroupID != UUID.Zero)
+                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0)
                 && IsGroupMember(group.GroupID, currentUser, 0))
             {
                 // Return immediately, so that the administrator can shares group objects
@@ -807,7 +807,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // Return immediately, so that the administrator can share objects with friends
                 return true;
             }
-        
+
             // Users should be able to edit what is over their land.
             ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
             if ((parcel != null) && (parcel.LandData.OwnerID == currentUser))
@@ -904,7 +904,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return permission;
         }
-    
+
         protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
         {
             if (parcel.LandData.OwnerID == user)
@@ -919,7 +919,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             {
                 return true;
             }
-    
+
             if (allowEstateManager && IsEstateManager(user))
             {
                 return true;
@@ -946,7 +946,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-        
+
             return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
         }
 
@@ -1007,7 +1007,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 //They can't even edit the object
                 return false;
             }
-        
+
             SceneObjectPart part = scene.GetSceneObjectPart(objectID);
             if (part == null)
                 return false;
@@ -1025,7 +1025,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if ((part.GroupMask & PERM_COPY) == 0)
                     return false;
             }
-        
+
             //If they can rez, they can duplicate
             return CanRezObject(objectCount, owner, objectPosition, scene);
         }
@@ -1074,10 +1074,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-                            
+
             if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
                 return false;
-            
+
             // Ordinarily, if you can view it, you can edit it
             // There is no viewing a no mod script
             //
@@ -1135,10 +1135,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
-            
+
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } 
+                }
                 else
                 {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
@@ -1572,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if ((so.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
                     permission = false;
             }
-            
+
             return permission;
         }
 
@@ -1662,7 +1662,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (part == null)
                     return false;
-            
+
                 if (part.OwnerID != user)
                 {
                     if (part.GroupID == UUID.Zero)
@@ -1670,11 +1670,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
-            
+
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } 
-                else 
+                }
+                else
                 {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                         return false;
@@ -1684,12 +1684,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (ti == null)
                     return false;
-            
+
                 if (ti.OwnerID != user)
                 {
                     if (ti.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(ti.GroupID, user, 0))
                         return false;
                 }
@@ -1746,12 +1746,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (part == null)
                     return false;
-            
+
                 if (part.OwnerID != user)
                 {
                     if (part.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
                 }
@@ -1768,7 +1768,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 {
                     if (ti.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(ti.GroupID, user, 0))
                         return false;
                 }
@@ -1863,7 +1863,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to create the given inventory type in their inventory.
         /// </summary>
@@ -1878,10 +1878,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if ((int)InventoryType.LSL == invType)
                 if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID))
                     return false;
-            
+
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to copy the given inventory type in their inventory.
         /// </summary>
@@ -1895,7 +1895,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
@@ -1909,7 +1909,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to delete the given inventory item from their own inventory.
         /// </summary>
@@ -1947,7 +1947,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericObjectPermission(agentID, prim, false);
         }
 
-        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene) 
+        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene)
         {
              //m_log.DebugFormat("check if {0} is allowed to compile {1}", ownerUUID, scriptType);
             switch (scriptType) {
@@ -1981,64 +1981,64 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
             return(false);
         }
-        
+
         private bool CanControlPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanControlPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
+//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}",
 //                agentID, primID, face, me.ControlPermissions);
-            
+
             return GenericObjectPermission(agentID, part.ParentGroup.UUID, true);
         }
-        
+
         private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanInteractWithPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
+//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}",
 //                agentID, primID, face, me.InteractPermissions);
-            
+
             return GenericPrimMediaPermission(part, agentID, me.InteractPermissions);
         }
-        
+
         private bool GenericPrimMediaPermission(SceneObjectPart part, UUID agentID, MediaPermission perms)
         {
 //            if (IsAdministrator(agentID))
 //                return true;
-            
+
             if ((perms & MediaPermission.Anyone) == MediaPermission.Anyone)
                 return true;
 
@@ -2047,13 +2047,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if (agentID == part.OwnerID)
                     return true;
             }
-            
+
             if ((perms & MediaPermission.Group) == MediaPermission.Group)
             {
                 if (IsGroupMember(part.GroupID, agentID, 0))
                     return true;
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index 411c4d6..49246a2 100644
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -54,24 +54,24 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         private ICommandConsole m_console;
 
         public string Name { get { return "Region Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -87,14 +87,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Regions", false, "show region",
                 "show region",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "A synonym for \"region get\"",
                 HandleShowRegion);
 
             m_console.Commands.AddCommand(
                 "Regions", false, "region get",
                 "region get",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "Some parameters can be set with the \"region set\" command.\n"
                 + "Others must be changed via a viewer (usually via the region/estate dialog box).",
                 HandleShowRegion);
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 MainConsole.Instance.OutputFormat("Usage: region set <param> <value>");
                 return;
-            }           
+            }
 
             string param = args[2];
             string rawValue = args[3];
@@ -225,7 +225,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 if (newValue > ri.AgentCapacity)
                 {
                     MainConsole.Instance.OutputFormat(
-                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit", 
+                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit",
                         newValue, m_scene.Name, ri.AgentCapacity);
                 }
                 else
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index e6a0205..8bac9e6 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -78,22 +78,22 @@ namespace OpenSim.Region.CoreModules.World.Region
                         scene.RegionInfo.RegionID.ToString()));
 
             m_Scene = scene;
-            
+
             scene.RegisterModuleInterface<IRestartModule>(this);
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart bluebox",
                     "region restart bluebox <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a dismissable bluebox notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart notice",
                     "region restart notice <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a transient notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart abort",
                     "region restart abort [<message>]",
@@ -183,7 +183,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 nextAlert = m_Alerts[1];
                 break;
             }
-            
+
             int currentAlert = m_Alerts[0];
 
             m_Alerts.RemoveAt(0);
@@ -242,7 +242,7 @@ namespace OpenSim.Region.CoreModules.World.Region
             else
             {
                 m_log.WarnFormat(
-                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval", 
+                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval",
                     intervalSeconds, m_Scene.Name);
             }
         }
@@ -286,7 +286,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 File.Delete(Path.Combine(m_MarkerPath,
                         m_Scene.RegionInfo.RegionID.ToString()));
         }
-        
+
         private void HandleRegionRestart(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene is Scene))
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0247d9..c9bc335 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SerialiserModule")]
     public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 //        private Commander m_commander = new Commander("export");
@@ -55,15 +55,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
 
         #region ISharedRegionModule Members
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["Serialiser"];
-            if (config != null) 
+            if (config != null)
             {
                 m_savedir = config.GetString("save_dir", m_savedir);
             }
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             SceneXmlLoader.SavePrimsToXml2(scene, stream, min, max);
         }
-        
+
         public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
         {
             SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a5bb1a7..c9e3141 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private const string ObjectRootPartStubXml = 
+        private const string ObjectRootPartStubXml =
 @"<SceneObjectGroup>
     <RootPart>
         <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -149,9 +149,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <llsd>
                     <map>
                         <key>MyNamespace</key>
-                        <map>                                
+                        <map>
                             <key>MyStore</key>
-                            <map>   
+                            <map>
                                 <key>the answer</key>
                                 <integer>42</integer>
                             </map>
@@ -162,12 +162,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         </SceneObjectPart>
     </RootPart>";
 
-        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
 @"
     <OtherParts />
 </SceneObjectGroup>";
 
-        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
 @"
   <OtherParts>
     <Part>
@@ -574,9 +574,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <llsd>
                         <map>
                             <key>MyNamespace</key>
-                            <map>                                
+                            <map>
                                 <key>MyStore</key>
-                                <map>   
+                                <map>
                                     <key>last words</key>
                                     <string>Rosebud</string>
                                 </map>
@@ -636,7 +636,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
                 OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
                 Assert.AreEqual(42, store["the answer"].AsInteger());
-            }                                    
+            }
 
             {
                 SceneObjectPart part = parts[1];
@@ -723,7 +723,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("RootPart");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -733,7 +733,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
@@ -833,7 +833,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -843,7 +843,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 45f3ccf..2b7db18 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -279,7 +279,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
             m_host.Sound = soundID;
             m_host.SoundGain = volume;
-            m_host.SoundFlags = iflags;      
+            m_host.SoundFlags = iflags;
             m_host.SoundRadius = radius;
 
             m_host.ScheduleFullUpdate();
@@ -309,14 +309,14 @@ namespace OpenSim.Region.CoreModules.World.Sound
             else
             {
                 byte bflags = 0;
-                
+
                 if (isMaster)
                     bflags |= (byte)SoundFlags.SYNC_MASTER;
                 // TODO check viewer seems to accept both
                 if (useMaster)
                     bflags |= (byte)SoundFlags.SYNC_SLAVE;
                 PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, bflags, radius);
-            } 
+            }
         }
 
         public void TriggerSoundLimited(UUID objectID, UUID sound,
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index d0318eb..e2b3487 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules
         // Number of virtual days to a virtual year
         private int    m_YearLengthDays           = 0;
 
-        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the 
+        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the
         // sun's orbit above the horizon
         private double m_HorizonShift = 0;
 
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules
                 // Determine the current "day" from current time, so we can use "today"
                 // to determine Seasonal Tilt and what'not
 
-                // Integer math rounded is on purpose to drop fractional day, determines number 
+                // Integer math rounded is on purpose to drop fractional day, determines number
                 // of virtual days since Epoch
                 PosTime = CurrentTime / SecondsPerSunCycle;
 
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules
             m_log.Debug("[SUN]: Positional data updated every " + m_UpdateInterval + " frames");
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules
                     client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
                 }
             }
-        }            
+        }
 
         public void SunUpdate()
         {
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules
 
                 while (sunFixedHour < 0)
                     sunFixedHour += 24;
-                
+
                 m_SunFixedHour = sunFixedHour;
                 m_SunFixed = fixedSun;
 
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules
 
                 case "current_time":
                     return GetCurrentTimeAsLindenSunHour();
-                
+
                 default:
                     throw new Exception("Unknown sun parameter.");
             }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 1e67f72..bcd9dcd 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -247,4 +247,4 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
     }
 }
 
-    
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 36c2bbf..d604dc7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -104,10 +104,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
             {
                 pallete = gradientmapLd.Height;
-    
+
                 bmp = new Bitmap(map.Width, map.Height);
                 colours = new Color[pallete];
-    
+
                 for (int i = 0; i < pallete; i++)
                 {
                     colours[i] = gradientmapLd.GetPixel(0, i);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index 59994e4..68d6ed2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -275,6 +275,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         public bool SupportsTileSave()
         {
             return false;
-        }       
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index 6324aca..f7be25f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainFloodEffect
     {
-        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength, 
+        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength,
             int startX, int endX, int startY, int endY);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index 3ba3657..855d131 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
     public interface ITerrainLoader
     {
         // Returns true if that extension can be used for terrain save-tile
-        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders) 
+        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders)
         bool SupportsTileSave();
 
         string FileExtension { get; }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 8937f63..9d3d4cb 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                     {
                         map[x, y] += delta;
                     }
- 
+
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index bbf9407..a88a022 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                             map[x, y] = 0.0;
                         else
                             map[x, y] = newz;
-                    } 
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index 1b704bb..5305cb4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     public class RaiseSphere : ITerrainPaintableEffect
     {
         #region ITerrainPaintableEffect Members
-        
+
 
         public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
             double strength, double duration, int startX, int endX, int startY, int endY)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index efc5324..ca30e9e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
             duration = 0.03; //MCP Should be read from ini file
- 
+
             if (duration > 1.0)
                 duration = 1.0;
             if (duration < 0)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 65dd0a6..0342962 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -42,10 +42,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
             int x, y;
             double[,] tweak = new double[map.Width,map.Height];
 
-            double area = strength; 
+            double area = strength;
             double step = strength / 4.0;
             duration = 0.03; //MCP Should be read from ini file
- 
+
 
             // compute delta map
             for (x = startX; x <= endX; x++)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index e21681d..65d4c4a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             if (terrainConfig != null)
             {
                 m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
-                m_sendTerrainUpdatesByViewDistance = 
+                m_sendTerrainUpdatesByViewDistance =
                     terrainConfig.GetBoolean(
                         "SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance);
             }
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     if(m_baked != null)
                         m_channel = m_baked.MakeCopy();
                     else
-                        m_channel = new TerrainChannel(m_InitialTerrain, 
+                        m_channel = new TerrainChannel(m_InitialTerrain,
                                                 (int)m_scene.RegionInfo.RegionSizeX,
                                                 (int)m_scene.RegionInfo.RegionSizeY,
                                                 (int)m_scene.RegionInfo.RegionSizeZ);
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
         }
 
-        public void LoadFromStream(string filename, Vector3 displacement, 
+        public void LoadFromStream(string filename, Vector3 displacement,
                                     float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream)
         {
             foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
@@ -724,7 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         /// <summary>
         /// Saves the current state of the region into the baked map buffer.
-        
+
         /// </summary>
         public void UpdateBakedMap()
         {
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
         }
 
-        
+
         /// <summary>
         /// This is used to check to see of any of the terrain is tainted and, if so, schedule
         /// updates for all the presences.
@@ -945,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             lock (m_perClientPatchUpdates)
                 m_perClientPatchUpdates.Remove(client);
         }
-        
+
         /// <summary>
         /// Scan over changes in the terrain and limit height changes. This enforces the
         ///     non-estate owner limits on rate of terrain editting.
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 }
             }
             return ret;
-        }   
+        }
 
         private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action,
                                             float north, float west, float south, float east, UUID agentId)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
index 0563ad0..6a832bc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
@@ -45,8 +45,8 @@ namespace OpenSim.Region.CoreModules.Terrain.Tests
             //UUID userId = TestHelpers.ParseTail(0x1);
 
             TerrainModule tm = new TerrainModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, tm);             
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, tm);
 
             // Fillheight of 30
             {
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 3f5d375..04b6f00 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VegetationModule")]
     public class VegetationModule : INonSharedRegionModule, IVegetationModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
+
         protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
         public PCode[] CreationCapabilities { get { return creationCapabilities; } }
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -83,10 +83,10 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
             treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
             treeShape.Scale = scale;
             treeShape.State = (byte)treeType;
-            
+
             return m_scene.AddNewPrim(uuid, groupID, position, rotation, treeShape);
         }
-        
+
         public SceneObjectGroup CreateEntity(
             UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
         {
@@ -95,22 +95,22 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
                 m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
                 return null;
             }
-            
+
             SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
             SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
-            
+
             // if grass or tree, make phantom
             //rootPart.TrimPermissions();
             rootPart.AddFlag(PrimFlags.Phantom);
             if (rootPart.Shape.PCode != (byte)PCode.Grass)
                 AdaptTree(ref shape);
-            
+
             m_scene.AddNewSceneObject(sceneObject, true);
             sceneObject.SetGroup(groupID, null);
-            
+
             return sceneObject;
         }
-        
+
         protected void AdaptTree(ref PrimitiveBaseShape tree)
         {
             // Tree size has to be adapted depending on its type
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
index 4719ba3..226b330 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float pctX = (float)x / 255f;
                     float pctY = (float)y / 255f;
 
-                    // Use bilinear interpolation between the four corners of start height and 
+                    // Use bilinear interpolation between the four corners of start height and
                     // height range to select the current values at this position
                     float startHeight = ImageUtils.Bilinear(
                         startHeights[0],
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float highFreq = Perlin.turbulence2(vec.X, vec.Y, 2f) * 2.25f;
                     float noise = (lowFreq + highFreq) * 2f;
 
-                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it 
+                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it
                     float layer = ((height + noise - startHeight) / heightRange) * 4f;
                     if (Single.IsNaN(layer))
                         layer = 0f;
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index cb37067..4934ebd 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -96,9 +96,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             m_Enabled = true;
 
-            m_drawPrimVolume 
+            m_drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, m_drawPrimVolume);
-            m_textureTerrain 
+            m_textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, m_textureTerrain);
             m_texturePrims
                 = Util.GetConfigVarFromSections<bool>(m_config, "TexturePrims", configSections, m_texturePrims);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                                        m_scene.RegionInfo.RegionSizeY * 0.5f - 0.5f);
 
             warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
-                        waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
+            waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
             waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
             renderer.Scene.addMaterial("WaterColor", waterColorMaterial);
             renderer.SetObjectMaterial("Water", "WaterColor");
@@ -292,7 +292,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             float regionsx = m_scene.RegionInfo.RegionSizeX;
             float regionsy = m_scene.RegionInfo.RegionSizeY;
-            
+
             // 'diff' is the difference in scale between the real region size and the size of terrain we're buiding
             float diff = regionsx / 256f;
 
@@ -377,7 +377,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             warp_Material material = new warp_Material(texture);
             material.setReflectivity(50);
             renderer.Scene.addMaterial("TerrainColor", material);
-                        renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
+            renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
             renderer.SetObjectMaterial("Terrain", "TerrainColor");
         }
 
@@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
                 if (!fetched)
                 {
-                    // Fetch the texture, decode and get the average color, 
+                    // Fetch the texture, decode and get the average color,
                     // then save it to a temporary metadata asset
                     AssetBase textureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
                     if (textureAsset != null)
@@ -616,7 +616,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 catch (Exception e)
                 {
                     m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception  ", id), e);
-                }                    
+                }
             }
 
             return ret;
@@ -678,10 +678,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     {
                         width = bitmap.Width;
                         height = bitmap.Height;
-    
+
                         BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, bitmap.PixelFormat);
                         pixelBytes = (bitmap.PixelFormat == PixelFormat.Format24bppRgb) ? 3 : 4;
-    
+
                         // Sum up the individual channels
                         unsafe
                         {
@@ -690,7 +690,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 65691fe..a2b44df 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
         private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
         private float m_varStrength = 5.0f; // Max Strength  Variance
         private float m_varDirection = 30.0f;// Max Direction Variance
-        private float m_rateChange = 1.0f; // 
+        private float m_rateChange = 1.0f; //
 
         private Vector2 m_curPredominateWind = new Vector2();
 
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public void Initialise()
         {
-            
+
         }
 
         #endregion
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             // Prevailing wind algorithm
             // Inspired by Kanker Greenacre
 
-            // TODO: 
+            // TODO:
             // * This should probably be based on in-world time.
             // * should probably move all these local variables to class members and constants
             double time = DateTime.Now.TimeOfDay.Seconds / 86400.0f;
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             offset = Math.Sin(theta) * Math.Sin(theta*4) + (Math.Sin(theta*13) / 3);
             double windSpeed = m_avgStrength + (m_varStrength * offset);
 
-            if (windSpeed < 0) 
+            if (windSpeed < 0)
                 windSpeed = -windSpeed;
 
             m_curPredominateWind.X = (float)Math.Cos(windDir);
@@ -157,9 +157,9 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public string Description
         {
-            get 
+            get
             {
-                return "Provides a predominate wind direction that can change within configured variances for direction and speed."; 
+                return "Provides a predominate wind direction that can change within configured variances for direction and speed.";
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 95cf57d..a1fff62 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules
             // Register event handlers for when Avatars enter the region, and frame ticks
             m_scene.EventManager.OnFrame += WindUpdate;
 
-            // Register the wind module 
+            // Register the wind module
             m_scene.RegisterModuleInterface<IWindModule>(this);
 
             // Generate initial wind values
@@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules
         #region IWindModule Methods
 
         /// <summary>
-        /// Retrieve the wind speed at the given region coordinate.  This 
+        /// Retrieve the wind speed at the given region coordinate.  This
         /// implimentation ignores Z.
         /// </summary>
         /// <param name="x">0...255</param>
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules
 
         public string WindActiveModelPluginName
         {
-            get 
+            get
             {
                 if (m_activeWindPlugin != null)
                 {
@@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules
                     {
                         client.SendWindData(m_dataVersion, windSpeeds);
                     });
-                
+
                 }
                 finally
                 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules
         }
 
         /// <summary>
-        /// Calculate new wind 
+        /// Calculate new wind
         /// returns false if no change
         /// </summary>
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index fb63c6a..5876df3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         //                remoteClient.SendAlertMessage("Hyperlink could not be established.");
 
                     //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
- 
+
                     MapBlockData data;
                     if (regionInfos != null && regionInfos.Count > 0)
                     {
@@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     // send extra user messages for V3
                     // because the UI is very confusing
                     // while we don't fix the hard-coded urls
-                    if (flags == 2) 
+                    if (flags == 2)
                     {
                         if (regionInfos == null || regionInfos.Count == 0)
                             remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index c249e9d..5dcf326 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private static readonly UUID STOP_UUID = UUID.Random();
 
         private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
-        
+
         private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false);
         private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
 
@@ -729,7 +729,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         break;
 
                     // agent gone?
-                    
+
                     m_scene.TryGetScenePresence(st.agentID, out av);
                     if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit)
                         continue;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         {
                             m_cachedRegionMapItemsResponses.TryGetValue(st.regionhandle, out responseMap);
                             dorequest = false;
-                        }                           
+                        }
                         else
                             m_cachedRegionMapItemsResponses.Add(st.regionhandle, null, expireResponsesTime); //  a bit more time for the access
                     }
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if(m_mapBlockRequests[agentID].Count < 150 )
                     m_mapBlockRequests[agentID].Enqueue(req);
                 else
-                { 
+                {
                     spamBlocked[agentID] = now + SPAMBLOCKTIMEms;
                     m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0);
                 }
@@ -1193,7 +1193,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 maxY * (int)Constants.RegionSize);
 
             // only send a negative answer for a single region request
-            // corresponding to a click on the map. Current viewers 
+            // corresponding to a click on the map. Current viewers
             // keep displaying "loading.." without this
             if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY)
             {
@@ -1539,7 +1539,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         responsemap["10"] = responsearr;
                     else
                     responsemap["7"] = responsearr;
-                }              
+                }
             }
 
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index e0aad2b..b8278d6 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces
         bool HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
                                                uint callbackID, string description, string name, sbyte invType,
                                                sbyte type, byte wearableType, uint nextOwnerMask);
-        
+
         void HandleTaskItemUpdateFromTransaction(
             IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item);
 
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index b008068..2f5ff9b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="sp"></param>
         /// <param name="rezlist"></param>
         void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist);
-            
+
         /// <summary>
         /// Detach the given item to the ground.
         /// </summary>
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="sp">/param>
         /// <param name="grp">The attachment to detach.</param>
         void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp);
-        
+
         /// Update the position of an attachment.
         /// </summary>
         /// <param name="sog"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
index d1ce4c0..1bbf10e 100644
--- a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IBuySellModule
-    { 
+    {
         /// <summary>
         /// Try to buy an object
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index 30d404e..761b1bb 100644
--- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -41,13 +41,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="agentId"></param>
         /// <param name="capsObjectPath"></param>
         void CreateCaps(UUID agentId, uint circuitCode);
-        
+
         /// <summary>
         /// Remove the caps handler for a given agent.
         /// </summary>
         /// <param name="agentId"></param>
         void RemoveCaps(UUID agentId, uint circuitCode);
-        
+
         /// <summary>
         /// Will return null if the agent doesn't have a caps handler registered
         /// </summary>
@@ -55,13 +55,13 @@ namespace OpenSim.Region.Framework.Interfaces
         Caps GetCapsForUser(uint circuitCode);
 
         void SetAgentCapsSeeds(AgentCircuitData agent);
-        
+
         Dictionary<ulong, string> GetChildrenSeeds(UUID agentID);
-        
+
         string GetChildSeed(UUID agentID, ulong handle);
-        
+
         void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds);
-        
+
         void DropChildSeed(UUID agentID, ulong handle);
 
         string GetCapsPath(UUID agentId);
diff --git a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs
index 54172bd..a73b564 100644
--- a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs
@@ -27,7 +27,7 @@
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface ICloudModule 
+    public interface ICloudModule
     {
         /// <summary>
         /// Retrieves the cloud density at the given region coordinates
diff --git a/OpenSim/Region/Framework/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs
index 6b872c1..5d6428a 100644
--- a/OpenSim/Region/Framework/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs
@@ -40,12 +40,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Provide general help information about this commander.
         /// </value>
         string Help { get; }
-        
+
         /// <summary>
         /// The commands available for this commander
         /// </summary>
         Dictionary<string, ICommand> Commands { get; }
-        
+
         void ProcessConsoleCommand(string function, string[] args);
         void RegisterCommand(string commandName, ICommand command);
         void Run(string function, object[] args);
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs
index 7684ce3..1ff8fd2 100644
--- a/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
     public abstract class FloaterData
     {
-        public abstract int Channel { get; } 
+        public abstract int Channel { get; }
         public abstract string FloaterName { get; set; }
         public virtual string XmlName { get; set; }
         public virtual string XmlText { get; set; }
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
index 6df5cc2..441076d 100644
--- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Framework.Interfaces
         UUID AddDynamicTextureData(
             UUID simID, UUID primID, string contentType, string data, string extraParams,
             int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face);
-        
+
         void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
                                out double xSize, out double ySize);
     }
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Interfaces
         bool AsyncConvertUrl(UUID id, string url, string extraParams);
         bool AsyncConvertData(UUID id, string bodyData, string extraParams);
 
-        void GetDrawStringSize(string text, string fontName, int fontSize, 
+        void GetDrawStringSize(string text, string fontName, int fontSize,
                                out double xSize, out double ySize);
     }
 
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
index c39627c..1df6486 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <returns></returns>
         PCode[] CreationCapabilities { get; }
-        
+
         /// <summary>
         /// Create an entity
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index b85fd8b..0c4017e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -36,8 +36,8 @@ namespace OpenSim.Region.Framework.Interfaces
     /// <summary>
     /// Interface to an entity's (SceneObjectPart's) inventory
     /// </summary>
-    /// 
-    /// This is not a finished 1.0 candidate interface 
+    ///
+    /// This is not a finished 1.0 candidate interface
     public interface IEntityInventory
     {
         /// <summary>
@@ -48,21 +48,21 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Reset UUIDs for all the items in the prim's inventory.
         /// </summary>
-        /// 
+        ///
         /// This involves either generating
         /// new ones or setting existing UUIDs to the correct parent UUIDs.
         ///
         /// If this method is called and there are inventory items, then we regard the inventory as having changed.
-        /// 
+        ///
         /// <param name="linkNum">Link number for the part</param>
         void ResetInventoryIDs();
 
         /// <summary>
         /// Reset parent object UUID for all the items in the prim's inventory.
         /// </summary>
-        /// 
+        ///
         /// If this method is called and there are inventory items, then we regard the inventory as having changed.
-        /// 
+        ///
         /// <param name="linkNum">Link number for the part</param>
         void ResetObjectID();
 
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="stateSource"></param>
         /// <returns>Number of scripts started.</returns>
         int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource);
-        
+
         ArrayList GetScriptErrors(UUID itemID);
         void ResumeScripts();
 
@@ -238,10 +238,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Get the scene object(s) referenced by an inventory item.
         /// </summary>
-        /// 
+        ///
         /// This is returned in a 'rez ready' state.  That is, name, description, permissions and other details have
         /// been adjusted to reflect the part and item from which it originates.
-        /// 
+        ///
         /// <param name="item">Inventory item</param>
         /// <param name="objlist">The scene objects</param>
         /// <param name="veclist">Relative offsets for each object</param>
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <returns></returns>
         List<UUID> GetInventoryList();
-        
+
         /// <summary>
         /// Get the xml representing the saved states of scripts in this inventory.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index d172780..9585082 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name='id'>The agent ID</para></param>
         /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns>
-        bool IsInTransit(UUID id);        
+        bool IsInTransit(UUID id);
 
         bool Cross(ScenePresence agent, bool isFlying);
 
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx,
                                         out Vector3 newpos, out string reason);
-                GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos);
+        GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos);
         bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, EntityTransferContext ctx, out string reason);
 
         bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent, bool removeScripts);
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 3f54ea5..7af56cb 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Interfaces
         // These are required to decouple Scenes from EventQueueHelper
         void DisableSimulator(ulong handle, UUID avatarID);
         void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY);
-        void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 
+        void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint,
                                          string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY);
-        void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+        void TeleportFinishEvent(ulong regionHandle, byte simAccess,
                                  IPEndPoint regionExternalEndPoint,
-                                 uint locationID, uint flags, string capsURL, 
+                                 uint locationID, uint flags, string capsURL,
                                  UUID agentID, int regionSizeX, int regionSizeY);
         void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                          IPEndPoint newRegionExternalEndPoint,
diff --git a/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
index a730cfd..4ce150f 100644
--- a/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// This function extends the simple URL configuration in the caps handlers
         /// to facilitate more interesting computation when an external handler is
-        /// sent to the viewer. 
+        /// sent to the viewer.
         /// </summary>
         /// <param name="agentID">New user UUID</param>
         /// <param name="caps">Internal caps registry, where the external handler will be registered</param>
diff --git a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
index 1cb9a30..52615e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="godLike"></param>
         /// <param name="controllingClient"></param>
         void RequestGodlikePowers(UUID agentID, UUID sessionID, UUID token, bool godLike);
-            
+
         /// <summary>
         /// Kicks User specified from the simulator.  This logs them off of the grid.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
index 7dc1552..46d6863 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
@@ -34,9 +34,9 @@ namespace OpenSim.Region.Framework.Interfaces
     /// <summary>
     /// Provide mechanisms for messaging groups.
     /// </summary>
-    /// 
+    ///
     /// TODO: Provide a mechanism for receiving group messages as well as sending them
-    /// 
+    ///
     public interface IGroupsMessagingModule
     {
         /// <summary>
@@ -56,13 +56,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// True if the chat session was started successfully, false otherwise.
         /// </returns>
         bool StartGroupChatSession(UUID agentID, UUID groupID);
-        
+
         /// <summary>
         /// Send a message to each member of a group whose chat session is active.
         /// </summary>
         /// <param name="im">
         /// The message itself.  The fields that must be populated are
-        /// 
+        ///
         /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical)
         /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog
         /// message - The message itself
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="im">
         /// The message itself.  The fields that must be populated are
-        /// 
+        ///
         /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical)
         /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog
         /// message - The message itself
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="groupID"></param>
         /// <param name="sendingAgentForGroupCalls">
-        /// The requesting agent to use when querying the groups service.  Sometimes this is different from 
+        /// The requesting agent to use when querying the groups service.  Sometimes this is different from
         /// im.fromAgentID, with group notices, for example.
         /// </param>
         /// <param name="sendCondition">
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index 110cb00..0d1f4f4 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="maturePublish"></param>
         /// <returns>The UUID of the created group</returns>
         UUID CreateGroup(
-            IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, 
+            IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee,
             bool openEnrollment, bool allowPublish, bool maturePublish);
 
         /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="GroupID">ID of the group</param>
         /// <returns>The group's data.  Null if there is no such group.</returns>
         GroupRecord GetGroupRecord(UUID GroupID);
-        
+
         void ActivateGroup(IClientAPI remoteClient, UUID groupID);
         List<GroupTitlesData> GroupTitlesRequest(IClientAPI remoteClient, UUID groupID);
         List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile);
 
         void GroupTitleUpdate(IClientAPI remoteClient, UUID GroupID, UUID TitleRoleID);
-        
+
         GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID GroupID);
         string GetGroupTitle(UUID avatarID);
         void GroupRoleUpdate(IClientAPI remoteClient, UUID GroupID, UUID RoleID, string name, string description, string title, ulong powers, byte updateType);
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index efc9ddc..978c248 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// then returned via IServiceRequest when the response is asynchronously fetched.
         /// </param>
         UUID StartHttpRequest(
-            uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, 
+            uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body,
             out HttpInitialRequestStatus status);
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
index 1a89721..86aca8e 100644
--- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors 
+ * Copyright (c) Contributors
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
         Array = 2,
         Value = 3
     }
-    
+
     public enum JsonStoreValueType
     {
         Undefined = 0,
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Interfaces
         String = 4,
         UUID = 5
     }
-    
+
     public struct JsonStoreStats
     {
         public int StoreCount;
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index 290b826..b06ff2b 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate void MessageResultNotification(bool success);
     public delegate void UndeliveredMessage(GridInstantMessage im);
-   
+
     public interface IMessageTransferModule
     {
         event UndeliveredMessage OnUndeliveredMessage;
diff --git a/OpenSim/Region/Framework/Interfaces/IMoapModule.cs b/OpenSim/Region/Framework/Interfaces/IMoapModule.cs
index 1d3d240..e8be70f 100644
--- a/OpenSim/Region/Framework/Interfaces/IMoapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMoapModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="face"></param>
         /// <returns></returns>
         MediaEntry GetMediaEntry(SceneObjectPart part, int face);
-        
+
         /// <summary>
         /// Set the media entry for a given prim face.
         /// </summary>
@@ -53,13 +53,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="face"></param>
         /// <param name="me"></param>
         void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me);
-        
+
         /// <summary>
         /// Clear the media entry for a given prim face.
         /// </summary>
-        /// 
+        ///
         /// This is the equivalent of setting a media entry of null
-        /// 
+        ///
         /// <param name="part"></param>
         /// <param name="face">/param>
         void ClearMediaEntry(SceneObjectPart part, int face);
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index 813be4f..df872f4 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Interfaces
     /// </summary>
     public interface INPC
     {
-        
+
         /// <summary>
         /// Should this NPC be sensed by LSL sensors as an 'agent'
         /// (interpreted here to mean a normal user) rather than an OpenSim
@@ -301,7 +301,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// agent, the agent is unowned  or the agent was not an NPC.
         /// </returns>
         UUID GetOwner(UUID agentID);
- 
+
         NPCOptionsFlags NPCOptionFlags {get;}
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs b/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs
index 1ed978b..933ca14 100644
--- a/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPermissionsModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
     public interface IPermissionsModule
     {
-        
+
         /// <summary>
         /// Returns the type of permissions that the user has over an object.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index d44c1e1..fb5933c 100644
--- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         public string UserID;
         public UUID RegionID;
-        
+
         public PresenceInfo(string userID, UUID regionID)
         {
             UserID = userID;
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 99bc87d..9370ccd 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -40,17 +40,17 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         void HandleLoadOarConsoleCommand(string module, string[] cmdparams);
         void HandleSaveOarConsoleCommand(string module, string[] cmdparams);
-            
+
         /// <summary>
         /// Archive the region to the given path
         /// </summary>
-        /// 
+        ///
         /// This method occurs asynchronously.  If you want notification of when it has completed then subscribe to
         /// the EventManager.OnOarFileSaved event.
-        /// 
+        ///
         /// <param name="savePath"></param>
         void ArchiveRegion(string savePath, Dictionary<string, object> options);
-        
+
         /// <summary>
         /// Archive the region to the given path
         /// </summary>
@@ -94,35 +94,35 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </remarks>
         /// <param name="loadPath"></param>
         void DearchiveRegion(string loadPath);
-        
+
         /// <summary>
         /// Dearchive the given region archive.  This replaces the existing scene.
         /// </summary>
-        /// 
+        ///
         /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
-        /// 
+        ///
         /// <param name="loadPath"></param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
         /// <param name="options">
         /// Dictionary of options.
         /// </param>
         void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options);
-        
+
         /// <summary>
-        /// Dearchive a region from a stream.  This replaces the existing scene. 
+        /// Dearchive a region from a stream.  This replaces the existing scene.
         /// </summary>
-        /// 
+        ///
         /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
-        /// 
+        ///
         /// <param name="loadStream"></param>
         void DearchiveRegion(Stream loadStream);
-        
+
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene.
         /// </summary>
-        /// 
+        ///
         /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
-        /// 
+        ///
         /// <param name="loadStream"></param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
         /// <param name="options">
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 2089bce..5b8f0f0 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// this will be multiple times in one instance, while a nonshared
         /// module instance will only be called once.
         /// This method is called after AddRegion has been called in all
-        /// modules for that scene, providing an opportunity to request 
+        /// modules for that scene, providing an opportunity to request
         /// another module's interface, or hook an event from another module.
         /// </summary>
         /// <param name="scene">
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index c5b21a8..60586ff 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -102,9 +102,9 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="min"></param>
         /// <param name="max"></param>
         void SavePrimListToXml2(EntityBase[] entityList, TextWriter stream, Vector3 min, Vector3 max);
-        
+
         void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName);
-            
+
         /// <summary>
         /// Deserializes a scene object from its xml2 representation.  This does not load the object into the scene.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 8536db0..19ba787 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Dispose the database
         /// </summary>
         void Dispose();
-        
+
         /// <summary>
         /// Stores all object's details apart from inventory
         /// </summary>
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         // Legacy version kept for downward compabibility
         void StoreTerrain(double[,] terrain, UUID regionID);
-        
+
         /// <summary>
         /// Load terrain from region storage
         /// </summary>
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Interfaces
         double[,] LoadTerrain(UUID regionID);
 
         void StoreLandObject(ILandObject Parcel);
-        
+
         /// <summary>
         /// <list type="bullet">
         /// <item>delete from land where UUID=globalID</item>
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="globalID"></param>
         void RemoveLandObject(UUID globalID);
-        
+
         List<LandData> LoadLandObjects(UUID regionUUID);
 
         void StoreRegionSettings(RegionSettings rs);
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
index f805863..10f421b 100644
--- a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
@@ -35,9 +35,9 @@ public interface ISnmpModule
     void Major(string Message, Scene scene);
     void ColdStart(int step , Scene scene);
     void Shutdown(int step , Scene scene);
-        //
-        // Node Start/stop events
-        //
+    //
+    // Node Start/stop events
+    //
     void LinkUp(Scene scene);
     void LinkDown(Scene scene);
     void BootInfo(string data, Scene scene);
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 2d33f51..3fc5ce7 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// This call causes all the terrain patches to be sent to the client.
         /// </summary>
         void PushTerrain(IClientAPI pClient);
-     
+
         /// <summary>
         /// Load a terrain from a stream.
         /// </summary>
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
         void LoadFromStream(string filename, Vector3 displacement,
                                 float radianRotation, Vector2 rotationDisplacement, Stream stream);
-        void LoadFromStream(string filename, Vector3 displacement, 
+        void LoadFromStream(string filename, Vector3 displacement,
                                 float rotationDegress, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream);
         /// <summary>
         /// Save a terrain to a stream.
diff --git a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
index 2987184..3fc0c44 100644
--- a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void ReleaseURL(string url);
         void HttpResponse(UUID request, int status, string body);
         void HttpContentType(UUID request, string type);
-        
+
         string GetHttpHeader(UUID request, string header);
         int GetFreeUrls();
 
diff --git a/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs
index 2e555fa..2fe7454 100644
--- a/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVoiceModule.cs
@@ -40,6 +40,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// This is used by osSetParcelSIPAddress
         /// </summary>
         void setLandSIPAddress(string SIPAddress,UUID GlobalID);
-        
+
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 4a26a71..424df87 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IWindModule : INonSharedRegionModule
     {
-        
+
         /// <summary>
         /// Retrieves the current wind speed at the given Region Coordinates
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index d76a0d7..3da4130 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <returns>ListenerInfo with filter filled in</returns>
         IWorldCommListenerInfo GetNextMessage();
-        
+
         void ListenControl(UUID itemID, int handle, int active);
         void ListenRemove(UUID itemID, int handle);
         void DeleteListener(UUID itemID);
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index a6965ba..f91dfd3 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/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.Region.Framework")]
@@ -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)]
 
@@ -27,7 +27,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/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index eb1a970..4d350dd 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -48,16 +48,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation();
         private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>();
 
-        public OpenSim.Framework.Animation DefaultAnimation 
+        public OpenSim.Framework.Animation DefaultAnimation
         {
-            get { return m_defaultAnimation; } 
+            get { return m_defaultAnimation; }
         }
-        
-        public OpenSim.Framework.Animation ImplicitDefaultAnimation 
+
+        public OpenSim.Framework.Animation ImplicitDefaultAnimation
         {
-            get { return m_implicitDefaultAnimation; } 
+            get { return m_implicitDefaultAnimation; }
         }
-        
+
         public AnimationSet()
         {
             ResetDefaultAnimation();
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         /// <param name='animID'></param>
         /// <param name='allowNoDefault'>
-        /// If true, then the default animation can be entirely removed. 
+        /// If true, then the default animation can be entirely removed.
         /// If false, then removing the default animation will reset it to the simulator default (currently STAND).
         /// </param>
         public bool Remove(UUID animID, bool allowNoDefault)
@@ -215,9 +215,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 foreach (OpenSim.Framework.Animation anim in m_animations)
                     theArray[i++] = anim;
             }
-            catch 
+            catch
             {
-                /* S%^t happens. Ignore. */ 
+                /* S%^t happens. Ignore. */
             }
             return theArray;
         }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
index b3b38b2..def993f 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
@@ -33,8 +33,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 {
     /// <summary>
     /// Written to decode and encode a binary animation asset.
-    /// The SecondLife Client reads in a BVH file and converts 
-    /// it to the format described here.  This isn't 
+    /// The SecondLife Client reads in a BVH file and converts
+    /// it to the format described here.  This isn't
     /// </summary>
     public class BinBVHAnimation
     {
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// Contains an array of joints
         /// </summary>
         public binBVHJoint[] Joints;
-        
+
 
         public byte[] ToBytes()
         {
@@ -136,14 +136,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     Joints[i].WriteBytesToStream(iostream, InPoint, OutPoint);
                 }
                 iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(0)));
-            
+
                 using (MemoryStream ms2 = (MemoryStream)iostream.BaseStream)
                     outputbytes = ms2.ToArray();
             }
 
             return outputbytes;
         }
-        
+
         public BinBVHAnimation()
         {
             rotationkeys = 0;
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             EaseOutTime = 0;
             HandPose = 1;
             m_jointCount = 0;
-            
+
             Joints = new binBVHJoint[1];
             Joints[0] = new binBVHJoint();
             Joints[0].Name = "mPelvis";
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             Joints[0].positionkeys[0].key_element.X = ((float)rnd.NextDouble() * 2 - 1);
             Joints[0].positionkeys[0].key_element.Y = ((float)rnd.NextDouble() * 2 - 1);
             Joints[0].positionkeys[0].key_element.Z = ((float)rnd.NextDouble() * 2 - 1);
-            
+
 
         }
 
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             }
         }
 
-        
+
         /// <summary>
         /// Variable length strings seem to be null terminated in the animation asset..    but..
         /// use with caution, home grown.
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// <returns>The Joint data serialized into the binBVHJoint structure</returns>
         private binBVHJoint readJoint(byte[] data, ref int i)
         {
-           
+
             binBVHJointKey[] positions;
             binBVHJointKey[] rotations;
 
@@ -312,14 +312,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             pJoint.Name = ReadBytesUntilNull(data, ref i); // Joint name
 
-            /* 
+            /*
                  2 <- Priority Revisited
                  0
                  0
                  0
             */
 
-            /* 
+            /*
                 5 <-- 5 keyframes
                 0
                 0
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 ... 5 Keyframe data blocks
             */
 
-            /* 
+            /*
                 2 <-- 2 keyframes
                 0
                 0
@@ -428,8 +428,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             }
             return m_keys;
         }
-    
-       
+
+
 
     }
     /// <summary>
@@ -443,7 +443,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public string Name;
 
         /// <summary>
-        /// Joint Animation Override?   Was the same as the Priority in testing.. 
+        /// Joint Animation Override?   Was the same as the Priority in testing..
         /// </summary>
         public int Priority;
 
@@ -523,7 +523,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
     public static class BinBVHUtil
     {
         public const float ONE_OVER_U16_MAX = 1.0f / UInt16.MaxValue;
-       
+
         public static UInt16 FloatToUInt16(float val, float lower, float upper)
         {
             UInt16 uival = 0;
@@ -536,7 +536,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             {
                 upper -= lower;
                 val = val - lower;
-                
+
                 // start with 500 upper and 200 lower..    subtract 200 from the upper and the value
             }
             else //if (lower < 0 && upper > 0)
@@ -558,8 +558,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             return uival;
         }
-        
-        
+
+
         /// <summary>
         /// Endian Swap
         /// Swaps endianness if necessary
@@ -590,7 +590,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 output[i] = Convert.ToByte(chr[i]);
 
             }
-            
+
             output[i] = Convert.ToByte('\0');
             return output;
         }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index b79dd8f..b8db3a9 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         private static void LoadAnimations(string path)
         {
 //            Dictionary<string, UUID> animations = new Dictionary<string, UUID>();
-            
+
             using (XmlTextReader reader = new XmlTextReader(path))
             {
                 XmlDocument doc = new XmlDocument();
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 13d4562..6b31555 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         /// <param name='animID'></param>
         /// <param name='allowNoDefault'>
-        /// If true, then the default animation can be entirely removed. 
+        /// If true, then the default animation can be entirely removed.
         /// If false, then removing the default animation will reset it to the simulator default (currently STAND).
         /// </param>
         public void RemoveAnimation(UUID animID, bool allowNoDefault)
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// that are mutually exclusive, e.g. flying and sitting.
         /// </summary>
         /// <returns>'true' if the animation was updated</returns>
-        /// 
+        ///
 
 
 
@@ -488,7 +488,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 m_animTickLand = Environment.TickCount;
                 // TODO: SOFT_LAND support
                 float fallVsq = m_lastFallVelocity * m_lastFallVelocity;
-                if (fallVsq > 300f) // aprox 20*h 
+                if (fallVsq > 300f) // aprox 20*h
                     return "STANDUP";
                 else if (fallVsq > 160f)
                     return "SOFT_LAND";
diff --git a/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs b/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs
index 4362e28..c874fdb 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs
@@ -144,10 +144,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                    "[ASYNC INVENTORY SENDER]: Handling request from {0} for {1} on queue", fh.Client.Name, fh.ItemID);
 
                 InventoryItemBase item = m_scene.InventoryService.GetItem(fh.Client.AgentId, fh.ItemID);
-    
+
                 if (item != null)
                     fh.Client.SendInventoryItemDetails(item.Owner, item);
-    
+
                  // TODO: Possibly log any failure
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 11a0146..7509686 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -44,29 +44,29 @@ namespace OpenSim.Region.Framework.Scenes
         public UUID folderID;
         public bool permissionToDelete;
     }
-    
+
     /// <summary>
-    /// Asynchronously derez objects.  This is used to derez large number of objects to inventory without holding 
+    /// Asynchronously derez objects.  This is used to derez large number of objects to inventory without holding
     /// up the main client thread.
     /// </summary>
     public class AsyncSceneObjectGroupDeleter
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <value>
         /// Is the deleter currently enabled?
         /// </value>
         public bool Enabled;
-        
+
         private Timer m_inventoryTicker = new Timer(2000);
         private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>();
         private Scene m_scene;
-        
+
         public AsyncSceneObjectGroupDeleter(Scene scene)
         {
             m_scene = scene;
-            
+
             m_inventoryTicker.AutoReset = false;
             m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
         }
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Delete the given object from the scene
         /// </summary>
         public void DeleteToInventory(DeRezAction action, UUID folderID,
-                List<SceneObjectGroup> objectGroups, IClientAPI remoteClient, 
+                List<SceneObjectGroup> objectGroups, IClientAPI remoteClient,
                 bool permissionToDelete)
         {
             if (Enabled)
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (Enabled)
                 lock (m_inventoryTicker)
                     m_inventoryTicker.Start();
-        
+
             // Visually remove it, even if it isnt really gone yet.  This means that if we crash before the object
             // has gone to inventory, it will reappear in the region again on restart instead of being lost.
             // This is not ideal since the object will still be available for manipulation when it should be, but it's
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes
                     g.DeleteGroupFromScene(false);
             }
         }
-        
+
         private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
         {
 //            m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop");
@@ -116,8 +116,8 @@ namespace OpenSim.Region.Framework.Scenes
             // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved
             // in a culture where decimal points are commas and then reloaded in a culture which just treats them as
             // number seperators.
-            Culture.SetCurrentCulture();            
-            
+            Culture.SetCurrentCulture();
+
             while (InventoryDeQueueAndDelete())
             {
                 //m_log.Debug("[ASYNC DELETER]: Sent item successfully to inventory, continuing...");
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool InventoryDeQueueAndDelete()
         {
             DeleteToInventoryHolder x = null;
- 
+
             try
             {
                 lock (m_inventoryDeletes)
@@ -144,13 +144,13 @@ namespace OpenSim.Region.Framework.Scenes
 //                        m_log.DebugFormat(
 //                            "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.",
 //                            left, x.action, x.objectGroups.Count);
-                        
+
                         try
                         {
                             IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
                             if (invAccess != null)
                                 invAccess.CopyToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient, false);
-                            
+
                             if (x.permissionToDelete)
                             {
                                 foreach (SceneObjectGroup g in x.objectGroups)
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Framework.Scenes
                             m_log.ErrorFormat(
                                 "[ASYNC DELETER]: Exception background sending object: {0}{1}", e.Message, e.StackTrace);
                         }
-                        
+
                         return true;
                     }
                 }
@@ -173,14 +173,14 @@ namespace OpenSim.Region.Framework.Scenes
                 // FIXME: This needs to be fixed.
                 m_log.ErrorFormat(
                     "[ASYNC DELETER]: Queued sending of scene object to agent {0} {1} failed: {2} {3}",
-                    (x != null ? x.remoteClient.Name : "unavailable"), 
-                    (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"), 
-                    e.Message, 
+                    (x != null ? x.remoteClient.Name : "unavailable"),
+                    (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"),
+                    e.Message,
                     e.StackTrace);
             }
 
 //            m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue.");
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
index af8ccda..8831764 100644
--- a/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
+++ b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
@@ -37,12 +37,12 @@ namespace OpenSim.Region.Framework.Scenes
     /// are grouped together.
     /// </summary>
     public class CoalescedSceneObjects
-    {   
+    {
         /// <summary>
         /// The creator of this coalesence, though not necessarily the objects within it.
         /// </summary>
         public UUID CreatorId { get; set; }
-        
+
         /// <summary>
         /// The number of objects in this coalesence
         /// </summary>
@@ -54,12 +54,12 @@ namespace OpenSim.Region.Framework.Scenes
                     return m_memberObjects.Count;
             }
         }
-        
+
         /// <summary>
         /// Does this coalesence have any member objects?
         /// </summary>
         public bool HasObjects { get { return Count > 0; } }
-        
+
         /// <summary>
         /// Get the objects currently in this coalescence
         /// </summary>
@@ -70,13 +70,13 @@ namespace OpenSim.Region.Framework.Scenes
                 lock (m_memberObjects)
                     return new List<SceneObjectGroup>(m_memberObjects);
             }
-        }               
-        
+        }
+
         /// <summary>
         /// Get the scene that contains the objects in this coalescence.  If there are no objects then null is returned.
         /// </summary>
-        public Scene Scene 
-        { 
+        public Scene Scene
+        {
             get
             {
                 if (!HasObjects)
@@ -85,24 +85,24 @@ namespace OpenSim.Region.Framework.Scenes
                     return Objects[0].Scene;
             }
         }
-        
+
         /// <summary>
         /// At this point, we need to preserve the order of objects added to the coalescence, since the first
         /// one will end up matching the item name when rerezzed.
         /// </summary>
         protected List<SceneObjectGroup> m_memberObjects = new List<SceneObjectGroup>();
-        
-        public CoalescedSceneObjects(UUID creatorId) 
+
+        public CoalescedSceneObjects(UUID creatorId)
         {
             CreatorId = creatorId;
         }
-        
+
         public CoalescedSceneObjects(UUID creatorId, params SceneObjectGroup[] objs) : this(creatorId)
-        {            
+        {
             foreach (SceneObjectGroup obj in objs)
                 Add(obj);
         }
-            
+
         /// <summary>
         /// Add an object to the coalescence.
         /// </summary>
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_memberObjects)
                 m_memberObjects.Add(obj);
         }
-        
+
         /// <summary>
         /// Removes a scene object from the coalescene
         /// </summary>
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_memberObjects)
                 return m_memberObjects.Remove(obj);
         }
-        
+
         /// <summary>
         /// Get the total size of the coalescence (the size required to cover all the objects within it) and the
         /// offsets of each of those objects.
@@ -138,16 +138,16 @@ namespace OpenSim.Region.Framework.Scenes
             float minX, minY, minZ;
             float maxX, maxY, maxZ;
 
-            Vector3[] offsets 
+            Vector3[] offsets
                 = Scene.GetCombinedBoundingBox(
                     Objects, out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
-            
+
             float sizeX = maxX - minX;
             float sizeY = maxY - minY;
             float sizeZ = maxZ - minZ;
-            
+
             size = new Vector3(sizeX, sizeY, sizeZ);
-            
+
             return offsets;
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index 84817a0..e76fef4 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
             snd_StonePlastic, snd_MetalPlastic, snd_GlassPlastic, snd_WoodPlastic, snd_FleshPlastic, snd_PlasticPlastic, snd_PlasticRubber,
             snd_StoneRubber, snd_MetalRubber, snd_GlassRubber, snd_WoodRubber, snd_FleshRubber, snd_PlasticRubber, snd_RubberRubber
             };
-        
+
         public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
         {
             if (collidersinfolist.Count == 0 || part == null)
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 7181313..4654efe 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Region.Framework.Scenes
     public class EntityManager
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private readonly DoubleDictionaryThreadAbortSafe<UUID, uint, EntityBase> m_entities 
+
+        private readonly DoubleDictionaryThreadAbortSafe<UUID, uint, EntityBase> m_entities
             = new DoubleDictionaryThreadAbortSafe<UUID, uint, EntityBase>();
 
         public int Count
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 6ff3049..1e9711d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class EventManager
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public delegate void OnFrameDelegate();
 
         /// <summary>
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event OnClientConnectCoreDelegate OnClientConnect;
 
         public delegate void OnNewClientDelegate(IClientAPI client);
-        
+
         /// <summary>
         /// Triggered when a new client is added to the scene.
         /// </summary>
@@ -163,7 +163,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <remarks>
         /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/> which is used by both
         /// <see cref="OpenSim.Framework.PresenceType.User">users</see> and <see cref="OpenSim.Framework.PresenceType.Npc">NPCs</see>
-        /// 
+        ///
         /// Triggered under per-agent lock.  So if you want to perform any long-running operations, please
         /// do this on a separate thread.
         /// </remarks>
@@ -223,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Triggered when the entire simulator is shutdown.
         /// </summary>
         public event Action OnShutdown;
-        
+
         public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
         public delegate void ScriptResetDelegate(uint localID, UUID itemID);
 
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public event ObjectGrabDelegate OnObjectGrab;
         public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
-        
+
         /// <summary>
         /// Triggered when an object is being touched/grabbed continuously.
         /// </summary>
@@ -503,7 +503,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.uploaderCaps"/>
         /// </remarks>
         public event UpdateScript OnUpdateScript;
-        
+
         public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID)
         {
             UpdateScript handlerUpdateScript = OnUpdateScript;
@@ -523,16 +523,16 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-        } 
+        }
 
         /// <summary>
         /// Triggered when some scene object properties change.
         /// </summary>
         /// <remarks>
-        /// ScriptChangedEvent is fired when a scene object property that a script might be interested 
+        /// ScriptChangedEvent is fired when a scene object property that a script might be interested
         /// in (such as color, scale or inventory) changes.  Only enough information sent is for the LSL changed event.
-        /// This is not an indication that the script has changed (see OnUpdateScript for that). 
-        /// This event is sent to a script to tell it that some property changed on 
+        /// This is not an indication that the script has changed (see OnUpdateScript for that).
+        /// This event is sent to a script to tell it that some property changed on
         /// the object the script is in. See http://lslwiki.net/lslwiki/wakka.php?wakka=changed .
         /// Triggered by <see cref="TriggerOnScriptChangedEvent"/>
         /// in <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.TeleportAgentWithinRegion"/>,
@@ -561,7 +561,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// TODO: Should be triggered when a physics object starts moving.
         /// </summary>
         public event ScriptMovingStartEvent OnScriptMovingStartEvent;
-   
+
         public delegate void ScriptMovingEndEvent(uint localID);
 
         /// <summary>
@@ -738,7 +738,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// and <see cref="ScenePresence.CompleteMovement"/>
         /// </remarks>
         public event Action<ScenePresence> OnMakeRootAgent;
-        
+
         public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted;
         public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile;
 
@@ -755,7 +755,7 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void RequestChangeWaterHeight(float height);
 
         public event RequestChangeWaterHeight OnRequestChangeWaterHeight;
-        
+
         /// <summary>
         /// Fired if any avatar is 'killed' due to its health falling to zero
         /// </summary>
@@ -778,7 +778,7 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
 
         public event EstateToolsSunUpdate OnEstateToolsSunUpdate;
-        
+
         /// <summary>
         /// Triggered when an object is added to the scene.
         /// </summary>
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <see cref="Scene.doObjectDuplicateOnRay"/>
         /// </remarks>
         public event Action<SceneObjectGroup> OnObjectAddedToScene;
-        
+
         /// <summary>
         ///  When a client sends a derez request for an object inworld
         ///  but before the object is deleted
@@ -872,21 +872,21 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public delegate void RegisterCapsEvent(UUID agentID, Caps caps);
         public event RegisterCapsEvent OnRegisterCaps;
-        
+
         /// <summary>
         /// DeregisterCapsEvent is called by Scene when the caps
         /// handler for an agent are removed.
         /// </summary>
         public delegate void DeregisterCapsEvent(UUID agentID, Caps caps);
         public event DeregisterCapsEvent OnDeregisterCaps;
-        
+
         /// <summary>
         /// ChatFromWorldEvent is called via Scene when a chat message
         /// from world comes in.
         /// </summary>
         public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat);
         public event ChatFromWorldEvent OnChatFromWorld;
-        
+
         /// <summary>
         /// ChatFromClientEvent is triggered via ChatModule (or
         /// substitutes thereof) when a chat message
@@ -894,18 +894,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat);
         public event ChatFromClientEvent OnChatFromClient;
-        
+
         /// <summary>
         /// ChatToClientsEvent is triggered via ChatModule (or
-        /// substitutes thereof) when a chat message is actually sent to clients.  Clients will only be sent a 
+        /// substitutes thereof) when a chat message is actually sent to clients.  Clients will only be sent a
         /// received chat message if they satisfy various conditions (within audible range, etc.)
         /// </summary>
         public delegate void ChatToClientsEvent(
-            UUID senderID, HashSet<UUID> receiverIDs, 
-            string message, ChatTypeEnum type, Vector3 fromPos, string fromName, 
+            UUID senderID, HashSet<UUID> receiverIDs,
+            string message, ChatTypeEnum type, Vector3 fromPos, string fromName,
             ChatSourceType src, ChatAudibleLevel level);
         public event ChatToClientsEvent OnChatToClients;
-        
+
         /// <summary>
         /// ChatBroadcastEvent is called via Scene when a broadcast chat message
         /// from world comes in
@@ -923,11 +923,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public delegate void OarFileLoaded(Guid guid, List<UUID> loadedScenes, string message);
         public event OarFileLoaded OnOarFileLoaded;
-        
+
         /// <summary>
         /// Called when an oar file has finished saving
         /// Message is non empty string if there were problems saving the oar file
-        /// If a guid was supplied on the original call to identify, the request, this is returned.  Otherwise 
+        /// If a guid was supplied on the original call to identify, the request, this is returned.  Otherwise
         /// Guid.Empty is returned.
         /// </summary>
         public delegate void OarFileSaved(Guid guid, string message);
@@ -947,14 +947,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// the avatarID is UUID.Zero (I know, this doesn't make much sense but now it's historical).
         public delegate void Attach(uint localID, UUID itemID, UUID avatarID);
         public event Attach OnAttach;
-        
-        
+
+
         /// <summary>
         /// Called immediately after an object is loaded from storage.
         /// </summary>
         public event SceneObjectDelegate OnSceneObjectLoaded;
         public delegate void SceneObjectDelegate(SceneObjectGroup so);
-        
+
         /// <summary>
         /// Called immediately before an object is saved to storage.
         /// </summary>
@@ -967,7 +967,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public event SceneObjectPreSaveDelegate OnSceneObjectPreSave;
         public delegate void SceneObjectPreSaveDelegate(SceneObjectGroup persistingSo, SceneObjectGroup originalSo);
-        
+
         /// <summary>
         /// Called when a scene object part is cloned within the region.
         /// </summary>
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Fired when logins to a region are enabled or disabled.
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// Fired
         public event RegionLoginsStatusChange OnRegionLoginsStatusChange;
@@ -1157,7 +1157,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1178,7 +1178,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerGetScriptRunning failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerGetScriptRunning failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1199,7 +1199,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnScriptChangedEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnScriptChangedEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1220,7 +1220,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnClientMovement failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnClientMovement failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1241,7 +1241,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerPermissionError failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerPermissionError failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1262,7 +1262,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnPluginConsole failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnPluginConsole failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1283,7 +1283,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnFrame failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnFrame failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1304,7 +1304,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnNewClient failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnNewClient failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Framework.Scenes
                         catch (Exception e)
                         {
                             m_log.ErrorFormat(
-                                "[EVENT MANAGER]: Delegate for TriggerOnNewClient (IClientCore) failed - continuing.  {0} {1}", 
+                                "[EVENT MANAGER]: Delegate for TriggerOnNewClient (IClientCore) failed - continuing.  {0} {1}",
                                 e.Message, e.StackTrace);
                         }
                     }
@@ -1368,7 +1368,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnNewPresence failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnNewPresence failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1391,7 +1391,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnRemovePresence failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnRemovePresence failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1412,7 +1412,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnBackup failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnBackup failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1433,7 +1433,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountUpdate failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountUpdate failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1454,7 +1454,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerMoneyTransfer failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerMoneyTransfer failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerTerrainTick failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerTerrainTick failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1558,7 +1558,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountAdd failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountAdd failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1579,7 +1579,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectAddedToScene failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectAddedToScene failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1625,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectBeingRemovedFromScene failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectBeingRemovedFromScene failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1646,7 +1646,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectAddedToPhysicalScene failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectAddedToPhysicalScene failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1667,7 +1667,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectRemovedFromPhysicalScene failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectRemovedFromPhysicalScene failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1688,7 +1688,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerShutdown failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerShutdown failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1709,7 +1709,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectGrab failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectGrab failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1730,7 +1730,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectGrabbing failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectGrabbing failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1751,7 +1751,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerObjectDeGrab failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerObjectDeGrab failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1772,7 +1772,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptReset failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptReset failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1793,7 +1793,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerRezScript failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerRezScript failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerStartScript failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerStartScript failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1835,7 +1835,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerStopScript failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerStopScript failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1856,7 +1856,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                         m_log.ErrorFormat(Environment.StackTrace);
                     }
@@ -1867,7 +1867,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool TriggerGroupMove(UUID groupID, Vector3 delta)
         {
             bool result = true;
-            
+
             SceneGroupMoved handlerSceneGroupMove = OnSceneGroupMove;
             if (handlerSceneGroupMove != null)
             {
@@ -1881,19 +1881,19 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerGroupMove failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerGroupMove failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
-            
+
             return result;
         }
 
         public bool TriggerGroupSpinStart(UUID groupID)
         {
             bool result = true;
-            
+
             SceneGroupSpinStarted handlerSceneGroupSpinStarted = OnSceneGroupSpinStart;
             if (handlerSceneGroupSpinStarted != null)
             {
@@ -1907,19 +1907,19 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerGroupSpinStart failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerGroupSpinStart failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
-            
+
             return result;
         }
 
         public bool TriggerGroupSpin(UUID groupID, Quaternion rotation)
         {
             bool result = true;
-            
+
             SceneGroupSpun handlerSceneGroupSpin = OnSceneGroupSpin;
             if (handlerSceneGroupSpin != null)
             {
@@ -1933,12 +1933,12 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerGroupSpin failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerGroupSpin failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
-            
+
             return result;
         }
 
@@ -1956,7 +1956,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerGroupGrab failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerGroupGrab failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1977,7 +1977,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerLandObjectAdded failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerLandObjectAdded failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -1998,7 +1998,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerLandObjectRemoved failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerLandObjectRemoved failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2024,7 +2024,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerAvatarEnteringNewParcel failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerAvatarEnteringNewParcel failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2045,7 +2045,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerAvatarAppearanceChanged failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerAvatarAppearanceChanged failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2087,7 +2087,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerIncomingInstantMessage failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerIncomingInstantMessage failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2108,7 +2108,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2127,12 +2127,12 @@ namespace OpenSim.Region.Framework.Scenes
 //                        m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed: {0}", d.Target.ToString());
                         d(ClientID, scene);
 //                        m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed done ");
-                        
+
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerClientClosed failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerClientClosed failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2153,7 +2153,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnMakeChildAgent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnMakeChildAgent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2192,7 +2192,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnMakeRootAgent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnMakeRootAgent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2213,7 +2213,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2234,7 +2234,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnRegisterCaps failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnRegisterCaps failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2255,7 +2255,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnDeregisterCaps failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnDeregisterCaps failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2276,7 +2276,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnNewInventoryItemUploadComplete failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnNewInventoryItemUploadComplete failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2297,7 +2297,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerLandBuy failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerLandBuy failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2318,7 +2318,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerValidateLandBuy failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerValidateLandBuy failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2339,7 +2339,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerAtTargetEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerAtTargetEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerNotAtTargetEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerNotAtTargetEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2381,7 +2381,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerAtRotTargetEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerAtRotTargetEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2402,7 +2402,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerNotAtRotTargetEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerNotAtRotTargetEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2471,7 +2471,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerRequestChangeWaterHeight failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerRequestChangeWaterHeight failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2492,7 +2492,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerAvatarKill failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerAvatarKill failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2513,7 +2513,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerSignificantClientMovement failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerSignificantClientMovement failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2534,7 +2534,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnChatFromWorld failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnChatFromWorld failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2555,16 +2555,16 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnChatFromClient failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnChatFromClient failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
         }
-        
+
         public void TriggerOnChatToClients(
-            UUID senderID, HashSet<UUID> receiverIDs, 
-            string message, ChatTypeEnum type, Vector3 fromPos, string fromName, 
+            UUID senderID, HashSet<UUID> receiverIDs,
+            string message, ChatTypeEnum type, Vector3 fromPos, string fromName,
             ChatSourceType src, ChatAudibleLevel level)
         {
             ChatToClientsEvent handler = OnChatToClients;
@@ -2579,7 +2579,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnChatToClients failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnChatToClients failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnChatBroadcast failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnChatBroadcast failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2621,7 +2621,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerControlEvent failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerControlEvent failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2642,7 +2642,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerNoticeNoLandDataFromStorage failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerNoticeNoLandDataFromStorage failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2663,7 +2663,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerIncomingLandDataFromStorage failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerIncomingLandDataFromStorage failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2684,7 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerSetAllowForcefulBan failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerSetAllowForcefulBan failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2705,7 +2705,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerRequestParcelPrimCountUpdate failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerRequestParcelPrimCountUpdate failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2726,7 +2726,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountTainted failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountTainted failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2766,7 +2766,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerEstateToolsSunUpdate failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerEstateToolsSunUpdate failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2787,12 +2787,12 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
-            
+
             return 6;
         }
 
@@ -2810,13 +2810,13 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOarFileLoaded failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOarFileLoaded failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
         }
-        
+
         public void TriggerOarFileSaved(Guid requestId, string message)
         {
             OarFileSaved handlerOarFileSaved = OnOarFileSaved;
@@ -2831,7 +2831,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOarFileSaved failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOarFileSaved failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2852,7 +2852,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerEmptyScriptCompileQueue failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerEmptyScriptCompileQueue failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2873,7 +2873,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptCollidingStart failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptCollidingStart failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2894,7 +2894,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptColliding failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptColliding failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2915,7 +2915,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptCollidingEnd failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptCollidingEnd failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2936,7 +2936,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingStart failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingStart failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2957,7 +2957,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptLandColliding failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptLandColliding failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2978,7 +2978,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingEnd failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingEnd failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -2999,7 +2999,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerSetRootAgentScene failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerSetRootAgentScene failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -3020,13 +3020,13 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnRegionUp failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnRegionUp failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
         }
-        
+
         public void TriggerOnSceneObjectLoaded(SceneObjectGroup so)
         {
             SceneObjectDelegate handler = OnSceneObjectLoaded;
@@ -3041,13 +3041,13 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectLoaded failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectLoaded failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
         }
-        
+
         public void TriggerOnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo)
         {
             SceneObjectPreSaveDelegate handler = OnSceneObjectPreSave;
@@ -3062,13 +3062,13 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPreSave failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPreSave failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
             }
-        } 
-        
+        }
+
         public void TriggerOnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
         {
             SceneObjectPartCopyDelegate handler = OnSceneObjectPartCopy;
@@ -3083,7 +3083,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -3104,7 +3104,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerSceneObjectPartUpdated failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerSceneObjectPartUpdated failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -3147,7 +3147,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
@@ -3169,7 +3169,7 @@ namespace OpenSim.Region.Framework.Scenes
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[EVENT MANAGER]: Delegate for TriggerSceneShuttingDown failed - continuing.  {0} {1}", 
+                            "[EVENT MANAGER]: Delegate for TriggerSceneShuttingDown failed - continuing.  {0} {1}",
                             e.Message, e.StackTrace);
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index cdd8d2d..e4aa196 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 timer.Start();
                         };
                     }
-                    
+
                     // Check again, in case the regions were started while we were adding the event handler
                     if (SceneManager.Instance.AllRegionsReady)
                     {
@@ -821,7 +821,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectGroup tmp = m_group;
             m_group = null;
- 
+
             using (MemoryStream ms = new MemoryStream())
             {
                 BinaryFormatter fmt = new BinaryFormatter();
@@ -839,10 +839,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void StartCrossingCheck()
         {
             // timer will be restart by crossingFailure
-            // or never since crossing worked and this 
+            // or never since crossing worked and this
             // should be deleted
             StopTimer();
-           
+
             m_isCrossing = true;
             m_waitingCrossing = true;
 
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 97009a0..cbf40c8 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.PhysicsModules.SharedBase;
 
 /*
  * Steps to add a new prioritization policy:
- * 
+ *
  *  - Add a new value to the UpdatePrioritizationSchemes enum.
  *  - Specify this new value in the [InterestManagement] section of your
  *    OpenSim.ini. The name in the config file must match the enum value name
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class Prioritizer
     {
         private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
 
         public Prioritizer(Scene scene)
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return 0;
 
             uint priority;
-            
+
             switch (m_scene.UpdatePrioritizationScheme)
             {
 /*
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Scenes
                     priority = GetPriorityByBestAvatarResponsiveness(client, entity);
                     break;
             }
-            
+
             return priority;
         }
 
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return ComputeDistancePriority(client,entity,false);
         }
-        
+
         private uint GetPriorityByFrontBack(IClientAPI client, ISceneEntity entity)
         {
             // And anything attached to this avatar gets top priority as well
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (entity is SceneObjectPart)
                 {
-                    // Attachments are high priority, 
+                    // Attachments are high priority,
                     if (((SceneObjectPart)entity).ParentGroup.IsAttachment)
                         return 2;
 
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
             if (presence == null)
             {
-                // this shouldn't happen, it basically means that we are prioritizing 
+                // this shouldn't happen, it basically means that we are prioritizing
                 // updates to send to a client that doesn't have a presence in the scene
                 // seems like there's race condition here...
 
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // throw new InvalidOperationException("Prioritization agent not defined");
                 return PriorityQueue.NumberOfQueues - 1;
             }
-                
+
             // Use group position for child prims, since we are putting child prims in
             // the same queue with the root of the group, the root prim (which goes into
             // the queue first) should always be sent first, no need to adjust child prim
@@ -227,14 +227,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             Vector3 presencePos = presence.AbsolutePosition;
 
-            // Compute the distance... 
+            // Compute the distance...
             double distance = Vector3.Distance(presencePos, entityPos);
 
             // And convert the distance to a priority queue, this computation gives queues
             // at 10, 20, 40, 80, 160, 320, 640, and 1280m
             uint pqueue = PriorityQueue.NumberOfImmediateQueues + 1; // reserve attachments queue
             uint queues = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues;
-/*            
+/*
             for (int i = 0; i < queues - 1; i++)
             {
                 if (distance < 30 * Math.Pow(2.0,i))
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 float tmp = (float)Math.Log((double)distance) * 1.442695f - 3.321928f;
                 // for a map identical to original:
-                // now 
+                // now
                 // 1st constant is 1/(log(2)) (natural log) so we get log2(distance)
                 // 2st constant makes it be log2(distance/10)
                 pqueue += (uint)tmp;
@@ -265,7 +265,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // Plane equation
                 float d = -Vector3.Dot(camPosition, camAtAxis);
                 float p = Vector3.Dot(camAtAxis, entityPos) + d;
-                if (p < 0.0f) 
+                if (p < 0.0f)
                     pqueue++;
             }
 
@@ -291,7 +291,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            uint pqueue = minpqueue;
             uint pqueue = PriorityQueue.NumberOfImmediateQueues;
             float distance;
-                
+
             Vector3 presencePos = presence.AbsolutePosition;
             if(entity is ScenePresence)
             {
@@ -319,10 +319,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 float tmp = (float)Math.Log(distance) * 1.442695f - 3.321928f;
                 // for a map identical to original:
-                // now 
+                // now
                 // 1st constant is 1/(log(2)) (natural log) so we get log2(distance)
                 // 2st constant makes it be log2(distance/10)
-                
+
                 pqueue += (uint)tmp;
                 if (pqueue > maxqueue)
                     pqueue = maxqueue;
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 3b31281..bf58885 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -55,13 +55,13 @@ namespace OpenSim.Region.Framework.Scenes
         public string localZone = TimeZone.CurrentTimeZone.StandardName;
         public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
 
-        public RegionStatsHandler(RegionInfo region_info) 
+        public RegionStatsHandler(RegionInfo region_info)
             : base("GET", "/" + Util.SHA1Hash(region_info.regionSecret), "RegionStats", "Region Statistics")
         {
             regionInfo = region_info;
             osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
         }
-                    
+
         protected override byte[] ProcessRequest(
             string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return "text/plain"; }
         }
-        
+
         private string Report()
         {
             OSDMap args = new OSDMap(30);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes
             args["UxTime"] = OSD.FromInteger(Util.ToUnixTime(DateTime.Now));
             args["Memory"] = OSD.FromReal(Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
             args["Version"] = OSD.FromString(VersionInfo.Version);
-            
+
             string strBuffer = "";
             strBuffer = OSDParser.SerializeJsonString(args);
 
diff --git a/OpenSim/Region/Framework/Scenes/SOPMaterial.cs b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
index 10ac37c..651c52e 100644
--- a/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public static class SOPMaterialData
     {
-        public enum SopMaterial : int // redundante and not in use for now 
+        public enum SopMaterial : int // redundante and not in use for now
         {
             Stone = 0,
             Metal = 1,
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 897918a..8d11331 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -571,7 +571,7 @@ namespace OpenSim.Region.Framework.Scenes
             return errors;
         }
 
-        
+
         public string ToXml2()
         {
             using (StringWriter sw = new StringWriter())
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 61ea8ac..e3ccf96 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.DebugFormat(
                     "[AGENT INVENTORY]: Found folder {0} type {1} for item {2}",
                     f.Name, (AssetType)f.Type, item.Name);
-                    
+
                 item.Folder = f.ID;
             }
             else
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Update item with new asset
             item.AssetID = asset.FullID;
             group.UpdateInventoryItem(item);
-            
+
             part.SendPropertiesToClient(remoteClient);
 
             // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // needs to be found. If inventory item flags are updated
                     // the viewer's notion of the item needs to be refreshed.
                     //
-                    // In other situations we cannot send out a bulk update here, since this will cause editing of clothing to start 
+                    // In other situations we cannot send out a bulk update here, since this will cause editing of clothing to start
                     // failing frequently.  Possibly this is a race with a separate transaction that uploads the asset.
                     if (sendUpdate)
                         remoteClient.SendBulkUpdateInventory(item);
@@ -734,7 +734,7 @@ namespace OpenSim.Region.Framework.Scenes
                 itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions;
                 itemCopy.BasePermissions = item.BasePermissions;
             }
-            
+
             if (itemCopy.Folder == UUID.Zero)
             {
                 InventoryFolderBase folder = null;
@@ -826,7 +826,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             UUID newFolderId = UUID.Random();
-            InventoryFolderBase newFolder 
+            InventoryFolderBase newFolder
                 = new InventoryFolderBase(
                     newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version);
             InventoryService.AddFolder(newFolder);
@@ -906,7 +906,7 @@ namespace OpenSim.Region.Framework.Scenes
                     item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
             }
             else
-            {  
+            {
                 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
                 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
                     && (m_permissions.BypassPermissions()
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Framework.Scenes
                 moveitems.Add(n);
                 remoteClient.SendInventoryItemCreateUpdate(n, 0);
             }
-            
+
             MoveInventoryItem(remoteClient, moveitems);
         }
 
@@ -1308,9 +1308,9 @@ namespace OpenSim.Region.Framework.Scenes
         public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId, out string message)
         {
             m_log.DebugFormat(
-                "[PRIM INVENTORY]: Adding item {0} from {1} to folder {2} for {3}", 
+                "[PRIM INVENTORY]: Adding item {0} from {1} to folder {2} for {3}",
                 itemId, part.Name, folderId, remoteClient.Name);
-            
+
             InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId, out message);
             if (agentItem == null)
                 return null;
@@ -1377,7 +1377,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             string message;
             InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message);
-            
+
             if (item == null)
                 remoteClient.SendAgentAlertMessage(message, false);
         }
@@ -1712,7 +1712,7 @@ namespace OpenSim.Region.Framework.Scenes
                 else // Updating existing item with new perms etc
                 {
 //                    m_log.DebugFormat(
-//                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 
+//                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()",
 //                        currentItem.Name, part.Name);
 
                     // Only look for an uploaded updated asset if we are passed a transaction ID.  This is only the
@@ -1924,12 +1924,12 @@ namespace OpenSim.Region.Framework.Scenes
                 return null;
             }
 
-            AssetBase asset 
+            AssetBase asset
                 = CreateAsset(
-                    itemBase.Name, 
-                    itemBase.Description, 
+                    itemBase.Name,
+                    itemBase.Description,
                     (sbyte)itemBase.AssetType,
-                    Encoding.ASCII.GetBytes(scriptText), 
+                    Encoding.ASCII.GetBytes(scriptText),
                     agentID);
 
             AssetService.Store(asset);
@@ -2008,8 +2008,8 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
                     ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0))
                     return;
-            } 
-            else 
+            }
+            else
             {
                 if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     return;
@@ -2102,7 +2102,7 @@ namespace OpenSim.Region.Framework.Scenes
             List<uint> deleteIDs = new List<uint>();
             List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
             List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
-            
+
             // Start with true for both, then remove the flags if objects
             // that we can't derez are part of the selection
             bool permissionToTake = true;
@@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (action != DeRezAction.Return)
                     {
                         m_log.WarnFormat(
-                            "[AGENT INVENTORY]: Ignoring attempt to {0} {1} {2} without a client", 
+                            "[AGENT INVENTORY]: Ignoring attempt to {0} {1} {2} without a client",
                             action, grp.Name, grp.UUID);
                         return;
                     }
@@ -2166,7 +2166,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
                         permissionToTake = false;
-                    
+
                     if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
                         permissionToDelete = false;
                 }
@@ -2471,9 +2471,9 @@ namespace OpenSim.Region.Framework.Scenes
                                     bool RezSelected, bool RemoveItem, UUID fromTaskID)
         {
 //            m_log.DebugFormat(
-//                "[PRIM INVENTORY]: RezObject from {0} for item {1} from task id {2}", 
+//                "[PRIM INVENTORY]: RezObject from {0} for item {1} from task id {2}",
 //                remoteClient.Name, itemID, fromTaskID);
-            
+
             if (fromTaskID == UUID.Zero)
             {
                 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
@@ -2483,37 +2483,37 @@ namespace OpenSim.Region.Framework.Scenes
                         RezSelected, RemoveItem, fromTaskID, false);
             }
             else
-            {            
+            {
                 SceneObjectPart part = GetSceneObjectPart(fromTaskID);
                 if (part == null)
                 {
-                    m_log.ErrorFormat(                                     
-                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such scene object", 
+                    m_log.ErrorFormat(
+                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such scene object",
                         remoteClient.Name, itemID, fromTaskID);
-                    
+
                     return;
                 }
-                
+
                 TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
                 if (item == null)
                 {
-                    m_log.ErrorFormat(                                     
-                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such item", 
+                    m_log.ErrorFormat(
+                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such item",
                         remoteClient.Name, itemID, fromTaskID);
-                    
+
                     return;
-                }                
-                               
+                }
+
                 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
                 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
                 Vector3 pos = GetNewRezLocation(
                         RayStart, RayEnd, RayTargetID, Quaternion.Identity,
-                        BypassRayCast, bRayEndIsIntersection, true, scale, false);            
-                
+                        BypassRayCast, bRayEndIsIntersection, true, scale, false);
+
                 RezObject(part, item, pos, null, Vector3.Zero, 0, false);
             }
         }
-        
+
         /// <summary>
         /// Rez an object into the scene from a prim's inventory.
         /// </summary>
@@ -2691,7 +2691,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (ownerID != UUID.Zero)
                     return;
-                
+
                 if (!Permissions.CanDeedObject(remoteClient.AgentId, groupID))
                     return;
             }
@@ -2701,8 +2701,8 @@ namespace OpenSim.Region.Framework.Scenes
             foreach (uint localID in localIDs)
             {
                 SceneObjectPart part = GetSceneObjectPart(localID);
-                    if (part == null)
-                        continue;
+                if (part == null)
+                    continue;
 
                 if (!groups.Contains(part.ParentGroup))
                     groups.Add(part.ParentGroup);
@@ -2717,7 +2717,7 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.ScheduleGroupForFullUpdate();
 
                     SceneObjectPart[] partList = sog.Parts;
-                    
+
                     foreach (SceneObjectPart child in partList)
                     {
                         child.Inventory.ChangeInventoryOwner(ownerID);
@@ -2756,8 +2756,8 @@ namespace OpenSim.Region.Framework.Scenes
             foreach (uint localID in localIDs)
             {
                 SceneObjectPart part = GetSceneObjectPart(localID);
-                    if (part == null)
-                        continue;
+                if (part == null)
+                    continue;
                 part.SendPropertiesToClient(remoteClient);
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 24a2db7..2d62b50 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 EventManager.TriggerOnChatFromWorld(this, args);
         }
-        
+
         protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
                                UUID fromID, bool fromAgent, bool broadcast)
         {
@@ -212,13 +212,13 @@ namespace OpenSim.Region.Framework.Scenes
             if (groupID != UUID.Zero)
             {
                 GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, remoteClient.AgentId);
-    
+
                 if (gmd == null)
                 {
 //                    m_log.WarnFormat(
 //                        "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group",
 //                        remoteClient.Name, GroupID, objectLocalID);
-    
+
                     return;
                 }
             }
@@ -243,7 +243,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetSceneObjectPart(primLocalID);
             if (part == null)
                 return;
- 
+
             bool oldgprSelect = part.ParentGroup.IsSelected;
 
             // This is wrong, wrong, wrong. Selection should not be
@@ -259,14 +259,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // restore targetOmega
                 if (part.AngularVelocity != Vector3.Zero)
-                    part.ScheduleTerseUpdate();     
+                    part.ScheduleTerseUpdate();
             }
         }
 
-        public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, 
+        public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount,
                                                         int transactiontype, string description)
         {
-            EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount, 
+            EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount,
                                                                                      transactiontype, description);
 
             EventManager.TriggerMoneyTransfer(this, args);
@@ -275,8 +275,8 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual void ProcessParcelBuy(UUID agentId, UUID groupId, bool final, bool groupOwned,
                 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated)
         {
-            EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned, 
-                                                                         removeContribution, parcelLocalID, parcelArea, 
+            EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned,
+                                                                         removeContribution, parcelLocalID, parcelArea,
                                                                          parcelPrice, authenticated);
 
             // First, allow all validators a stab at it
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
             SceneObjectPart part = GetSceneObjectPart(localID);
-            
+
             if (part == null)
                 return;
 
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Currently only grab/touch for the single prim
             // the client handles rez correctly
             obj.ObjectGrabHandler(localID, offsetPos, remoteClient);
-    
+
             // If the touched prim handles touches, deliver it
             if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
                 EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg);
@@ -310,7 +310,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Deliver to the root prim if the touched prim doesn't handle touches
             // or if we're meant to pass on touches anyway.
             if (((part.ScriptEvents & scriptEvents.touch_start) == 0) ||
-                (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) 
+                (part.PassTouches && (part.LocalId != obj.RootPart.LocalId)))
             {
                 EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
             }
@@ -337,7 +337,7 @@ namespace OpenSim.Region.Framework.Scenes
             // get's it's position on the simulator even if it was the same as before
             // This keeps the moving user's client in sync with the rest of the world.
             group.SendGroupTerseUpdate();
- 
+
             SurfaceTouchEventArgs surfaceArg = null;
             if (surfaceArgs != null && surfaceArgs.Count > 0)
                 surfaceArg = surfaceArgs[0];
@@ -483,7 +483,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 });
         }
-        
+
         private bool ShouldSendDiscardableEffect(IClientAPI thisClient, ScenePresence other)
         {
             return Vector3.Distance(other.CameraPosition, thisClient.SceneAgent.AbsolutePosition) < 10;
@@ -603,7 +603,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_descendentsRequestProcessing = false;
             }
         }
-        
+
         /// <summary>
         /// Handle an inventory folder creation request from the client.
         /// </summary>
@@ -657,7 +657,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
+
         public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
         {
             InventoryFolderBase folder = InventoryService.GetFolder(remoteClient.AgentId, folderID);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index b26b789..893b38c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes
-{        
+{
     #region Delegates
     public delegate uint GenerateClientFlagsHandler(UUID userID, UUID objectID);
     public delegate void SetBypassPermissionsHandler(bool value);
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class ScenePermissions
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Scene m_scene;
 
         public ScenePermissions(Scene scene)
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool CanDeleteObject(UUID objectID, UUID deleter)
         {
             bool result = true;
-            
+
             DeleteObjectHandler handler = OnDeleteObject;
             if (handler != null)
             {
@@ -275,14 +275,14 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
             return result;
         }
 
         public bool CanTransferObject(UUID objectID, UUID recipient)
         {
             bool result = true;
-            
+
             TransferObjectHandler handler = OnTransferObject;
             if (handler != null)
             {
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
             return result;
         }
 
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool CanTakeObject(UUID objectID, UUID AvatarTakingUUID)
         {
             bool result = true;
-            
+
             TakeObjectHandler handler = OnTakeObject;
             if (handler != null)
             {
@@ -320,11 +320,11 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}", 
+//                "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}",
 //                objectID, AvatarTakingUUID, result);
-                        
+
             return result;
         }
 
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool CanTakeCopyObject(UUID objectID, UUID userID)
         {
             bool result = true;
-            
+
             TakeCopyObjectHandler handler = OnTakeCopyObject;
             if (handler != null)
             {
@@ -377,11 +377,11 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}", 
+//                "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}",
 //                objectID, userID, result);
-            
+
             return result;
         }
 
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects)
         {
             bool result = true;
-            
+
             ReturnObjectsHandler handler = OnReturnObjects;
             if (handler != null)
             {
@@ -492,11 +492,11 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}", 
+//                "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}",
 //                user, objects.Count, land.LandData.Name, result);
-                        
+
             return result;
         }
 
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         public bool CanTransferObjectInventory(UUID itemID, UUID objectID, UUID userID)
         {
             TransferObjectInventoryHandler handler = OnTransferObjectInventory;
@@ -1019,7 +1019,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to create the given inventory type in their inventory.
         /// </summary>
@@ -1039,8 +1039,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             return true;
-        } 
-        
+        }
+
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
@@ -1061,7 +1061,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to copy the given inventory item from their own inventory.
         /// </summary>
@@ -1082,7 +1082,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
@@ -1103,7 +1103,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         public bool CanTransferUserInventory(UUID itemID, UUID userID, UUID recipientID)
         {
             TransferUserInventoryHandler handler = OnTransferUserInventory;
@@ -1118,7 +1118,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         public bool CanTeleport(UUID userID)
         {
             TeleportHandler handler = OnTeleport;
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
-        
+
         public bool CanControlPrimMedia(UUID userID, UUID primID, int face)
         {
             ControlPrimMediaHandler handler = OnControlPrimMedia;
@@ -1147,8 +1147,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             return true;
-        } 
-        
+        }
+
         public bool CanInteractWithPrimMedia(UUID userID, UUID primID, int face)
         {
             InteractWithPrimMediaHandler handler = OnInteractWithPrimMedia;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d7a4ca4..352bc05 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
         private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
- 
+
 
         public delegate void SynchronizeSceneHandler(Scene scene);
 
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <remarks>
         /// Even if false, the scene will still be saved on clean shutdown.
-        /// FIXME: Currently, setting this to false will mean that objects are not periodically returned from parcels.  
+        /// FIXME: Currently, setting this to false will mean that objects are not periodically returned from parcels.
         /// This needs to be fixed.
         /// </remarks>
         public bool PeriodicBackup { get; set; }
@@ -103,9 +103,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// If false then physical objects are disabled, though collisions will continue as normal.
         /// </summary>
 
-        public bool PhysicsEnabled 
-        { 
-            get 
+        public bool PhysicsEnabled
+        {
+            get
             {
                 return m_physicsEnabled;
             }
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// to compensate for SL bug
         /// </summary>
         public bool LegacySitOffsets = true;
-        
+
         /// <summary>
         /// Can avatars cross from and to this region?
         /// </summary>
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// Max prims an Physical object will hold
         /// </summary>
-        /// 
+        ///
         public int m_linksetPhysCapacity = 0;
 
         /// <summary>
@@ -383,9 +383,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Frame time
         /// </remarks>
-                public float FrameTime { get; private set; }
-                public int FrameTimeWarnPercent { get; private set; }
-                public int FrameTimeCritPercent { get; private set; }
+        public float FrameTime { get; private set; }
+        public int FrameTimeWarnPercent { get; private set; }
+        public int FrameTimeCritPercent { get; private set; }
 
         // Normalize the frame related stats to nominal 55fps for viewer and scripts option
         // see SimStatsReporter.cs
@@ -397,7 +397,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <remarks>
         /// Always derived from MinFrameTicks.
         /// </remarks>
-                public float MinMaintenanceTime { get; private set; }
+        public float MinMaintenanceTime { get; private set; }
 
         private int m_update_physics = 1;
         private int m_update_entitymovement = 1;
@@ -529,7 +529,7 @@ namespace OpenSim.Region.Framework.Scenes
 
 //        private int m_lastUpdate;
         private bool m_firstHeartbeat = true;
-        
+
 //        private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
 //        private bool m_reprioritizationEnabled = true;
 //        private double m_reprioritizationInterval = 5000.0;
@@ -868,7 +868,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Constructors
 
-        public Scene(RegionInfo regInfo, AgentCircuitManager authen, 
+        public Scene(RegionInfo regInfo, AgentCircuitManager authen,
                      ISimulationDataService simDataService, IEstateDataService estateDataService,
                      IConfigSource config, string simulatorVersion)
             : this(regInfo)
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Framework.Scenes
 
              RegisterDefaultSceneEvents();
 
-            // XXX: Don't set the public property since we don't want to activate here.  This needs to be handled 
+            // XXX: Don't set the public property since we don't want to activate here.  This needs to be handled
             // better in the future.
             m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts;
 
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             StatsReporter.OnSendStatsResult += SendSimStatsPackets;
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
- 
+
         }
 
         public Scene(RegionInfo regInfo)
@@ -1549,7 +1549,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name='startScripts'>
         /// Start the scripts within the scene.
-        /// </param> 
+        /// </param>
         public void Start(bool startScripts)
         {
             if (IsRunning)
@@ -1569,7 +1569,7 @@ namespace OpenSim.Region.Framework.Scenes
 
 //int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
 //System.Diagnostics.Process proc = new System.Diagnostics.Process();
-//proc.EnableRaisingEvents=false; 
+//proc.EnableRaisingEvents=false;
 //proc.StartInfo.FileName = "/bin/kill";
 //proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
 //proc.Start();
@@ -1637,7 +1637,7 @@ namespace OpenSim.Region.Framework.Scenes
             Update(-1);
 
             Watchdog.RemoveThread();
-                }
+        }
 
         private void Maintenance()
         {
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Framework.Scenes
                 previousMaintenanceTick = m_lastMaintenanceTick;
                 m_lastMaintenanceTick = Util.EnvironmentTickCount();
                 runtc = Util.EnvironmentTickCountSubtract(m_lastMaintenanceTick, runtc);
-                                runtc = (int)(MinMaintenanceTime * 1000) - runtc;
+                runtc = (int)(MinMaintenanceTime * 1000) - runtc;
 
                 if (runtc > 0)
                     m_maintenanceWaitEvent.WaitOne(runtc);
@@ -1783,7 +1783,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (Frame % m_update_entitymovement == 0)
                         m_sceneGraph.UpdateScenePresenceMovement();
 
-                    // Get the simulation frame time that the avatar force input 
+                    // Get the simulation frame time that the avatar force input
                     // took
                     tmpMS2 = Util.GetTimeStampMS();
                     agentMS = (float)(tmpMS2 - tmpMS);
@@ -1799,7 +1799,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if (SynchronizeScene != null)
                             SynchronizeScene(this);
                     }
-                    
+
                     tmpMS2 = Util.GetTimeStampMS();
                     physicsMS = (float)(tmpMS2 - tmpMS);
                     tmpMS = tmpMS2;
@@ -1820,17 +1820,17 @@ namespace OpenSim.Region.Framework.Scenes
                     tmpMS2 = Util.GetTimeStampMS();
                     agentMS += (float)(tmpMS2 - tmpMS);
                     tmpMS = tmpMS2;
-  
+
                     // Delete temp-on-rez stuff
                     if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps)
-                    {                      
+                    {
                         m_cleaningTemps = true;
                         Util.FireAndForget(delegate { CleanTempObjects(); m_cleaningTemps = false;  });
                         tmpMS2 = Util.GetTimeStampMS();
                         tempOnRezMS = (float)(tmpMS2 - tmpMS); // bad.. counts the FireAndForget, not CleanTempObjects
                         tmpMS = tmpMS2;
                     }
-    
+
                     if (Frame % m_update_events == 0)
                     {
                         UpdateEvents();
@@ -1916,7 +1916,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // reuse frameMS as temporary
                 frameMS = (float)tmpMS2;
-                
+
                 // sleep if we can
                 if (tmpMS2 > 0)
                     {
@@ -1939,9 +1939,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // script time is not scene frame time, but is displayed per frame
                 float scriptTimeMS = GetAndResetScriptExecutionTime();
                 StatsReporter.AddFrameStats(TimeDilation, physicsFPS, agentMS,
-                             physicsMS + physicsMS2, otherMS , sleepMS, frameMS, scriptTimeMS); 
-              
-                
+                             physicsMS + physicsMS2, otherMS , sleepMS, frameMS, scriptTimeMS);
+
+
 
                 // if (Frame%m_update_avatars == 0)
                 //   UpdateInWorldTime();
@@ -2129,7 +2129,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Tell an agent that their object has been returned. 
+        /// Tell an agent that their object has been returned.
         /// </summary>
         /// <remarks>
         /// The actual return is handled by the caller.
@@ -2221,7 +2221,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if(Bakedmap != null)
                     {
-                        m_log.Warn("[TERRAIN]: terrain not found. Used stored baked terrain.");     
+                        m_log.Warn("[TERRAIN]: terrain not found. Used stored baked terrain.");
                         Heightmap = Bakedmap.MakeCopy();
                         SimulationDataService.StoreTerrain(Heightmap.GetTerrainData(), RegionInfo.RegionID);
                     }
@@ -2290,7 +2290,7 @@ namespace OpenSim.Region.Framework.Scenes
             GridRegion region = new GridRegion(RegionInfo);
             string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
             // m_log.DebugFormat("[SCENE]: RegisterRegionWithGrid. name={0},id={1},loc=<{2},{3}>,size=<{4},{5}>",
-            //                    m_regionName, 
+            //                    m_regionName,
             //                    RegionInfo.RegionID,
             //                    RegionInfo.RegionLocX, RegionInfo.RegionLocY,
             //                    RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
@@ -2369,7 +2369,7 @@ namespace OpenSim.Region.Framework.Scenes
             return PhysicsScene.SupportsRaycastWorldFiltered();
         }
 
-        public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)      
+        public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)
         {
             if (PhysicsScene == null)
                 return null;
@@ -2463,7 +2463,7 @@ namespace OpenSim.Region.Framework.Scenes
                                         if (wpos.Z > pos.Z) pos = wpos;
                                         return pos;
                                     }
-                                }                          
+                                }
                             }
                             // else the first we got
                             pos = physresults[0].Normal * scale;
@@ -2775,7 +2775,7 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                             else
                             {
-                                toReturn.Add((SceneObjectGroup)e);   
+                                toReturn.Add((SceneObjectGroup)e);
                             }
                         }
                     }
@@ -2847,7 +2847,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (removeScripts)
                 group.Clear();
             partList = null;
-            // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);          
+            // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
         }
 
         /// <summary>
@@ -3023,7 +3023,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
 //                sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
 
-                // Don't sent a full update here because this will cause full updates to be sent twice for 
+                // Don't sent a full update here because this will cause full updates to be sent twice for
                 // attachments on region crossings, resulting in viewer glitches.
                 AddRestoredSceneObject(sceneObject, false, false, false);
 
@@ -3044,7 +3044,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
 
-                    // We must currently not resume scripts at this stage since AttachmentsModule does not have the 
+                    // We must currently not resume scripts at this stage since AttachmentsModule does not have the
                     // information that this is due to a teleport/border cross rather than an ordinary attachment.
                     // We currently do this in Scene.MakeRootAgent() instead.
                     if (AttachmentsModule != null)
@@ -3141,7 +3141,7 @@ namespace OpenSim.Region.Framework.Scenes
                 vialogin
                     = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0
                         || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
-    
+
                 CheckHeartbeat();
 
                 sp = GetScenePresence(client.AgentId);
@@ -3152,10 +3152,10 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE]: Adding new child scene presence {0} {1} to scene {2} at pos {3}, tpflags: {4}",
                         client.Name, client.AgentId, RegionInfo.RegionName, client.StartPos,
                         ((TPFlags)aCircuit.teleportFlags).ToString());
-    
+
                     m_clientManager.Add(client);
                     SubscribeToClientEvents(client);
-    
+
                     sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
 
                     sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
@@ -3167,9 +3167,9 @@ namespace OpenSim.Region.Framework.Scenes
                     // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
                     // client is for a root or child agent.
                     // XXX: This may be better set for a new client before that client is added to the client manager.
-                    // But need to know what happens in the case where a ScenePresence is already present (and if this 
+                    // But need to know what happens in the case where a ScenePresence is already present (and if this
                     // actually occurs).
-                    
+
 
                     m_log.WarnFormat(
                         "[SCENE]: Already found {0} scene presence for {1} in {2} when asked to add new scene presence",
@@ -3177,9 +3177,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                     reallyNew = false;
                 }
-                                client.SceneAgent = sp;
+                client.SceneAgent = sp;
 
-                // This is currently also being done earlier in NewUserConnection for real users to see if this 
+                // This is currently also being done earlier in NewUserConnection for real users to see if this
                 // resolves problems where HG agents are occasionally seen by others as "Unknown user" in chat and other
                 // places.  However, we still need to do it here for NPCs.
                 CacheUserName(sp, aCircuit);
@@ -3610,7 +3610,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Duplicates object specified by localID at position raycasted against RayTargetObject using 
+        /// Duplicates object specified by localID at position raycasted against RayTargetObject using
         /// RayEnd and RayStart to determine what the angle of the ray is
         /// </summary>
         /// <param name="localID">ID of object to duplicate</param>
@@ -3637,7 +3637,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (target != null && target2 != null)
             {
                 Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
-         
+
                 pos = target2.AbsolutePosition;
                 //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
 
@@ -3715,7 +3715,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Remove the given client from the scene. 
+        /// Remove the given client from the scene.
         /// </summary>
         /// <remarks>
         /// Only clientstack code should call this directly.  All other code should call IncomingCloseAgent() instead
@@ -3726,7 +3726,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='closeChildAgents'>
         /// Close the neighbour child agents associated with this client.
         /// </param>
-        /// 
+        ///
 
         private object m_removeClientPrivLock = new Object();
 
@@ -3734,7 +3734,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID);
 
-            // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which 
+            // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which
             // in turn is only called by Scene.IncomingCloseAgent() which checks whether the presence exists or not
             // However, will keep for now just in case.
             if (acd == null)
@@ -3747,12 +3747,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             // TODO: Can we now remove this lock?
             lock (m_removeClientPrivLock)
-            {    
+            {
                 bool isChildAgent = false;
 
                 ScenePresence avatar = GetScenePresence(agentID);
 
-                // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which 
+                // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which
                 // in turn is only called by Scene.IncomingCloseAgent() which checks whether the presence exists or not
                 // However, will keep for now just in case.
                 if (avatar == null)
@@ -3792,7 +3792,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // unnecessary operations.  This should go away once NPCs have no accompanying IClientAPI
                     if (closeChildAgents && CapsModule != null)
                         CapsModule.RemoveCaps(agentID, avatar.ControllingClient.CircuitCode);
-    
+
                     if (closeChildAgents && !isChildAgent)
                     {
                         List<ulong> regions = avatar.KnownRegionHandles;
@@ -3806,7 +3806,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                    m_log.Debug("[Scene]TriggerClientClosed done");
                     m_eventManager.TriggerOnRemovePresence(agentID);
 //                    m_log.Debug("[Scene]TriggerOnRemovePresence done");
-    
+
                     if (!isChildAgent)
                     {
                         if (AttachmentsModule != null)
@@ -3865,7 +3865,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Removes region from an avatar's known region list.  This coincides with child agents.  For each child agent, there will be a known region entry.
-        /// 
+        ///
         /// </summary>
         /// <param name="avatarID"></param>
         /// <param name="regionslst"></param>
@@ -3914,7 +3914,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="teleportFlags"></param>
         /// <param name="source">Source region (may be null)</param>
         /// <param name="reason">Outputs the reason for the false response on this string</param>
-        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will
         /// also return a reason.</returns>
         public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, GridRegion source, out string reason)
         {
@@ -3942,9 +3942,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="reason">Outputs the reason for the false response on this string</param>
         /// <param name="requirePresenceLookup">True for normal presence. False for NPC
         /// or other applications where a full grid/Hypergrid presence may not be required.</param>
-        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will
         /// also return a reason.</returns>
-        /// 
+        ///
         private object m_newUserConnLock = new object();
 
         public bool NewUserConnection(AgentCircuitData acd, uint teleportFlags, GridRegion source, out string reason, bool requirePresenceLookup)
@@ -4037,7 +4037,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 sp = GetScenePresence(acd.AgentID);
 
-                // We need to ensure that we are not already removing the scene presence before we ask it not to be 
+                // We need to ensure that we are not already removing the scene presence before we ask it not to be
                 // closed.
                 if (sp != null && sp.IsChildAgent
                     && (sp.LifecycleState == ScenePresenceState.Running
@@ -4051,16 +4051,16 @@ namespace OpenSim.Region.Framework.Scenes
                     // teleport from A -> D, but then -> C before A has asked B to close its old child agent.  When C
                     // renews the lease on the child agent at B, we must make sure that the close from A does not succeed.
                     //
-                    // XXX: In the end, this should not be necessary if child agents are closed without delay on 
+                    // XXX: In the end, this should not be necessary if child agents are closed without delay on
                     // teleport, since realistically, the close request should always be processed before any other
-                    // region tried to re-establish a child agent.  This is much simpler since the logic below is 
+                    // region tried to re-establish a child agent.  This is much simpler since the logic below is
                     // vulnerable to an issue when a viewer quits a region without sending a proper logout but then
                     // re-establishes the connection on a relogin.  This could wrongly set the DoNotCloseAfterTeleport
                     // flag when no teleport had taken place (and hence no close was going to come).
 //                    if (!acd.ChildrenCapSeeds.ContainsKey(RegionInfo.RegionHandle))
 //                    {
 //                        m_log.DebugFormat(
-//                            "[SCENE]: Setting DoNotCloseAfterTeleport for child scene presence {0} in {1} because source will attempt close.", 
+//                            "[SCENE]: Setting DoNotCloseAfterTeleport for child scene presence {0} in {1} because source will attempt close.",
 //                            sp.Name, Name);
 //
 //                        sp.DoNotCloseAfterTeleport = true;
@@ -4074,7 +4074,7 @@ namespace OpenSim.Region.Framework.Scenes
                         sp.DoNotCloseAfterTeleport = true;
 
                         m_log.DebugFormat(
-                            "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt end-of-teleport close from a previous close.", 
+                            "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt end-of-teleport close from a previous close.",
                             sp.Name, Name);
                     }
                 }
@@ -4094,7 +4094,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (sp.LifecycleState == ScenePresenceState.Removing)
                 {
                     m_log.WarnFormat(
-                        "[SCENE]: Agent {0} in {1} was still being removed after {2}s.  Aborting NewUserConnection.", 
+                        "[SCENE]: Agent {0} in {1} was still being removed after {2}s.  Aborting NewUserConnection.",
                         sp.Name, Name, polls * pollInterval / 1000);
 
                     return false;
@@ -4115,7 +4115,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // We have a root agent. Is it in transit?
                     if (!EntityTransferModule.IsInTransit(sp.UUID))
                     {
-                        // We have a zombie from a crashed session. 
+                        // We have a zombie from a crashed session.
                         // Or the same user is trying to be root twice here, won't work.
                         // Kill it.
                         m_log.WarnFormat(
@@ -4210,7 +4210,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         m_log.DebugFormat(
                             "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
-                            acd.AgentID, RegionInfo.RegionName);   
+                            acd.AgentID, RegionInfo.RegionName);
 
                         if (CapsModule != null)
                         {
@@ -4253,7 +4253,7 @@ namespace OpenSim.Region.Framework.Scenes
             // only check access, actual relocations will happen later on ScenePresence MakeRoot
             // allow child agents creation
             if(!godlike && teleportFlags != (uint) TPFlags.Default)
-            {   
+            {
                 bool checkTeleHub;
 
                 // don't check hubs if via home or via lure
@@ -4264,7 +4264,7 @@ namespace OpenSim.Region.Framework.Scenes
                     checkTeleHub = vialogin
                         || (TelehubAllowLandmarks == true ? false : ((teleportFlags & (uint)TPFlags.ViaLandmark) != 0 ))
                         || (teleportFlags & (uint) TPFlags.ViaLocation) != 0;
-                 
+
                 if(!CheckLandPositionAccess(acd.AgentID, true, checkTeleHub, acd.startpos, out reason))
                 {
                     m_authenticateHandler.RemoveCircuit(acd.circuitcode);
@@ -4351,7 +4351,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agent">Circuit Data of the Agent we're verifying</param>
         /// <param name="reason">Outputs the reason for the false response on this string</param>
-        /// <returns>True if the user has a session on the grid.  False if it does not.  False will 
+        /// <returns>True if the user has a session on the grid.  False if it does not.  False will
         /// also return a reason.</returns>
         public virtual bool VerifyUserPresence(AgentCircuitData agent, out string reason)
         {
@@ -4380,7 +4380,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agent">The circuit data for the agent</param>
         /// <param name="reason">outputs the reason to this string</param>
-        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will
         /// also return a reason.</returns>
         protected virtual bool AuthorizeUser(AgentCircuitData agent, bool bypassAccessControl, out string reason)
         {
@@ -4434,7 +4434,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // in access list / owner / manager
                 if (RegionInfo.EstateSettings.HasAccess(agent.AgentID))
                     return true;
-                
+
                 // finally test groups
                 bool groupAccess = false;
 
@@ -4576,7 +4576,7 @@ Label_GroupsDone:
 //        }
 
         /// <summary>
-        /// We've got an update about an agent that sees into this region, 
+        /// We've got an update about an agent that sees into this region,
         /// send it to ScenePresence for processing  It's the full data.
         /// </summary>
         /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
@@ -4604,7 +4604,7 @@ Label_GroupsDone:
             }
 
             // TODO: This check should probably be in QueryAccess().
-            ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, 
+            ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID,
                 (float)RegionInfo.RegionSizeX * 0.5f, (float)RegionInfo.RegionSizeY  * 0.5f);
             if (nearestParcel == null)
             {
@@ -4616,12 +4616,12 @@ Label_GroupsDone:
             }
 
             // We have to wait until the viewer contacts this region
-            // after receiving the EnableSimulator HTTP Event Queue message (for the v1 teleport protocol) 
+            // after receiving the EnableSimulator HTTP Event Queue message (for the v1 teleport protocol)
             // or TeleportFinish (for the v2 teleport protocol).  This triggers the viewer to send
             // a UseCircuitCode packet which in turn calls AddNewAgent which finally creates the ScenePresence.
             ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID);
 
-            if (sp != null)           
+            if (sp != null)
             {
                 if (!sp.IsChildAgent)
                 {
@@ -4632,10 +4632,10 @@ Label_GroupsDone:
                 if (cAgentData.SessionID != sp.ControllingClient.SessionId)
                 {
                     m_log.WarnFormat(
-                        "[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).", 
+                        "[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).",
                         sp.UUID, cAgentData.SessionID);
 
-                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
+                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}",
                         sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID));
                 }
 
@@ -4667,7 +4667,7 @@ Label_GroupsDone:
         }
 
         /// <summary>
-        /// We've got an update about an agent that sees into this region, 
+        /// We've got an update about an agent that sees into this region,
         /// send it to ScenePresence for processing  It's only positional data
         /// </summary>
         /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param>
@@ -4675,7 +4675,7 @@ Label_GroupsDone:
         public virtual bool IncomingUpdateChildAgent(AgentPosition cAgentData)
         {
 //            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: IncomingChildAgentDataUpdate POSITION for {0} in {1}, position {2}", 
+//                "[SCENE PRESENCE]: IncomingChildAgentDataUpdate POSITION for {0} in {1}, position {2}",
 //                cAgentData.AgentID, Name, cAgentData.Position);
 
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
@@ -4683,7 +4683,7 @@ Label_GroupsDone:
             {
 //                if (childAgentUpdate.ControllingClient.SessionId != cAgentData.SessionID)
 //                    // Only warn for now
-//                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}. Neighbor running older version?", 
+//                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}. Neighbor running older version?",
 //                        childAgentUpdate.UUID, cAgentData.SessionID);
 
                 // I can't imagine *yet* why we would get an update if the agent is a root agent..
@@ -4743,7 +4743,7 @@ Label_GroupsDone:
             if (acd == null)
             {
                 m_log.DebugFormat(
-                    "[SCENE]: Request to close agent {0} but no such agent in scene {1}.  May have been closed previously.", 
+                    "[SCENE]: Request to close agent {0} but no such agent in scene {1}.  May have been closed previously.",
                     agentID, Name);
 
                 return false;
@@ -4756,7 +4756,7 @@ Label_GroupsDone:
             else
             {
                 m_log.WarnFormat(
-                    "[SCENE]: Request to close agent {0} with invalid authorization token {1} in {2}", 
+                    "[SCENE]: Request to close agent {0} with invalid authorization token {1} in {2}",
                     agentID, auth_token, Name);
             }
 
@@ -4850,7 +4850,7 @@ Label_GroupsDone:
                         return true;
                     }
                     m_log.DebugFormat(
-                        "[SCENE]: Called CloseClient() with agent ID {0} but no such presence is in {1}", 
+                        "[SCENE]: Called CloseClient() with agent ID {0} but no such presence is in {1}",
                         agentID, Name);
 
                     return false;
@@ -5361,7 +5361,7 @@ Label_GroupsDone:
         /// Get a scene object group that contains the prim with the given local id
         /// </summary>
         /// <param name="localID"></param>
-        /// <returns>null if no scene object group containing that prim is found</returns>        
+        /// <returns>null if no scene object group containing that prim is found</returns>
         public SceneObjectGroup GetGroupByPrim(uint localID)
         {
             return m_sceneGraph.GetGroupByPrim(localID);
@@ -5371,7 +5371,7 @@ Label_GroupsDone:
         /// Get a scene object group that contains the prim with the given uuid
         /// </summary>
         /// <param name="fullID"></param>
-        /// <returns>null if no scene object group containing that prim is found</returns>     
+        /// <returns>null if no scene object group containing that prim is found</returns>
         public SceneObjectGroup GetGroupByPrim(UUID fullID)
         {
             return m_sceneGraph.GetGroupByPrim(fullID);
@@ -5484,7 +5484,7 @@ Label_GroupsDone:
             // 1 = sim is up and accepting http requests. The heartbeat has
             // stopped and the sim is probably locked up, but a remote
             // admin restart may succeed
-            // 
+            //
             // 2 = Sim is up and the heartbeat is running. The sim is likely
             // usable for people within
             //
@@ -5533,7 +5533,7 @@ Label_GroupsDone:
             {
 int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
 System.Diagnostics.Process proc = new System.Diagnostics.Process();
-proc.EnableRaisingEvents=false; 
+proc.EnableRaisingEvents=false;
 proc.StartInfo.FileName = "/bin/kill";
 proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
 proc.Start();
@@ -5979,7 +5979,7 @@ Environment.Exit(1);
                 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
 
 //                m_log.DebugFormat(
-//                    "[SCENE]: For {0} found AxisAlignedBoundingBoxRaw {1}, {2}", 
+//                    "[SCENE]: For {0} found AxisAlignedBoundingBoxRaw {1}, {2}",
 //                    g.Name, new Vector3(ominX, ominY, ominZ), new Vector3(omaxX, omaxY, omaxZ));
 
                 ominX += vec.X;
@@ -6175,11 +6175,11 @@ Environment.Exit(1);
                 reason = "Error authorizing agent: " + e.Message;
                 return false;
             }
-            
+
             // last check aditional land access restrictions and relocations
             // if crossing (viaTeleport false) check only the specified parcel
             return CheckLandPositionAccess(agentID, viaTeleport, true, position, out reason);
-        }            
+        }
 
         // check access to land.
         public bool CheckLandPositionAccess(UUID agentID, bool NotCrossing, bool checkTeleHub, Vector3 position, out string reason)
@@ -6192,7 +6192,7 @@ Environment.Exit(1);
             bool isAdmin = Permissions.IsAdministrator(agentID);
             if(isAdmin)
                 return true;
-                
+
             // also honor estate managers access rights
             bool isManager = Permissions.IsEstateManager(agentID);
             if(isManager)
@@ -6204,14 +6204,14 @@ Environment.Exit(1);
                 {
                     SceneObjectGroup telehub;
                     if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = GetSceneObjectGroup  (RegionInfo.RegionSettings.TelehubObject)) != null && checkTeleHub)
-                    {   
+                    {
                         bool banned = true;
                         bool validTelehub = false;
                         List<SpawnPoint> spawnPoints = RegionInfo.RegionSettings.SpawnPoints();
                         Vector3 spawnPoint;
                         ILandObject land = null;
                         Vector3 telehubPosition = telehub.AbsolutePosition;
-                        
+
                         if(spawnPoints.Count == 0)
                         {
                             // will this ever happen?
@@ -6225,7 +6225,7 @@ Environment.Exit(1);
                             }
                         }
                         else
-                        {   
+                        {
                             Quaternion telehubRotation = telehub.GroupRotation;
                             foreach (SpawnPoint spawn in spawnPoints)
                             {
@@ -6293,7 +6293,7 @@ Environment.Exit(1);
             return true;
         }
 
-                public void StartTimerWatchdog()
+        public void StartTimerWatchdog()
         {
             m_timerWatchdog.Interval = 1000;
             m_timerWatchdog.Elapsed += TimerWatchdog;
@@ -6304,7 +6304,7 @@ Environment.Exit(1);
         public void TimerWatchdog(object sender, ElapsedEventArgs e)
         {
             CheckHeartbeat();
-                }
+        }
 
         /// This method deals with movement when an avatar is automatically moving (but this is distinct from the
         /// autopilot that moves an avatar to a sit target!.
@@ -6391,7 +6391,7 @@ Environment.Exit(1);
         }
 
         /// <summary>
-        /// Wrappers to get physics modules retrieve assets. 
+        /// Wrappers to get physics modules retrieve assets.
         /// </summary>
         /// <remarks>
         /// Has to be done this way
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index d406625..e3e54e2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
         #region Fields
 
         public string Name { get { return RegionInfo.RegionName; } }
-        
+
         public IConfigSource Config
         {
             get { return GetConfig(); }
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// The module commanders available from this scene
         /// </value>
         protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
-        
+
         /// <value>
         /// Registered classes that are capable of creating entities.
         /// </value>
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected uint m_lastAllocatedLocalId = 720000;
 
         private readonly Mutex _primAllocateMutex = new Mutex(false);
-        
+
         protected readonly ClientManager m_clientManager = new ClientManager();
 
         public bool LoginsEnabled
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual RegionInfo RegionInfo { get; private set; }
 
         #region admin stuff
-        
+
         public abstract void OtherRegionUp(GridRegion otherRegion);
 
         public virtual string GetSimulatorVersion()
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return myID;
         }
-        
+
         #region Module Methods
 
         /// <summary>
@@ -366,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_moduleCommanders.ContainsKey(name))
                     return m_moduleCommanders[name];
             }
-            
+
             return null;
         }
 
@@ -416,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void RegisterModuleInterface<M>(M mod)
         {
 //            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
-            
+
             List<Object> l = null;
             if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
             {
@@ -527,9 +527,9 @@ namespace OpenSim.Region.Framework.Scenes
                 return new T[] {};
             }
         }
-        
+
         #endregion
-        
+
         /// <summary>
         /// Call this from a region module to add a command to the OpenSim console.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 3eefd3c..6304778 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Framework.Scenes
                 OpenSim.Framework.RegionFlags? regionFlags = n.RegionFlags;
 
                 //                m_log.DebugFormat(
-                //                    "{0}: Region flags for {1} as seen by {2} are {3}", 
+                //                    "{0}: Region flags for {1} as seen by {2} are {3}",
                 //                    LogHeader, n.RegionName, m_scene.Name, regionFlags != null ? regionFlags.ToString() : "not present");
 
                 // Robust services before 2015-01-14 do not return the regionFlags information.  In this case, we could
@@ -175,7 +175,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence)
         {
             //            m_log.DebugFormat(
-            //                "[SCENE COMMUNICATION SERVICE]: Sending child agent position updates for {0} in {1}", 
+            //                "[SCENE COMMUNICATION SERVICE]: Sending child agent position updates for {0} in {1}",
             //                presence.Name, m_scene.Name);
 
             // This assumes that we know what our neighbors are.
@@ -248,7 +248,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Closes a child agents in a collection of regions. Does so asynchronously 
+        /// Closes a child agents in a collection of regions. Does so asynchronously
         /// so that the caller doesn't wait.
         /// </summary>
         /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 579874a..2f65ce2 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -87,21 +87,21 @@ namespace OpenSim.Region.Framework.Scenes
         protected int m_scriptLPS = 0;
 
         protected internal PhysicsScene _PhyScene;
-        
+
         /// <summary>
         /// Index the SceneObjectGroup for each part by the root part's UUID.
         /// </summary>
         protected internal Dictionary<UUID, SceneObjectGroup> SceneObjectGroupsByFullID = new Dictionary<UUID, SceneObjectGroup>();
-        
+
         /// <summary>
         /// Index the SceneObjectGroup for each part by that part's UUID.
         /// </summary>
         protected internal Dictionary<UUID, SceneObjectGroup> SceneObjectGroupsByFullPartID = new Dictionary<UUID, SceneObjectGroup>();
-        
+
         /// <summary>
         /// Index the SceneObjectGroup for each part by that part's local ID.
         /// </summary>
-        protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>();        
+        protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>();
 
         /// <summary>
         /// Lock to prevent object group update, linking, delinking and duplication operations from running concurrently.
@@ -121,11 +121,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         public PhysicsScene PhysicsScene
         {
-            get 
+            get
             {
                 if (_PhyScene == null)
                     _PhyScene = m_parentScene.RequestModuleInterface<PhysicsScene>();
-                return _PhyScene; 
+                return _PhyScene;
             }
             set
             {
@@ -215,7 +215,7 @@ namespace OpenSim.Region.Framework.Scenes
             // the joint in the Scene does not exist in the PhysicsScene.
             //
             // To solve this, we have an event in the PhysicsScene that is fired when a joint
-            // has changed position (because one of its associated PhysicsActors has changed 
+            // has changed position (because one of its associated PhysicsActors has changed
             // position).
             //
             // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // coarse locations are sent as BYTE, so limited to the 255m max of normal regions
             // try to work around that scale down X and Y acording to region size, so reducing the resolution
-            // 
+            //
             // viewers need to scale up
             float scaleX = (float)m_parentScene.RegionInfo.RegionSizeX / (float)Constants.RegionSize;
             if (scaleX == 0)
@@ -259,7 +259,7 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i)
             {
                 ScenePresence sp = presences[i];
-                
+
                 // If this presence is a child agent, we don't want its coarse locations
                 if (sp.IsChildAgent)
                     continue;
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return ret;
         }
-                
+
         /// <summary>
         /// Add a newly created object to the scene.  This will both update the scene, and send information about the
         /// new object to all clients interested in the scene.
@@ -372,11 +372,11 @@ namespace OpenSim.Region.Framework.Scenes
 
             return ret;
         }
-        
+
         /// <summary>
         /// Add a newly created object to the scene.
         /// </summary>
-        /// 
+        ///
         /// This method does not send updates to the client - callers need to handle this themselves.
         /// Caller should also trigger EventManager.TriggerObjectAddedToScene
         /// <param name="sceneObject"></param>
@@ -630,7 +630,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 List<SceneObjectGroup> updates;
 
-                // Some updates add more updates to the updateList. 
+                // Some updates add more updates to the updateList.
                 // Get the current list of updates and clear the list before iterating
                 lock (m_updateList)
                 {
@@ -762,7 +762,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
                 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
-                
+
                 // Remove the presence reference from the dictionary
                 if (newmap.ContainsKey(agentID))
                 {
@@ -874,7 +874,7 @@ namespace OpenSim.Region.Framework.Scenes
         #endregion
 
         #region Get Methods
-        
+
         /// <summary>
         /// Get the controlling client for the given avatar, if there is one.
         ///
@@ -1190,7 +1190,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return null;
             return group.GetPart(localID);
         }
-        
+
         /// <summary>
         /// Get a prim by name from the scene (will return the first
         /// found, if there are more than one prim with the same name)
@@ -1209,7 +1209,7 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (SceneObjectPart p in ((SceneObjectGroup)entity).Parts)
                         {
 //                            m_log.DebugFormat("[SCENE GRAPH]: Part {0} has name {1}", p.UUID, p.Name);
-                        
+
                             if (p.Name == name)
                             {
                                 sop = p;
@@ -1308,7 +1308,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Performs action on all scene presences. This can ultimately run the actions in parallel but
         /// any delegates passed in will need to implement their own locking on data they reference and
-        /// modify outside of the scope of the delegate. 
+        /// modify outside of the scope of the delegate.
         /// </summary>
         /// <param name="action"></param>
         public void ForEachScenePresence(Action<ScenePresence> action)
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
+
         #endregion
 
         #region Client Event handlers
@@ -1574,7 +1574,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void UpdatePrimGroupPosition(uint localId, Vector3 pos, UUID updatingAgentId)
         {
             SceneObjectGroup group = GetGroupByPrim(localId);
-            
+
             if (group != null)
             {
                 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
@@ -1589,7 +1589,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, updatingAgentId) 
+                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, updatingAgentId)
                         && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
                     {
                         group.UpdateGroupPosition(pos);
@@ -1611,7 +1611,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
         {
             SceneObjectGroup group = GetGroupByPrim(localID);
-            
+
             if (group != null)
             {
                 if (m_parentScene.Permissions.CanEditObject(group.UUID,remoteClient.AgentId))
@@ -1730,8 +1730,8 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
                     if (part != null)
                     {
-                            part.ClickAction = Convert.ToByte(clickAction);
-                            group.HasGroupChanged = true;
+                        part.ClickAction = Convert.ToByte(clickAction);
+                        group.HasGroupChanged = true;
                     }
                 }
             }
@@ -1966,7 +1966,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // However, editing linked parts and unlinking may be different
                     //
                     SceneObjectGroup group = root.ParentGroup;
-                   
+
                     List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
 
                     newSet.Remove(root);
@@ -1978,7 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes
                         group.DelinkFromGroup(p, false);
 
                     SceneObjectPart newRoot = newSet[0];
-                    
+
                     // If there is more than one prim remaining, we
                     // need to re-link
                     //
@@ -1996,7 +1996,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         newRoot.TriggerScriptChangedEvent(Changed.LINK);
                         newRoot.ParentGroup.HasGroupChanged = true;
-                        newRoot.ParentGroup.ScheduleGroupForFullUpdate();                   
+                        newRoot.ParentGroup.ScheduleGroupForFullUpdate();
                     }
                 }
 
@@ -2089,7 +2089,7 @@ namespace OpenSim.Region.Framework.Scenes
         public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
         {
 //            m_log.DebugFormat(
-//                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", 
+//                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}",
 //                originalPrimID, offset, AgentID);
 
             SceneObjectGroup original = GetGroupByPrim(originalPrimID);
@@ -2194,6 +2194,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-       
+
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c5c083a..1e418df 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -91,12 +91,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private static SceneManager m_instance = null;
         public static SceneManager Instance
-        { 
+        {
             get {
                 if (m_instance == null)
                     m_instance = new SceneManager();
                 return m_instance;
-            } 
+            }
         }
 
         private readonly DoubleDictionary<UUID, string, Scene> m_localScenes = new DoubleDictionary<UUID, string, Scene>();
@@ -340,7 +340,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TrySetCurrentScene(string regionName)
         {
-            if ((String.Compare(regionName, "root") == 0) 
+            if ((String.Compare(regionName, "root") == 0)
                 || (String.Compare(regionName, "..") == 0)
                 || (String.Compare(regionName, "/") == 0))
             {
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return true;
                 }
             }
-            
+
             scene = null;
             return false;
         }
@@ -415,7 +415,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return true;
                 }
             }
-            
+
             scene = null;
             return false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 98617d1..9f98554 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -114,9 +114,9 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID)
         {
 //            m_log.DebugFormat(
-//                "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}", 
+//                "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
 //                item.Name, remoteClient.Name, localID);
-            
+
             UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
 
             SceneObjectPart part = GetPart(localID);
@@ -147,8 +147,8 @@ namespace OpenSim.Region.Framework.Scenes
                     // We're adding this to a prim we don't own. Force
                     // owner change
                     taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
-                } 
-                else 
+                }
+                else
                 {
                     taskItem.BasePermissions = item.BasePermissions;
                     taskItem.CurrentPermissions = item.CurrentPermissions;
@@ -156,13 +156,13 @@ namespace OpenSim.Region.Framework.Scenes
                     taskItem.GroupPermissions = item.GroupPermissions;
                     taskItem.NextPermissions = item.NextPermissions;
                 }
-                          
+
                 taskItem.Flags = item.Flags;
 
 //                m_log.DebugFormat(
-//                    "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}", 
-//                    taskItem.Flags, taskItem.Name, localID, remoteClient.Name);                      
-                
+//                    "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
+//                    taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
+
                 // TODO: These are pending addition of those fields to TaskInventoryItem
 //                taskItem.SalePrice = item.SalePrice;
 //                taskItem.SaleType = item.SaleType;
@@ -328,13 +328,13 @@ namespace OpenSim.Region.Framework.Scenes
             xmldoc.AppendChild(xmlnode);
             XmlElement rootElement = xmldoc.CreateElement("", "ScriptData",
                     String.Empty);
-            
+
             xmldoc.AppendChild(rootElement);
 
-            
+
             XmlElement wrapper = xmldoc.CreateElement("", "ScriptStates",
                     String.Empty);
-            
+
             rootElement.AppendChild(wrapper);
 
             foreach (KeyValuePair<UUID, string> state in states)
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             IScriptModule scriptModule = null;
-            
+
             foreach (IScriptModule sm in s.RequestModuleInterfaces<IScriptModule>())
             {
                 if (sm.ScriptEngineName == s.DefaultScriptEngine)
@@ -401,7 +401,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             XmlElement dataE = (XmlElement)dataL[0];
-            
+
             foreach (XmlNode n in dataE.ChildNodes)
             {
                 XmlElement stateE = (XmlElement)n;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e42b675..8fdb0f1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -24,7 +24,7 @@
  * (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.ComponentModel;
 using System.Collections.Generic;
@@ -46,7 +46,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes
 {
-    
+
     [Flags]
     public enum scriptEvents
     {
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (value)
                 {
-                    
+
                     if (Backup)
                     {
                         m_scene.SceneGraph.FireChangeBackup(this);
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 m_hasGroupChanged = value;
-                
+
 //                m_log.DebugFormat(
 //                    "[SCENE OBJECT GROUP]: HasGroupChanged set to {0} for {1} {2}", m_hasGroupChanged, Name, LocalId);
             }
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         private bool m_groupContainsForeignPrims = false;
-        
+
         /// <summary>
         /// Whether the group contains prims that came from a different group. This happens when
         /// linking or delinking groups. The implication is that until the group is persisted,
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_maxPersistTime = m_scene.m_persistAfter;
                 m_minPersistTime = m_scene.m_dontPersistBefore;
             }
-                
+
             long currentTime = DateTime.UtcNow.Ticks;
 
             if (timeLastChanged == 0) timeLastChanged = currentTime;
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Framework.Scenes
 //        {
 //            get { return m_rotation; }
 //            set {
-//                m_rotation = value; 
+//                m_rotation = value;
 //            }
 //        }
 
@@ -435,27 +435,27 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 minScale = new Vector3(Constants.MaximumRegionSize, Constants.MaximumRegionSize, Constants.MaximumRegionSize);
                 Vector3 maxScale = Vector3.Zero;
                 Vector3 finalScale = new Vector3(0.5f, 0.5f, 0.5f);
-    
+
                 SceneObjectPart[] parts = m_parts.GetArray();
                 for (int i = 0; i < parts.Length; i++)
                 {
                     SceneObjectPart part = parts[i];
                     Vector3 partscale = part.Scale;
                     Vector3 partoffset = part.OffsetPosition;
-    
+
                     minScale.X = (partscale.X + partoffset.X < minScale.X) ? partscale.X + partoffset.X : minScale.X;
                     minScale.Y = (partscale.Y + partoffset.Y < minScale.Y) ? partscale.Y + partoffset.Y : minScale.Y;
                     minScale.Z = (partscale.Z + partoffset.Z < minScale.Z) ? partscale.Z + partoffset.Z : minScale.Z;
-    
+
                     maxScale.X = (partscale.X + partoffset.X > maxScale.X) ? partscale.X + partoffset.X : maxScale.X;
                     maxScale.Y = (partscale.Y + partoffset.Y > maxScale.Y) ? partscale.Y + partoffset.Y : maxScale.Y;
                     maxScale.Z = (partscale.Z + partoffset.Z > maxScale.Z) ? partscale.Z + partoffset.Z : maxScale.Z;
                 }
-    
+
                 finalScale.X = (minScale.X > maxScale.X) ? minScale.X : maxScale.X;
                 finalScale.Y = (minScale.Y > maxScale.Y) ? minScale.Y : maxScale.Y;
                 finalScale.Z = (minScale.Z > maxScale.Z) ? minScale.Z : maxScale.Z;
-    
+
                 return finalScale;
             }
         }
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <remarks>
         /// This is necessary in some cases, particularly when a scene object has just crossed into a region and doesn't
         /// have the IsAttachment property yet checked.
-        /// 
+        ///
         /// FIXME: However, this should be fixed so that this property
         /// propertly reflects the underlying status.
         /// </remarks>
@@ -530,7 +530,7 @@ namespace OpenSim.Region.Framework.Scenes
             return (IsAttachment ||
                 (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0));
         }
-        
+
         private struct avtocrossInfo
         {
             public ScenePresence av;
@@ -627,7 +627,7 @@ namespace OpenSim.Region.Framework.Scenes
             OpenSim.Services.Interfaces.GridRegion destination = null;
 
             if (sog.RootPart.DIE_AT_EDGE)
-            {               
+            {
                 try
                 {
                     sogScene.DeleteSceneObject(sog, false);
@@ -648,7 +648,7 @@ namespace OpenSim.Region.Framework.Scenes
                     localIDs.Add(sog.RootPart.LocalId);
                     sogScene.AddReturn(sog.OwnerID, sog.Name, sog.AbsolutePosition,
                         "Returned at region cross");
-                    sogScene.DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return, UUID.Zero);                   
+                    sogScene.DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return, UUID.Zero);
                 }
                 catch (Exception)
                 {
@@ -754,7 +754,7 @@ namespace OpenSim.Region.Framework.Scenes
                             // avatar cross failed we need do dedicated standUp
                             // part of it was done at CrossAgentToNewRegionAsync
                             // so for now just remove the sog controls
-                            // this may need extra care 
+                            // this may need extra care
                             av.UnRegisterSeatControls(sog.UUID);
                         }
 
@@ -869,7 +869,7 @@ namespace OpenSim.Region.Framework.Scenes
         public override UUID UUID
         {
             get { return m_rootPart.UUID; }
-            set 
+            set
             {
                 lock (m_parts.SyncRoot)
                 {
@@ -931,7 +931,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return true; }
         }
-        
+
         public bool IsSelected
         {
             get { return m_isSelected; }
@@ -944,7 +944,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // but ode engines should only really need to know about root part
                 // so they can put entire object simulation on hold and not colliding
                 // keep as was for now
-                
+
                 PhysicsActor pa = m_rootPart.PhysActor;
                 if (pa != null)
                 {
@@ -1107,7 +1107,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public SceneObjectGroup()
         {
-            
+
         }
 
         /// <summary>
@@ -1152,7 +1152,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if (itemid != UUID.Zero)
                             m_savedScriptState[itemid] = node.InnerXml;
                     }
-                } 
+                }
             }
         }
 
@@ -1211,11 +1211,11 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (!Backup)
                     m_scene.EventManager.OnBackup += ProcessBackup;
-                
+
                 Backup = true;
             }
         }
-        
+
         /// <summary>
         /// Attach this object to a scene.  It will also now appear to agents.
         /// </summary>
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
                 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
                 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
 
-                
+
 
                 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
                 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             int nparts = parts.Length;
-          
+
 
             for (int i = 0; i < nparts; i++)
             {
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 linksetResCost = 0;
                 linksetPhysCost = 0;
-                partCost = 0; 
+                partCost = 0;
                 partPhysCost = 0;
 
                 for (int i = 0; i < nparts; i++)
@@ -1838,7 +1838,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
             {
                 m_log.WarnFormat(
-                    "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present", 
+                    "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
                     UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
             }
         }
@@ -1925,7 +1925,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
         }
-        
+
         /// <summary>
         /// Set a part to act as the root part for this scene object
         /// </summary>
@@ -1940,7 +1940,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!IsAttachment)
                 part.ParentID = 0;
             part.LinkNum = 0;
-            
+
             m_parts.Add(m_rootPart.UUID, m_rootPart);
         }
 
@@ -1991,19 +1991,19 @@ namespace OpenSim.Region.Framework.Scenes
         // justincc: I don't believe this hack is needed any longer, especially since the physics
         // parts of set AbsolutePosition were already commented out.  By changing HasGroupChanged to false
         // this method was preventing proper reload of scene objects.
-        
+
         // dahlia: I had to uncomment it, without it meshing was failing on some prims and objects
         // at region startup
-        
-        // teravus: After this was removed from the linking algorithm, Linked prims no longer collided 
+
+        // teravus: After this was removed from the linking algorithm, Linked prims no longer collided
         // properly when non-physical if they havn't been moved.   This breaks ALL builds.
         // see: http://opensimulator.org/mantis/view.php?id=3108
-        
-        // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the 
-        // position of linkset prims.  IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and 
-        // unmoved prims!  As soon as you move a Prim/group, it will collide properly because Absolute 
+
+        // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
+        // position of linkset prims.  IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and
+        // unmoved prims!  As soon as you move a Prim/group, it will collide properly because Absolute
         // Position has been set!
-        
+
         public void ResetChildPrimPhysicsPositions()
         {
             // Setting this SOG's absolute position also loops through and sets the positions
@@ -2219,9 +2219,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (m_rootPart.PhysActor != null)
                     m_rootPart.PhysActor.Building = false;
-                        }
-                        else
-                        {
+            }
+            else
+            {
                 // Apply physics to the root prim
                 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false);
             }
@@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                                 DetachFromBackup();
                                 m_log.DebugFormat(
-                                    "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", 
+                                    "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn",
                                      RootPart.UUID);
                                 m_scene.AddReturn(OwnerID == GroupID ? LastOwnerID : OwnerID, Name, AbsolutePosition, "parcel autoreturn");
                                 m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
@@ -2364,9 +2364,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                         datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
 
-                        backup_group.ForEachPart(delegate(SceneObjectPart part) 
-                        { 
-                            part.Inventory.ProcessInventoryBackup(datastore); 
+                        backup_group.ForEachPart(delegate(SceneObjectPart part)
+                        {
+                            part.Inventory.ProcessInventoryBackup(datastore);
 
                             if(part.KeyframeMotion != null)
                             {
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[SCENE]: Storing of {0}, {1} in {2} failed with exception {3}{4}", 
+                    "[SCENE]: Storing of {0}, {1} in {2} failed with exception {3}{4}",
                     Name, UUID, m_scene.RegionInfo.RegionName, e.Message, e.StackTrace);
             }
         }
@@ -2427,22 +2427,22 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_dupeInProgress = true;
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
-  
+
             dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
 
             // a copy isnt backedup
             dupe.Backup = false;
             dupe.InvalidBoundsRadius();
-  
+
             // a copy is not in transit hopefully
             dupe.inTransit = false;
-            
-            // new group as no sitting avatars            
+
+            // new group as no sitting avatars
             dupe.m_sittingAvatars = new List<ScenePresence>();
 
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
-            
+
 
             if (userExposed)
                 dupe.m_rootPart.TrimPermissions();
@@ -2587,7 +2587,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (pa != null)
                 {
-                    // false to be applied as a impulse 
+                    // false to be applied as a impulse
                     pa.AddForce(impulse, false);
                     m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
                 }
@@ -2723,7 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes
             if(IsAttachment)
                 {
                     ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
-                    if (avatar != null) 
+                    if (avatar != null)
                         pa = avatar.PhysicsActor;
                 }
             else
@@ -2813,7 +2813,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags)
         {
             remoteClient.SendObjectPropertiesFamilyData(RootPart, RequestFlags);
-            
+
 //             remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask,
 //                                                         RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask,
 //                                                         RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category,
@@ -2844,7 +2844,7 @@ namespace OpenSim.Region.Framework.Scenes
             //    return;
 
             // If we somehow got here to updating the SOG and its root part is not scheduled for update,
-            // check to see if the physical position or rotation warrant an update. 
+            // check to see if the physical position or rotation warrant an update.
             if (m_rootPart.UpdateFlag == UpdateRequired.NONE)
             {
                 // rootpart SendScheduledUpdates will check if a update is needed
@@ -2885,7 +2885,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            if (IsAttachment)
 //                m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, LocalId);
-            
+
             checkAtTargets();
             RootPart.ScheduleFullUpdate();
 
@@ -2919,11 +2919,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Immediately send a full update for this scene object.
         /// </summary>
         public void SendGroupFullUpdate()
-        {                       
+        {
             if (IsDeleted)
                 return;
 
-//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);            
+//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
 
             if (IsAttachment)
             {
@@ -2964,7 +2964,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (m_scene == null) // Need to check here as it's null during object creation
                 return;
-            
+
             m_scene.SceneGraph.AddToUpdateList(this);
         }
 
@@ -3139,7 +3139,7 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 oldGroupPosition = linkPart.GroupPosition;
             Quaternion oldRootRotation = linkPart.RotationOffset;
 
-            // A linked SOP remembers its location and rotation relative to the root of a group. 
+            // A linked SOP remembers its location and rotation relative to the root of a group.
             // Convert the root of the group being linked to be relative to the
             //   root of the group being linked to.
             // Note: Some of the assignments have complex side effects.
@@ -3247,7 +3247,7 @@ namespace OpenSim.Region.Framework.Scenes
             objectGroup.IsDeleted = true;
 
             objectGroup.m_parts.Clear();
-            
+
             // Can't do this yet since backup still makes use of the root part without any synchronization
 //            objectGroup.m_rootPart = null;
 
@@ -3258,8 +3258,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             AttachToBackup();
 
-            // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the 
-            // position of linkset prims.  IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and 
+            // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
+            // position of linkset prims.  IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and
             // unmoved prims!
             ResetChildPrimPhysicsPositions();
 
@@ -3453,7 +3453,7 @@ namespace OpenSim.Region.Framework.Scenes
                 lock (m_parts.SyncRoot)
                     if(!m_parts.Remove(linkPart.UUID))
                         continue;
-                
+
                 linkPart.ClearUndoState();
 
                 Vector3 worldPos = linkPart.GetWorldPosition();
@@ -3580,7 +3580,7 @@ namespace OpenSim.Region.Framework.Scenes
             part.setOffsetPosition(newPos - AbsolutePosition);
 
             // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times.
-            //   It would have the affect of setting the physics engine position multiple 
+            //   It would have the affect of setting the physics engine position multiple
             //   times. In theory, that is not necessary but I don't have a good linkset
             //   test to know that cleaning up this code wouldn't break things.)
 
@@ -3685,29 +3685,29 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SpinMovement(Quaternion newOrientation, IClientAPI remoteClient)
         {
-            // The incoming newOrientation, sent by the client, "seems" to be the 
-            // desired target orientation. This needs further verification; in particular, 
+            // The incoming newOrientation, sent by the client, "seems" to be the
+            // desired target orientation. This needs further verification; in particular,
             // one would expect that the initial incoming newOrientation should be
-            // fairly close to the original prim's physical orientation, 
+            // fairly close to the original prim's physical orientation,
             // m_rootPart.PhysActor.Orientation. This however does not seem to be the
             // case (might just be an issue with different quaternions representing the
             // same rotation, or it might be a coordinate system issue).
             //
             // Since it's not clear what the relationship is between the PhysActor.Orientation
             // and the incoming orientations sent by the client, we take an alternative approach
-            // of calculating the delta rotation between the orientations being sent by the 
+            // of calculating the delta rotation between the orientations being sent by the
             // client. (Since a spin is invoked by ctrl+shift+drag in the client, we expect
             // a steady stream of several new orientations coming in from the client.)
             // This ensures that the delta rotations are being calculated from self-consistent
             // pairs of old/new rotations. Given the delta rotation, we apply a torque around
             // the delta rotation axis, scaled by the object mass times an arbitrary scaling
             // factor (to ensure the resulting torque is not "too strong" or "too weak").
-            // 
+            //
             // Ideally we need to calculate (probably iteratively) the exact torque or series
-            // of torques needed to arrive exactly at the destination orientation. However, since 
+            // of torques needed to arrive exactly at the destination orientation. However, since
             // it is not yet clear how to map the destination orientation (provided by the viewer)
-            // into PhysActor orientations (needed by the physics engine), we omit this step. 
-            // This means that the resulting torque will at least be in the correct direction, 
+            // into PhysActor orientations (needed by the physics engine), we omit this step.
+            // This means that the resulting torque will at least be in the correct direction,
             // but it will result in over-shoot or under-shoot of the target orientation.
             // For the end user, this means that ctrl+shift+drag can be used for relative,
             // but not absolute, adjustments of orientation for physical prims.
@@ -3750,7 +3750,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if(rotationAngle > 0)
                             spinforce = spinforce * pa.Mass * 0.1f; // 0.1 is an arbitrary torque scaling factor
                         else
-                           spinforce = spinforce * pa.Mass * -0.1f; // 0.1 is an arbitrary torque scaling 
+                           spinforce = spinforce * pa.Mass * -0.1f; // 0.1 is an arbitrary torque scaling
                         pa.AddAngularForce(spinforce,true);
                         m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
                     }
@@ -3870,8 +3870,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (selectionPart != null)
             {
                 SceneObjectPart[] parts = m_parts.GetArray();
-                
-                if (Scene != null && UsePhysics)               
+
+                if (Scene != null && UsePhysics)
                 {
                     int maxprims = m_scene.m_linksetPhysCapacity;
                     bool checkShape = (maxprims > 0 &&
@@ -3975,7 +3975,7 @@ namespace OpenSim.Region.Framework.Scenes
             RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
 
 //            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}", 
+//                "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}",
 //                (OpenMetaverse.PermissionMask)RootPart.OwnerMask, Name, Scene.Name);
 
             RootPart.ScheduleFullUpdate();
@@ -4273,7 +4273,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (Scene == null || IsDeleted || inTransit)
                 return 1.0f;
- 
+
             float maxsize = Scene.m_maxNonphys;
             PhysicsActor pa = m_rootPart.PhysActor;
             // assuming physics is more restrictive
@@ -4282,7 +4282,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectPart[] parts = m_parts.GetArray();
             float larger = float.MinValue;
-            
+
             for(int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart obPart = parts[i];
@@ -4310,7 +4310,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (Scene == null || IsDeleted || inTransit)
                 return 1.0f;
- 
+
             float minsize = Scene.m_minNonphys;
             PhysicsActor pa = m_rootPart.PhysActor;
             // assuming physics is more restrictive
@@ -4319,7 +4319,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectPart[] parts = m_parts.GetArray();
             float smaller = float.MaxValue;
-            
+
             for(int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart obPart = parts[i];
@@ -4388,7 +4388,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="pos"></param>
         /// <param name="localID"></param>
-        /// 
+        ///
 
         public void UpdateSinglePosition(Vector3 pos, uint localID)
         {
@@ -4443,7 +4443,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             AbsolutePosition = newPos;
-             
+
             if (IsAttachment)
                 m_rootPart.AttachedPos = newPos;
 
@@ -4469,7 +4469,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void UpdateGroupRotationR(Quaternion rot)
         {
             m_rootPart.UpdateRotation(rot);
-        
+
 /* this is done by rootpart RotationOffset set called by UpdateRotation
             PhysicsActor actor = m_rootPart.PhysActor;
             if (actor != null)
@@ -4747,7 +4747,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (setX || setY || setZ)
             {
                 bool lockaxis = (rotate10 == 0); // zero means axis locked
-                    
+
                 byte locks = RootPart.RotationAxisLocks;
 
                 if (setX)
@@ -4757,7 +4757,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                         locks &= (byte)SceneObjectGroup.axisSelect.NOT_STATUS_ROTATE_X;
                     }
-                   
+
                 if (setY)
                     {
                     if(lockaxis)
@@ -4791,7 +4791,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (axis == (int)SceneObjectGroup.axisSelect.STATUS_ROTATE_X)
                 return (rotAxislocks & (byte)SceneObjectGroup.axisSelect.STATUS_ROTATE_X) == 0 ? 1:0;
 
-            return 0;      
+            return 0;
         }
 
         public int registerRotTargetWaypoint(Quaternion target, float tolerance)
@@ -4837,7 +4837,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_scene.AddGroupTarget(this);
             return (int)handle;
         }
-        
+
         public void unregisterTargetWaypoint(int handle)
         {
             lock (m_targets)
@@ -4879,14 +4879,14 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                         }
                     }
-                    
+
                     if (atTargets.Count > 0)
                     {
                         SceneObjectPart[] parts = m_parts.GetArray();
                         uint[] localids = new uint[parts.Length];
                         for (int i = 0; i < parts.Length; i++)
                             localids[i] = parts[i].LocalId;
-                        
+
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
                             foreach (uint target in atTargets.Keys)
@@ -4896,10 +4896,10 @@ namespace OpenSim.Region.Framework.Scenes
                                     localids[ctr], att.handle, att.targetPos, m_rootPart.GroupPosition);
                             }
                         }
-                        
+
                         return;
                     }
-                    
+
                     if (m_scriptListens_notAtTarget && !at_target)
                     {
                         //trigger not_at_target
@@ -4907,7 +4907,7 @@ namespace OpenSim.Region.Framework.Scenes
                         uint[] localids = new uint[parts.Length];
                         for (int i = 0; i < parts.Length; i++)
                             localids[i] = parts[i].LocalId;
-                        
+
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
                             m_scene.EventManager.TriggerNotAtTargetEvent(localids[ctr]);
@@ -4994,7 +4994,7 @@ namespace OpenSim.Region.Framework.Scenes
             // http://wiki.secondlife.com/wiki/llGetGeometricCenter
             // ignoring tortured prims details since sl also seems to ignore
             // so no real use in doing it on physics
-            
+
             Vector3 gc = Vector3.Zero;
 
             SceneObjectPart[] parts = m_parts.GetArray();
@@ -5034,7 +5034,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 tmp = pa.CenterOfMass;
                 return tmp;
             }
-            
+
             Vector3 Ptot = Vector3.Zero;
             float totmass = 0f;
             float m;
@@ -5072,7 +5072,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             HasGroupChanged = true;
-            
+
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
             // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b95b5be..b97cceb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
                     );
         private const scriptEvents PhyscicsVolumeDtcSubsEvents = (
                     scriptEvents.collision_start | scriptEvents.collision_end
-                    );      
+                    );
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -148,8 +148,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Dynamic objects that can be created and deleted as required.
         /// </summary>
-        public DOMap DynObjs 
-        { 
+        public DOMap DynObjs
+        {
             get
             {
                 if (m_dynObjs == null)
@@ -163,16 +163,16 @@ namespace OpenSim.Region.Framework.Scenes
                 m_dynObjs = value;
             }
         }
-        
+
         /// <value>
         /// Is this a root part?
         /// </value>
         /// <remarks>
         /// This will return true even if the whole object is attached to an avatar.
         /// </remarks>
-        public bool IsRoot 
+        public bool IsRoot
         {
-            get { return Object.ReferenceEquals(ParentGroup.RootPart, this); } 
+            get { return Object.ReferenceEquals(ParentGroup.RootPart, this); }
         }
 
         /// <summary>
@@ -192,11 +192,11 @@ namespace OpenSim.Region.Framework.Scenes
         #region Fields
 
         public bool AllowedDrop;
-        
+
         public bool DIE_AT_EDGE;
-        
+
         public bool RETURN_AT_EDGE;
-        
+
         public bool BlockGrab { get; set; }
 
         public bool StatusSandbox;
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Framework.Scenes
         //  Note: This isn't persisted in the database right now, as the fields for that aren't just there yet.
         //        Not a big problem as long as the script that sets it remains in the prim on startup.
         //        for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
-        
+
         public UUID Sound;
 
         public byte SoundFlags;
@@ -254,7 +254,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         [XmlIgnore]
         public int STATUS_ROTATE_X; // this should not be used
- 
+
         [XmlIgnore]
         public int STATUS_ROTATE_Y;  // this should not be used
 
@@ -262,13 +262,13 @@ namespace OpenSim.Region.Framework.Scenes
         public int STATUS_ROTATE_Z;  // this should not be used
 
         private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
-               
+
         /// <value>
         /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
         /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item.
         /// </value>
         private UUID m_fromUserInventoryItemID;
-        
+
         public UUID FromUserInventoryItemID
         {
             get { return m_fromUserInventoryItemID; }
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool VolumeDetectActive
         {
-            get  
+            get
             {
                 return (Flags & (PrimFlags)primFlagVolumeDetect) != 0;
             }
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// This part's inventory
-        /// </summary>        
+        /// </summary>
         public IEntityInventory Inventory
         {
             get { return m_inventory; }
@@ -321,20 +321,20 @@ namespace OpenSim.Region.Framework.Scenes
         protected SceneObjectPartInventory m_inventory;
 
         public bool Undoing;
-        
+
         public bool IgnoreUndoUpdate = false;
-        
+
         public PrimFlags LocalFlags;
-        
+
         private float m_damage = -1.0f;
         private byte[] m_TextureAnimation;
         private byte m_clickAction;
         private Color m_color = Color.Black;
         private readonly List<uint> m_lastColliders = new List<uint>();
         private int m_linkNum;
-        
+
         private int m_scriptAccessPin;
-        
+
         private readonly Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
         private string m_sitName = String.Empty;
         private Quaternion m_sitTargetOrientation = Quaternion.Identity;
@@ -403,7 +403,7 @@ namespace OpenSim.Region.Framework.Scenes
         private UUID m_collisionSound;
         private float m_collisionSoundVolume;
 
-        private int LastColSoundSentTime; 
+        private int LastColSoundSentTime;
 
         private SOPVehicle m_vehicleParams = null;
 
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="rotationOffset"></param>
         /// <param name="offsetPosition"></param>
         public SceneObjectPart(
-            UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
+            UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
             Quaternion rotationOffset, Vector3 offsetPosition) : this()
         {
             m_name = "Object";
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_createSelected = false;
 
         private UUID _creatorID;
-        public UUID CreatorID 
+        public UUID CreatorID
         {
             get { return _creatorID; }
             set { _creatorID = value; }
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Data about the creator in the form home_url;name
         /// </summary>
-        public string CreatorData 
+        public string CreatorData
         {
             get { return m_creatorData; }
             set { m_creatorData = value; }
@@ -565,7 +565,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// A relic from when we we thought that prims contained folder objects. In 
+        /// A relic from when we we thought that prims contained folder objects. In
         /// reality, prim == folder
         /// Exposing this is not particularly good, but it's one of the least evils at the moment to see
         /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
@@ -611,10 +611,10 @@ namespace OpenSim.Region.Framework.Scenes
         public UUID UUID
         {
             get { return m_uuid; }
-            set 
-            { 
-                m_uuid = value; 
-                
+            set
+            {
+                m_uuid = value;
+
                 // This is necessary so that TaskInventoryItem parent ids correctly reference the new uuid of this part
                 if (Inventory != null)
                     Inventory.ResetObjectID();
@@ -634,8 +634,8 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual string Name
         {
             get { return m_name; }
-            set 
-            { 
+            set
+            {
                 m_name = value;
 
                 PhysicsActor pa = PhysActor;
@@ -678,11 +678,11 @@ namespace OpenSim.Region.Framework.Scenes
                 m_isSelected = value;
                 if (ParentGroup != null)
                     ParentGroup.PartSelectChanged(value);
-          
+
             }
         }
-        
-        
+
+
         public Dictionary<int, string> CollisionFilter
         {
             get { return m_CollisionFilter; }
@@ -704,14 +704,14 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_APIDTarget = value; }
         }
 
-        
+
         protected float APIDDamp
         {
             get { return m_APIDDamp; }
             set { m_APIDDamp = value; }
         }
 
-        
+
         protected float APIDStrength
         {
             get { return m_APIDStrength; }
@@ -769,21 +769,21 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_particleSystem = value; }
         }
 
-        
+
         public DateTime Expires
         {
             get { return m_expires; }
             set { m_expires = value; }
         }
 
-        
+
         public DateTime Rezzed
         {
             get { return m_rezzed; }
             set { m_rezzed = value; }
         }
 
-        
+
         public float Damage
         {
             get { return m_damage; }
@@ -798,7 +798,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// The position of the entire group that this prim belongs to.
         /// </summary>
-        /// 
+        ///
 
         public Vector3 GroupPosition
         {
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // Root prim actually goes at Position
                         if (ParentID == 0)
                         {
-                            actor.Position = value;                           
+                            actor.Position = value;
                         }
                         else
                         {
@@ -955,7 +955,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return m_rotationOffset;
             }
-            
+
             set
             {
 //                StoreUndoState();
@@ -1066,24 +1066,24 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this && VehicleType == (int)Vehicle.TYPE_NONE)
                 {
                     actor.RotationalVelocity = m_angularVelocity;
-                }                       
+                }
             }
         }
 
         /// <summary></summary>
         public Vector3 Acceleration
         {
-                        get 
-                        { 
+            get
+            {
                 PhysicsActor actor = PhysActor;
                 if (actor != null)
-                                {
-                                        m_acceleration = actor.Acceleration;
-                                }
-                                return m_acceleration;
-                        } 
-           
-            set 
+                {
+                    m_acceleration = actor.Acceleration;
+                }
+                return m_acceleration;
+            }
+
+            set
             {
                 if (Util.IsNanOrInfinity(value))
                     m_acceleration = Vector3.Zero;
@@ -1217,23 +1217,23 @@ namespace OpenSim.Region.Framework.Scenes
                 else
                     b = sz;
             }
-            
-            return a * b;       
+
+            return a * b;
         }
 
         public UpdateRequired UpdateFlag { get; set; }
-        
+
         /// <summary>
         /// Used for media on a prim.
         /// </summary>
         /// Do not change this value directly - always do it through an IMoapModule.
-        public string MediaUrl 
-        { 
+        public string MediaUrl
+        {
             get
             {
-                return m_mediaUrl; 
+                return m_mediaUrl;
             }
-            
+
             set
             {
                 m_mediaUrl = value;
@@ -1246,10 +1246,10 @@ namespace OpenSim.Region.Framework.Scenes
         public bool CreateSelected
         {
             get { return m_createSelected; }
-            set 
-            { 
+            set
+            {
 //                m_log.DebugFormat("[SOP]: Setting CreateSelected to {0} for {1} {2}", value, Name, UUID);
-                m_createSelected = value; 
+                m_createSelected = value;
             }
         }
 
@@ -1423,7 +1423,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Property flags.  See OpenMetaverse.PrimFlags 
+        /// Property flags.  See OpenMetaverse.PrimFlags
         /// </summary>
         /// <remarks>
         /// Example properties are PrimFlags.Phantom and PrimFlags.DieAtEdge
@@ -1431,18 +1431,18 @@ namespace OpenSim.Region.Framework.Scenes
         public PrimFlags Flags
         {
             get { return _flags; }
-            set 
-            { 
+            set
+            {
 //                m_log.DebugFormat("[SOP]: Setting flags for {0} {1} to {2}", UUID, Name, value);
-                _flags = value; 
+                _flags = value;
             }
         }
-        
+
         [XmlIgnore]
         public bool IsOccupied                          // KF If an av is sittingon this prim
         {
-                get { return m_occupied; }
-                set { m_occupied = value; }
+            get { return m_occupied; }
+            set { m_occupied = value; }
         }
 
         /// <summary>
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         private UUID _parentUUID = UUID.Zero;
-        
+
         public UUID ParentUUID
         {
             get
@@ -1487,7 +1487,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             set { _parentUUID = value; }
         }
-        
+
         public string SitAnimation
         {
             get { return m_sitAnimation; }
@@ -1519,7 +1519,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return m_collisionSound; }
             set
-            {           
+            {
                 m_collisionSound = value;
 
                 if (value == invalidCollisionSoundUUID)
@@ -1589,7 +1589,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (ParentGroup.RootPart == this)
                     return m_torque;
-                
+
                 return ParentGroup.RootPart.Torque;
             }
 
@@ -1733,7 +1733,7 @@ namespace OpenSim.Region.Framework.Scenes
             set
             {
                 byte oldv = m_physicsShapeType;
- 
+
                 if (value >= 0 && value <= (byte)PhysShapeType.convex)
                 {
                     if (value == (byte)PhysShapeType.none && ParentGroup != null && ParentGroup.RootPart == this)
@@ -1966,7 +1966,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Utils.FloatToBytes(pTexAnim.Start).CopyTo(data, pos);
                 Utils.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4);
                 Utils.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8);
-               
+
             }
             m_TextureAnimation = data;
         }
@@ -2063,7 +2063,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             root.AngularVelocity = pAngVel;
         }
-        
+
 
         /// <summary>
         /// hook to the physics scene to apply angular impulse
@@ -2095,7 +2095,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="impulsei">Vector force</param>
         /// <param name="localGlobalTF">true for the local frame, false for the global frame</param>
-        
+
         // this is actualy Set Torque.. keeping naming so not to edit lslapi also
         public void SetAngularImpulse(Vector3 torquei, bool localGlobalTF)
         {
@@ -2116,7 +2116,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="VolumeDetectActive"></param>
         /// <param name="building"></param>
 
-                public void ApplyPhysics(uint _ObjectFlags, bool _VolumeDetectActive, bool building)
+        public void ApplyPhysics(uint _ObjectFlags, bool _VolumeDetectActive, bool building)
         {
             VolumeDetectActive = _VolumeDetectActive;
 
@@ -2177,7 +2177,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public SceneObjectPart Copy(uint plocalID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
         {
-            // FIXME: This is dangerous since it's easy to forget to reset some references when necessary and end up 
+            // FIXME: This is dangerous since it's easy to forget to reset some references when necessary and end up
             // with bugs that only occur in some circumstances (e.g. crossing between regions on the same simulator
             // but not between regions on different simulators).  Really, all copying should be done explicitly.
             SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
@@ -2242,20 +2242,20 @@ namespace OpenSim.Region.Framework.Scenes
             dupe.PayPrice = (int[])PayPrice.Clone();
 
             dupe.DynAttrs.CopyFrom(DynAttrs);
-            
+
             if (userExposed)
             {
                 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0);
                 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
             }
-            
+
             if (dupe.PhysActor != null)
                 dupe.PhysActor.LocalID = plocalID;
 
             ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed);
 
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);
-                          
+
             return dupe;
         }
 
@@ -2428,7 +2428,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     pa.link(parentPa);
                                 }
                             }
-                        }                           
+                        }
                     }
 
                     bool phan = ((Flags & PrimFlags.Phantom) != 0);
@@ -2528,7 +2528,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public uint GetEffectiveObjectFlags()
         {
-            // Commenting this section of code out since it doesn't actually do anything, as enums are handled by 
+            // Commenting this section of code out since it doesn't actually do anything, as enums are handled by
             // value rather than reference
 //            PrimFlags f = _flags;
 //            if (m_parentGroup == null || m_parentGroup.RootPart == this)
@@ -2820,7 +2820,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             ColliderArgs LandCollidingMessage = new ColliderArgs();
             List<DetectedObject> colliding = new List<DetectedObject>();
-                
+
             colliding.Add(CreateDetObjectForGround());
             LandCollidingMessage.Colliders = colliding;
 
@@ -2969,9 +2969,9 @@ namespace OpenSim.Region.Framework.Scenes
             // Note: This is only being called on the root prim at this time.
 
             m_log.ErrorFormat(
-                "[SCENE OBJECT PART]: Physical object {0}, localID {1} went out of bounds at {2} in {3}.  Stopping at {4} and making non-physical.", 
+                "[SCENE OBJECT PART]: Physical object {0}, localID {1} went out of bounds at {2} in {3}.  Stopping at {4} and making non-physical.",
                 Name, LocalId, pos, ParentGroup.Scene.Name, AbsolutePosition);
-            
+
             RemFlag(PrimFlags.Physics);
             DoPhysicsPropertyUpdate(false, true);
         }
@@ -3026,7 +3026,7 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.Debug("prev: " + prevflag.ToString() + " curr: " + Flags.ToString());
             //ScheduleFullUpdate();
         }
-        
+
         public void RemoveScriptEvents(UUID scriptid)
         {
             lock (m_scriptEvents)
@@ -3089,7 +3089,7 @@ namespace OpenSim.Region.Framework.Scenes
             ParentGroup.HasGroupChanged = true;
             ScheduleFullUpdate();
         }
-        
+
         public void RotLookAt(Quaternion target, float strength, float damping)
         {
             if(ParentGroup.IsDeleted)
@@ -3115,7 +3115,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat("[SceneObjectPart] Invalid rotation strength {0}",APIDStrength);
                 return;
             }
-                
+
             APIDActive = true;
 
             // Necessary to get the lookat deltas applied
@@ -3357,7 +3357,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             // sl Does send them
  //           if (ParentGroup.IsSelected && ParentGroup.IsAttachment)
  //               return;
-            
+
             if (ParentGroup.IsDeleted)
                 return;
 
@@ -3487,7 +3487,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public void SetBuoyancy(float fvalue)
         {
             Buoyancy = fvalue;
-/*            
+/*
             if (PhysActor != null)
             {
                 PhysActor.Buoyancy = fvalue;
@@ -3547,7 +3547,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public void SetVehicleType(int type)
         {
                 m_vehicleParams = null;
-                
+
                 if (type == (int)Vehicle.TYPE_NONE)
                 {
                     if (_parentID ==0 && PhysActor != null)
@@ -3754,7 +3754,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         {
             if (Shape.SculptEntry)
                 return PrimType.SCULPT;
-            
+
             if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
             {
                 if (Shape.PathCurve == (byte)Extrusion.Straight)
@@ -3782,12 +3782,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 else if (Shape.PathCurve == (byte)Extrusion.Curve1)
                     return PrimType.RING;
             }
-            
+
             return PrimType.BOX;
         }
-        
+
         /// <summary>
-        /// Tell us if this object has cut, hollow, dimple, and other factors affecting the number of faces 
+        /// Tell us if this object has cut, hollow, dimple, and other factors affecting the number of faces
         /// </summary>
         /// <param name="primType"></param>
         /// <param name="shape"></param>
@@ -3812,7 +3812,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             hasDimple = (shape.ProfileBegin > 0) || (shape.ProfileEnd > 0); // taken from llSetPrimitiveParms
             hasProfileCut = hasDimple; // is it the same thing?
         }
-        
+
         public void SetGroup(UUID groupID, IClientAPI client)
         {
             // Scene.AddNewPrims() calls with client == null so can't use this.
@@ -3859,7 +3859,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public void SetScriptEvents(UUID scriptid, int events)
         {
 //            m_log.DebugFormat(
-//                "[SCENE OBJECT PART]: Set script events for script with id {0} on {1}/{2} to {3} in {4}", 
+//                "[SCENE OBJECT PART]: Set script events for script with id {0} on {1}/{2} to {3} in {4}",
 //                scriptid, Name, ParentGroup.Name, events, ParentGroup.Scene.Name);
 
             // scriptEvents oldparts;
@@ -3896,7 +3896,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 ScheduleFullUpdate();
             }
         }
-        
+
         /// <summary>
         /// Set the text displayed for this part.
         /// </summary>
@@ -4491,7 +4491,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public bool IsHingeJoint()
         {
             // For now, we use the NINJA naming scheme for identifying joints.
-            // In the future, we can support other joint specification schemes such as a 
+            // In the future, we can support other joint specification schemes such as a
             // custom checkbox in the viewer GUI.
             if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
@@ -4507,7 +4507,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public bool IsBallJoint()
         {
             // For now, we use the NINJA naming scheme for identifying joints.
-            // In the future, we can support other joint specification schemes such as a 
+            // In the future, we can support other joint specification schemes such as a
             // custom checkbox in the viewer GUI.
             if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
@@ -4523,7 +4523,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         public bool IsJoint()
         {
             // For now, we use the NINJA naming scheme for identifying joints.
-            // In the future, we can support other joint specification schemes such as a 
+            // In the future, we can support other joint specification schemes such as a
             // custom checkbox in the viewer GUI.
             if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
@@ -4616,8 +4616,8 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
                 Stop();
             }
-            
-            else 
+
+            else
             {
                 if (ParentGroup.Scene.CollidablePrims)
                 {
@@ -4649,7 +4649,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
                     UpdatePhysicsSubscribedEvents();
                 }
-            }         
+            }
 
             // and last in case we have a new actor and not building
 
@@ -4658,7 +4658,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 ParentGroup.HasGroupChanged = true;
                 ScheduleFullUpdate();
             }
-            
+
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
@@ -4671,10 +4671,10 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         /// <param name="building">tells physics to delay full construction of object</param>
         /// <param name="applyDynamics">applies velocities, force and torque</param>
         private void AddToPhysics(bool isPhysical, bool isPhantom, bool building, bool applyDynamics)
-        {          
+        {
             PhysicsActor pa;
 
-            Vector3 velocity = Velocity; 
+            Vector3 velocity = Velocity;
             Vector3 rotationalVelocity = AngularVelocity;;
 
             try
@@ -4695,7 +4695,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom. e={1}", m_uuid, e);
                 pa = null;
             }
-          
+
             if (pa != null)
             {
                 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
@@ -4709,7 +4709,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
                 if(LocalId == ParentGroup.RootPart.LocalId)
                 {
-                    pa.LockAngularMotion(RotationAxisLocks);                
+                    pa.LockAngularMotion(RotationAxisLocks);
                 }
 
                 if (VolumeDetectActive) // change if not the default only
@@ -4722,7 +4722,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                         AddFlag(PrimFlags.CameraDecoupled);
                     else
                         RemFlag(PrimFlags.CameraDecoupled);
-                }                
+                }
                 else
                     RemFlag(PrimFlags.CameraDecoupled);
                 // we are going to tell rest of code about physics so better have this here
@@ -4752,8 +4752,8 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                     }
                 }
 
-                if (applyDynamics && LocalId == ParentGroup.RootPart.LocalId) 
-                    // do independent of isphysical so parameters get setted (at least some)                   
+                if (applyDynamics && LocalId == ParentGroup.RootPart.LocalId)
+                    // do independent of isphysical so parameters get setted (at least some)
                 {
                     Velocity = velocity;
                     AngularVelocity = rotationalVelocity;
@@ -4941,8 +4941,8 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
             Primitive.TextureEntryFace fallbackNewFace = newTex.DefaultTexture;
             Primitive.TextureEntryFace fallbackOldFace = oldTex.DefaultTexture;
-           
-            // On Incoming packets, sometimes newText.DefaultTexture is null.  The assumption is that all 
+
+            // On Incoming packets, sometimes newText.DefaultTexture is null.  The assumption is that all
             // other prim-sides are set, but apparently that's not always the case.  Lets assume packet/data corruption at this point.
             if (fallbackNewFace == null)
             {
@@ -4958,7 +4958,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             // Materials capable viewers can send a ObjectImage packet
             // when nothing in TE has changed. MaterialID should be updated
             // by the RenderMaterials CAP handler, so updating it here may cause a
-            // race condtion. Therefore, if no non-materials TE fields have changed, 
+            // race condtion. Therefore, if no non-materials TE fields have changed,
             // we should ignore any changes and not update Shape.TextureEntry
 
             bool otherFieldsChanged = false;
@@ -5140,7 +5140,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         {
             return m_forceMouselook;
         }
-        
+
         public override string ToString()
         {
             return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup);
@@ -5157,7 +5157,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 && (ParentGroup.RootPart != this
                     || ParentGroup.AttachedAvatar != remoteClient.AgentId && ParentGroup.HasPrivateAttachmentPoint))
                 return;
-            
+
             // Causes this thread to dig into the Client Thread Data.
             // Remember your locking here!
             remoteClient.SendEntityUpdate(
@@ -5165,9 +5165,9 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
                     | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
 
-            ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);            
+            ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
         }
-                
+
         public void AddScriptLPS(int count)
         {
             ParentGroup.AddScriptLPS(count);
@@ -5233,7 +5233,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         {
             PermissionsUtil.LogPermissions(Name, message, BaseMask, OwnerMask, NextOwnerMask);
         }
-        
+
         public void ApplyNextOwnerPermissions()
         {
             // Export needs to be preserved in the base and everyone
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 5b64aac..a50f162 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes
         private object m_inventoryFileLock = new object();
 
         private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
-        
+
         /// <value>
         /// The part to which the inventory belongs.
         /// </value>
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Tracks whether inventory has changed since the last persistent backup
         /// </summary>
         internal bool HasInventoryChanged;
-        
+
         /// <value>
         /// Inventory serial number
         /// </value>
@@ -91,8 +91,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </value>
         protected internal TaskInventoryDictionary Items
         {
-            get { 
-                return m_items; 
+            get {
+                return m_items;
             }
             set
             {
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return m_items.Count;
             }
         }
-        
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -393,7 +393,7 @@ namespace OpenSim.Region.Framework.Scenes
                 StoreScriptError(item.ItemID, msg);
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
-                    item.Name, item.ItemID, m_part.AbsolutePosition, 
+                    item.Name, item.ItemID, m_part.AbsolutePosition,
                     m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID);
 
                 return false;
@@ -410,7 +410,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items[item.ItemID].PermsGranter = UUID.Zero;
 
                 m_items.LockItemsForWrite(false);
-                
+
                 string script = Utils.BytesToString(asset.Data);
                 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
                     m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Framework.Scenes
         private UUID RestoreSavedScriptState(UUID loadedID, UUID oldID, UUID newID)
         {
 //            m_log.DebugFormat(
-//                "[PRIM INVENTORY]: Restoring scripted state for item {0}, oldID {1}, loadedID {2}", 
+//                "[PRIM INVENTORY]: Restoring scripted state for item {0}, oldID {1}, loadedID {2}",
 //                newID, oldID, loadedID);
 
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
@@ -477,7 +477,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_part.ParentGroup.m_savedScriptState[stateID] = newDoc.OuterXml;
                 }
-                
+
                 foreach (IScriptModule e in engines)
                 {
                     if (e != null)
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ArrayList errors;
 
-            // Indicate to CreateScriptInstanceInternal() we want it to 
+            // Indicate to CreateScriptInstanceInternal() we want it to
             // post any compilation/loading error messages
             lock (m_scriptErrors)
             {
@@ -641,7 +641,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (!sceneObjectBeingDeleted)
                     m_part.RemoveScriptEvents(itemId);
-                
+
                 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemId);
                 m_part.ParentGroup.AddActiveScriptCount(-1);
             }
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[PRIM INVENTORY]: " +
                     "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
-                    itemId, m_part.Name, m_part.UUID, 
+                    itemId, m_part.Name, m_part.UUID,
                     m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
             }
         }
@@ -679,7 +679,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[PRIM INVENTORY]: " +
                     "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
-                    itemId, m_part.Name, m_part.UUID, 
+                    itemId, m_part.Name, m_part.UUID,
                     m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
             }
         }
@@ -802,11 +802,11 @@ namespace OpenSim.Region.Framework.Scenes
             m_items.LockItemsForWrite(true);
             m_items.Add(item.ItemID, item);
             m_items.LockItemsForWrite(false);
-                if (allowedDrop) 
+                if (allowedDrop)
                     m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
                 else
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-            
+
             m_inventorySerial++;
             //m_inventorySerial += 2;
             HasInventoryChanged = true;
@@ -887,7 +887,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (null == rezAsset)
             {
                 m_log.WarnFormat(
-                    "[PRIM INVENTORY]: Could not find asset {0} for inventory item {1} in {2}", 
+                    "[PRIM INVENTORY]: Could not find asset {0} for inventory item {1} in {2}",
                     item.AssetID, item.Name, m_part.Name);
                 objlist = null;
                 veclist = null;
@@ -895,7 +895,7 @@ namespace OpenSim.Region.Framework.Scenes
                 offsetHeight = 0;
                 return false;
             }
-          
+
             bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
 
             for (int i = 0; i < objlist.Count; i++)
@@ -985,7 +985,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return true;
         }
-        
+
         /// <summary>
         /// Update an existing inventory item.
         /// </summary>
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_items.ContainsKey(item.ItemID))
             {
 //                m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
-                
+
                 item.ParentID = m_part.UUID;
                 item.ParentPartID = m_part.UUID;
 
@@ -1025,7 +1025,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_inventorySerial++;
                 if (fireScriptEvents)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                
+
                 if (considerChanged)
                 {
                     HasInventoryChanged = true;
@@ -1039,7 +1039,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: " +
                     "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
-                    item.ItemID, m_part.Name, m_part.UUID, 
+                    item.ItemID, m_part.Name, m_part.UUID,
                     m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
             }
             m_items.LockItemsForWrite(false);
@@ -1084,7 +1084,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 m_items.LockItemsForRead(false);
-                
+
 
                 if (scriptcount <= 0)
                 {
@@ -1381,7 +1381,7 @@ namespace OpenSim.Region.Framework.Scenes
                 item.CurrentPermissions = perms;
                 item.BasePermissions = perms;
             }
-            
+
             m_inventorySerial++;
             HasInventoryChanged = true;
         }
@@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return ret;
         }
-        
+
         public Dictionary<UUID, string> GetScriptStates()
         {
             return GetScriptStates(false);
@@ -1493,13 +1493,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
         {
-            Dictionary<UUID, string> ret = new Dictionary<UUID, string>();            
-            
+            Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
+
             if (m_part.ParentGroup.Scene == null) // Group not in a scene
                 return ret;
-            
+
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
-            
+
             if (engines.Length == 0) // No engine at all
                 return ret;
 
@@ -1535,7 +1535,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return ret;
         }
-        
+
         public void ResumeScripts()
         {
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c1b1a63..29e139b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -108,8 +108,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// The current state of this presence.  Governs only the existence lifecycle.  See ScenePresenceStateMachine
         /// for more details.
         /// </summary>
-        public ScenePresenceState LifecycleState 
-        { 
+        public ScenePresenceState LifecycleState
+        {
             get
             {
                 return m_stateMachine.GetState();
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// the viewer fires these in quick succession.
         /// </summary>
         /// <remarks>
-        /// TODO: The child -> agent transition should be folded into LifecycleState and the CompleteMovement 
+        /// TODO: The child -> agent transition should be folded into LifecycleState and the CompleteMovement
         /// regulation done there.
         /// </remarks>
         private object m_completeMovementLock = new object();
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
 //        private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes();
         private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags));
         private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f);
-        
+
         /// <summary>
         /// Experimentally determined "fudge factor" to make sit-target positions
         /// the same as in SecondLife. Fudge factor was tested for 36 different
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return m_currentParcelHide;
             }
         }
-        
+
         /// <value>
         /// The animator for this avatar
         /// </value>
@@ -356,7 +356,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected bool m_reprioritizationBusy;
         protected Vector3 m_reprioritizationLastPosition;
         protected float m_reprioritizationLastDrawDistance;
-        
+
         private Quaternion m_headrotation = Quaternion.Identity;
 
         //PauPaw:Proper PID Controler for autopilot************
@@ -377,7 +377,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         //private bool m_collisionEventFlag = false;
         private object m_collisionEventLock = new Object();
-                
+
         private int m_movementAnimationUpdateCounter = 0;
 
         public Vector3 PrevSitOffset { get; set; }
@@ -424,7 +424,7 @@ namespace OpenSim.Region.Framework.Scenes
             DIR_CONTROL_FLAG_UP_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS,
             DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG
         }
-        
+
         /// <summary>
         /// Position at which a significant movement was made
         /// </summary>
@@ -528,7 +528,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_rootRegionHandle = value;
                 // position rounded to lower multiple of 256m
                 m_rootRegionPosition.X = (float)((m_rootRegionHandle >> 32) & 0xffffff00);
-                m_rootRegionPosition.Y = (float)(m_rootRegionHandle & 0xffffff00); 
+                m_rootRegionPosition.Y = (float)(m_rootRegionHandle & 0xffffff00);
             }
         }
 
@@ -562,7 +562,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return a;
             }
         }
-        #endregion        
+        #endregion
 
         public string Firstname { get; private set; }
         public string Lastname { get; private set; }
@@ -603,7 +603,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AllowMovement { get; set; }
 
         private bool m_setAlwaysRun;
-        
+
         public bool SetAlwaysRun
         {
             get
@@ -689,7 +689,7 @@ namespace OpenSim.Region.Framework.Scenes
                             return rootPart.AbsolutePosition + (m_pos * rootPart.GetWorldRotation());
                     }
                 }
-                
+
                 return m_pos;
             }
             set
@@ -777,7 +777,7 @@ namespace OpenSim.Region.Framework.Scenes
 
 //                m_log.DebugFormat(
 //                    "[SCENE PRESENCE]: In {0} set velocity of {1} to {2}",
-//                    Scene.RegionInfo.RegionName, Name, m_velocity);                                       
+//                    Scene.RegionInfo.RegionName, Name, m_velocity);
             }
         }
 
@@ -821,9 +821,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public Quaternion Rotation
         {
-            get 
-            { 
-                return m_bodyRot; 
+            get
+            {
+                return m_bodyRot;
             }
 
             set
@@ -963,10 +963,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             DropOldNeighbours(old);
-            
+
             if (Scene.CapsModule != null)
                 Scene.CapsModule.SetChildrenSeed(UUID, seeds);
-*/            
+*/
             KnownRegions = seeds;
             //m_log.Debug(" ++++++++++AFTER+++++++++++++ ");
             //DumpKnownRegions();
@@ -991,13 +991,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// This signals whether the presence is in transit between neighbouring regions.
         /// </summary>
-        /// <remarks> 
+        /// <remarks>
         /// It is not set when the presence is teleporting or logging in/out directly to a region.
         /// </remarks>
         public bool IsInTransit
         {
             get { return m_inTransit; }
-            set { 
+            set {
                 if(value)
                 {
                     if (Flying)
@@ -1051,14 +1051,14 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return Util.GetViewerName(m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode)); }
         }
- 
+
         #endregion
 
         #region Constructor(s)
 
         public ScenePresence(
             IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
-        {            
+        {
             m_scene = world;
             AttachmentsSyncLock = new Object();
             AllowMovement = true;
@@ -1092,16 +1092,16 @@ namespace OpenSim.Region.Framework.Scenes
  //              Grouptitle = gm.GetGroupTitle(m_uuid);
 
             m_scriptEngines = m_scene.RequestModuleInterfaces<IScriptModule>();
-            
+
             AbsolutePosition = posLastMove = posLastSignificantMove = CameraPosition =
                m_reprioritizationLastPosition = ControllingClient.StartPos;
 
             m_reprioritizationLastDrawDistance = DrawDistance;
 
             // disable updates workjobs for now
-            childUpdatesBusy = true;  
+            childUpdatesBusy = true;
             m_reprioritizationBusy = true;
- 
+
             AdjustKnownSeeds();
 
             RegisterToClientEvents();
@@ -1189,7 +1189,7 @@ namespace OpenSim.Region.Framework.Scenes
             // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
             // ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
         }
-        
+
         public void RemoveClientEvents()
         {
             ControllingClient.OnCompleteMovementToRegion -= CompleteMovement;
@@ -1237,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// This method is on the critical path for transferring an avatar from one region to another.  Delay here
         /// delays that crossing.
         /// </remarks>
-        
+
         // constants for physics position search
         const float PhysSearchHeight = 600f;
         const float PhysMinSkipGap = 50f;
@@ -1280,7 +1280,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // if not actually on the target invalidate it
                         if(gotCrossUpdate && (crossingFlags & 0x04) == 0)
                                 part.SitTargetAvatar = UUID.Zero;
-                        
+
                         ParentID = part.LocalId;
                         ParentPart = part;
                         m_pos = PrevSitOffset;
@@ -1380,7 +1380,7 @@ namespace OpenSim.Region.Framework.Scenes
                     int physcount = PhysNumberCollisions;
 
                     float dist = physTestHeight - groundHeight + localAVHalfHeight;
-                    
+
                     Vector3 direction = new Vector3(0f, 0f, -1f);
                     Vector3 RayStart = pos;
                     RayStart.Z = physTestHeight;
@@ -1426,7 +1426,7 @@ namespace OpenSim.Region.Framework.Scenes
                 AbsolutePosition = pos;
 
 //                m_log.DebugFormat(
-//                    "Set pos {0}, vel {1} in {1} to {2} from input position of {3} on MakeRootAgent", 
+//                    "Set pos {0}, vel {1} in {1} to {2} from input position of {3} on MakeRootAgent",
 //                    Name, Scene.Name, AbsolutePosition, pos);
 //
                 if (m_teleportFlags == TeleportFlags.Default)
@@ -1453,8 +1453,8 @@ namespace OpenSim.Region.Framework.Scenes
                     Flying = false;
                 }
             }
-    
- 
+
+
             m_log.DebugFormat("[MakeRootAgent] position and physical: {0}ms", Util.EnvironmentTickCountSubtract(ts));
             m_scene.SwapRootAgentCount(false);
 
@@ -1519,7 +1519,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat("[SCENE PRESENCE]: Forcing viewers to update the avatar name for " + Name);
 
             UseFakeGroupTitle = true;
-  
+
 
             Util.FireAndForget(o =>
             {
@@ -1587,7 +1587,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 Animator.ResetAnimations();
 
-           
+
 //            m_log.DebugFormat(
 //                 "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing,
             // depending on the exact timing.  This shouldn't matter anyway since child agent positions are not updated.
             //Velocity = new Vector3(0, 0, 0);
-            
+
             IsChildAgent = true;
             m_scene.SwapRootAgentCount(true);
             RemoveFromPhysicalScene();
@@ -1656,7 +1656,7 @@ namespace OpenSim.Region.Framework.Scenes
             bool isFlying = Flying;
             Vector3 vel = Velocity;
             RemoveFromPhysicalScene();
-            
+
             AbsolutePosition = pos;
             AddToPhysicalScene(isFlying);
             if (PhysicsActor != null)
@@ -1709,7 +1709,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (IsInTransit)
                 return;
 
-            Vector3 pos = AbsolutePosition; 
+            Vector3 pos = AbsolutePosition;
             if (Appearance.AvatarHeight != 127.0f)
                 pos += new Vector3(0f, 0f, (Appearance.AvatarHeight / 6f));
             else
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="amount">Postive or negative roll amount in radians</param>
         private void ApplyFlyingRoll(float amount, bool PressingUp, bool PressingDown)
         {
-            
+
             float rollAmount = Util.Clamp(m_AngularVelocity.Z + amount, -FLY_ROLL_MAX_RADIANS, FLY_ROLL_MAX_RADIANS);
             m_AngularVelocity.Z = rollAmount;
 
@@ -1789,7 +1789,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (m_AngularVelocity.Z > 0)
             {
-                
+
                 float leftOverToMin = m_AngularVelocity.Z - rollMinRadians;
                 if (amount > leftOverToMin)
                     return -leftOverToMin;
@@ -1799,7 +1799,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                
+
                 float leftOverToMin = -m_AngularVelocity.Z - rollMinRadians;
                 if (amount > leftOverToMin)
                     return leftOverToMin;
@@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return amount;
             }
         }
-        
+
 
 
         // neighbouring regions we have enabled a child agent in
@@ -1943,15 +1943,15 @@ namespace OpenSim.Region.Framework.Scenes
         private bool WaitForUpdateAgent(IClientAPI client)
         {
             // Before the source region executes UpdateAgent
-            // (which triggers Scene.IncomingUpdateChildAgent(AgentData cAgentData) here in the destination, 
+            // (which triggers Scene.IncomingUpdateChildAgent(AgentData cAgentData) here in the destination,
             // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
             // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
 //            m_updateAgentReceivedAfterTransferEvent.WaitOne(10000);
-                        int count = 50;
-            UUID originID = UUID.Zero;           
+            int count = 50;
+            UUID originID = UUID.Zero;
 
             lock (m_originRegionIDAccessLock)
-                originID = m_originRegionID;           
+                originID = m_originRegionID;
 
 
             while (originID.Equals(UUID.Zero) && count-- > 0)
@@ -2014,7 +2014,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.InfoFormat(
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.Name, AbsolutePosition);
-          
+
             m_inTransit = true;
 
             try
@@ -2110,7 +2110,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
 //            }
 
-    
+
                 m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
 
@@ -2138,7 +2138,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_currentParcelHide = false;
                 m_currentParcelUUID = UUID.Zero;
 
-                // send initial land overlay and parcel 
+                // send initial land overlay and parcel
                 ILandChannel landch = m_scene.LandChannel;
                 if (landch != null)
                     landch.sendClientInitialLandInfo(client);
@@ -2193,7 +2193,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // send look and animations to others
                     // if not cached we send greys
-                    // uncomented if will wait till avatar does baking 
+                    // uncomented if will wait till avatar does baking
                     //if (cachedbaked)
                     {
                         foreach (ScenePresence p in allpresences)
@@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                     if (friendsModule != null)
-                    { 
+                    {
                         if(gotCrossUpdate)
                             friendsModule.IsNowRoot(this);
                         else
@@ -2331,7 +2331,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="collisionPoint"></param>
         /// <param name="localid"></param>
         /// <param name="distance"></param>
-        /// 
+        ///
 
         private void checkCameraCollision()
         {
@@ -2486,7 +2486,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // The Agent's Draw distance setting
             // When we get to the point of re-computing neighbors everytime this
-            // changes, then start using the agent's drawdistance rather than the 
+            // changes, then start using the agent's drawdistance rather than the
             // region's draw distance.
 
             DrawDistance = agentData.Far;
@@ -2495,7 +2495,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // FIXME: This does not work as intended because the viewer only sends the lbutton down when the button
             // is first pressed, not whilst it is held down.  If this is required in the future then need to look
-            // for an AGENT_CONTROL_LBUTTON_UP event and make sure to handle cases where an initial DOWN is not 
+            // for an AGENT_CONTROL_LBUTTON_UP event and make sure to handle cases where an initial DOWN is not
             // received (e.g. on holding LMB down on the avatar in a viewer).
             m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
 
@@ -2549,7 +2549,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (AllowMovement && !SitGround)
             {
-//                m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name);              
+//                m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name);
                 bool update_rotation = false;
                 if (agentData.BodyRotation != Rotation)
                 {
@@ -2617,7 +2617,7 @@ namespace OpenSim.Region.Framework.Scenes
                             }
 
                             if (((MovementFlag & (uint)DCF) == 0))
-                            {   
+                            {
                                 //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with {1}", Name, DCF);
                                 MovementFlag |= (uint)DCF;
                                 update_movementflag = true;
@@ -2715,11 +2715,11 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_AngularVelocity.Z != 0)
                                 m_AngularVelocity.Z += CalculateFlyingRollResetToZero(FLY_ROLL_RESET_RADIANS_PER_UPDATE);
                         }
-                        
+
                         /*
                                                 if (Flying && IsColliding && controlland)
                                                 {
-                                                    // nesting this check because LengthSquared() is expensive and we don't 
+                                                    // nesting this check because LengthSquared() is expensive and we don't
                                                     // want to do it every step when flying.
                                                     if ((Velocity.LengthSquared() <= LAND_VELOCITYMAG_MAX))
                                                         StopFlying();
@@ -2730,7 +2730,7 @@ namespace OpenSim.Region.Framework.Scenes
                 else if (IsColliding && agent_control_v3.Z < 0f)
                     agent_control_v3.Z = 0;
 //                else if(AgentControlStopActive %% Velocity.Z <0.01f)
-                    
+
 
 //                m_log.DebugFormat("[SCENE PRESENCE]: MovementFlag {0} for {1}", MovementFlag, Name);
 
@@ -2738,9 +2738,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // which occurs later in the main scene loop
                 // We also need to update if the user rotates their avatar whilst it is slow walking/running (if they
                 // held down AGENT_CONTROL_STOP whilst normal walking/running).  However, we do not want to update
-                // if the user rotated whilst holding down AGENT_CONTROL_STOP when already still (which locks the 
+                // if the user rotated whilst holding down AGENT_CONTROL_STOP when already still (which locks the
                 // avatar location in place).
-                if (update_movementflag 
+                if (update_movementflag
                     || (update_rotation && DCFlagKeyPressed && (!AgentControlStopActive || MovementFlag != 0)))
                 {
 
@@ -2810,9 +2810,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // The Agent's Draw distance setting
             // When we get to the point of re-computing neighbors everytime this
-            // changes, then start using the agent's drawdistance rather than the 
+            // changes, then start using the agent's drawdistance rather than the
             // region's draw distance.
-            
+
             DrawDistance = agentData.Far;
 
 
@@ -2839,7 +2839,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             TriggerScenePresenceUpdated();
         }
-        
+
         /// <summary>
         /// Calculate an update to move the presence to the set target.
         /// </summary>
@@ -2853,7 +2853,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE PRESENCE]: Called HandleMoveToTargetUpdate() for {0}", Name);
 
             bool updated = false;
- 
+
             Vector3 LocalVectorToTarget3D = MoveToPositionTarget - AbsolutePosition;
 
 //            m_log.DebugFormat(
@@ -3030,11 +3030,11 @@ namespace OpenSim.Region.Framework.Scenes
                 || pos.Y < 0 || pos.Y >= regionSize.Y
                 || pos.Z < 0)
                 return;
-     
+
             float terrainHeight;
             Scene targetScene = m_scene;
             terrainHeight = m_scene.GetGroundHeight(pos.X, pos.Y);
-            
+
             // dont try to land underground
             terrainHeight += Appearance.AvatarHeight * 0.5f + 0.2f;
 
@@ -3044,7 +3044,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
 //                Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
-                     
+
             if (noFly)
                 Flying = false;
             else if (pos.Z > terrainHeight || Flying)
@@ -3068,7 +3068,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             Rotation = Quaternion.CreateFromEulers(angle);
 //            m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation);
-            
+
             Vector3 control = Vector3.Zero;
             if(HandleMoveToTargetUpdate(1f, ref control))
                 AddNewMovement(control);
@@ -3162,7 +3162,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_pos = standPos;
             }
 
-            // We need to wait until we have calculated proper stand positions before sitting up the physical 
+            // We need to wait until we have calculated proper stand positions before sitting up the physical
             // avatar to avoid race conditions.
             if (PhysicsActor == null)
                 AddToPhysicalScene(false);
@@ -3178,7 +3178,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // reset to default sitAnimation
             sitAnimation = "SIT";
-            
+
 //            Animator.TrySetMovementAnimation("STAND");
             Animator.SetMovementAnimations("STAND");
 
@@ -3244,7 +3244,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                if (PhysicsSit(part,offset)) // physics engine 
+                if (PhysicsSit(part,offset)) // physics engine
                     return;
 
                 Vector3 pos = part.AbsolutePosition + offset;
@@ -3275,7 +3275,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 cameraAtOffset = part.GetCameraAtOffset();
                 cameraEyeOffset = part.GetCameraEyeOffset();
-                                
+
                 forceMouselook = part.GetForceMouselook();
 
                 if (!part.IsRoot)
@@ -3398,7 +3398,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (part == null)
                 return;
 
-            Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();     
+            Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();
             if(!CanEnterLandPosition(targetPos))
             {
                 ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
@@ -3530,7 +3530,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
-                            
+
                         if (Math.Abs(1.0 - m) > 0.000001)
                         {
                             if(m != 0)
@@ -3554,7 +3554,7 @@ namespace OpenSim.Region.Framework.Scenes
                         x = 2 * (r.X * r.Z + r.Y * r.W);
                         y = 2 * (-r.X * r.W + r.Y * r.Z);
                         z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
-                        Vector3 up = new Vector3((float)x, (float)y, (float)z);   
+                        Vector3 up = new Vector3((float)x, (float)y, (float)z);
                         sitOffset = up * Appearance.AvatarHeight * 0.02638f;
                         newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
                     }
@@ -3670,7 +3670,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void AddNewMovement(Vector3 vec, float thisAddSpeedModifier = 1, bool breaking = false)
         {
             //            m_log.DebugFormat(
-            //                "[SCENE PRESENCE]: Adding new movement {0} with rotation {1}, thisAddSpeedModifier {2} for {3}", 
+            //                "[SCENE PRESENCE]: Adding new movement {0} with rotation {1}, thisAddSpeedModifier {2} for {3}",
             //                vec, Rotation, thisAddSpeedModifier, Name);
 
             // rotate from avatar coord space to world
@@ -3792,11 +3792,11 @@ namespace OpenSim.Region.Framework.Scenes
                         Math.Abs(dpos.X) > POSITION_LARGETOLERANCE ||
                         Math.Abs(dpos.Y) > POSITION_LARGETOLERANCE ||
                         Math.Abs(dpos.Z) > POSITION_LARGETOLERANCE ||
- 
+
                         (  (Math.Abs(dpos.X) > POSITION_SMALLTOLERANCE ||
                             Math.Abs(dpos.Y) > POSITION_SMALLTOLERANCE ||
                             Math.Abs(dpos.Z) > POSITION_SMALLTOLERANCE)
-                            && vel.LengthSquared() < LOWVELOCITYSQ 
+                            && vel.LengthSquared() < LOWVELOCITYSQ
                         ))
                 {
 */
@@ -3833,7 +3833,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         // this is diferente from SendTerseUpdateToClient
-        // this sends bypassing entities updates 
+        // this sends bypassing entities updates
         public void SendAgentTerseUpdate(ISceneEntity p)
         {
             ControllingClient.SendAgentTerseUpdate(p);
@@ -3982,7 +3982,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 p.SendAppearanceToAgentNF(this);
                 p.SendAnimPackToAgentNF(this);
-                p.SendAttachmentsToAgentNF(this);               
+                p.SendAttachmentsToAgentNF(this);
                 count++;
             });
 
@@ -3991,7 +3991,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Send this agent's avatar data to all other root and child agents in the scene
-        /// This agent must be root. This avatar will receive its own update. 
+        /// This agent must be root. This avatar will receive its own update.
         /// </summary>
         public void SendAvatarDataToAllAgents()
         {
@@ -4222,7 +4222,7 @@ namespace OpenSim.Region.Framework.Scenes
                 posLastMove = pos;
                 m_scene.EventManager.TriggerOnClientMovement(this);
             }
-            
+
             diff = pos - posLastSignificantMove;
             if (diff.LengthSquared() > SIGNIFICANT_MOVEMENT)
             {
@@ -4235,18 +4235,18 @@ namespace OpenSim.Region.Framework.Scenes
 
             if(childUpdatesBusy)
                 return;
-            
+
             //possible KnownRegionHandles always contains current region and this check is not needed
             int minhandles = 0;
             if(KnownRegionHandles.Contains(RegionHandle))
                     minhandles++;
 
-            if(KnownRegionHandles.Count > minhandles)            
-            {              
+            if(KnownRegionHandles.Count > minhandles)
+            {
                 int tdiff = Util.EnvironmentTickCountSubtract(lastChildUpdatesTime);
                 if(tdiff > CHILDUPDATES_TIME)
                 {
-                    diff = pos - m_lastChildAgentUpdatePosition; 
+                    diff = pos - m_lastChildAgentUpdatePosition;
                     if (diff.LengthSquared() > CHILDUPDATES_MOVEMENT)
                     {
                         childUpdatesBusy = true;
@@ -4268,7 +4268,7 @@ namespace OpenSim.Region.Framework.Scenes
                         Util.FireAndForget(
                             o =>
                             {
-                                m_scene.SendOutChildAgentUpdates(agentpos, this); 
+                                m_scene.SendOutChildAgentUpdates(agentpos, this);
                                 lastChildUpdatesTime = Util.EnvironmentTickCount();
                                 childUpdatesBusy = false;
                             }, null, "ScenePresence.SendOutChildAgentUpdates");
@@ -4309,7 +4309,7 @@ namespace OpenSim.Region.Framework.Scenes
             pos2.Z += vel.Z * timeStep;
 
 //                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: Testing border check for projected position {0} of {1} in {2}", 
+//                        "[SCENE PRESENCE]: Testing border check for projected position {0} of {1} in {2}",
 //                        pos2, Name, Scene.Name);
 
             if (Scene.PositionIsInCurrentRegion(pos2))
@@ -4399,7 +4399,7 @@ namespace OpenSim.Region.Framework.Scenes
         //            m_log.DebugFormat("[SCENE PRESENCE]: Resetting {0} in {1}", Name, Scene.RegionInfo.RegionName);
 
                     // Put the child agent back at the center
-                    AbsolutePosition 
+                    AbsolutePosition
                         = new Vector3(((float)m_scene.RegionInfo.RegionSizeX * 0.5f), ((float)m_scene.RegionInfo.RegionSizeY * 0.5f), 70);
 
                     Animator.ResetAnimations();
@@ -4511,7 +4511,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void GrantGodlikePowers(UUID token, bool godStatus)
         {
             int oldgodlevel = GodLevel;
-            
+
             if (godStatus && !isNPC && m_scene.Permissions.IsGod(UUID))
             {
                 GodLevel = 200;
@@ -4519,7 +4519,7 @@ namespace OpenSim.Region.Framework.Scenes
                     GodLevel = UserLevel;
             }
             else
-                GodLevel = 0;    
+                GodLevel = 0;
 
             ControllingClient.SendAdminResponse(token, (uint)GodLevel);
             if(oldgodlevel != GodLevel)
@@ -4535,7 +4535,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             CopyFrom(cAgentData);
-             
+
         }
 
         private static Vector3 marker = new Vector3(-1f, -1f, -1f);
@@ -4621,7 +4621,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.Far = DrawDistance;
 
-            // Throttles 
+            // Throttles
             cAgent.Throttles = ControllingClient.GetThrottlesPacked(1);
 
             cAgent.HeadRotation = m_headrotation;
@@ -4630,7 +4630,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (GodLevel > 200 && m_scene.Permissions.IsGod(cAgent.AgentID))
                 cAgent.GodLevel = (byte)GodLevel;
-            else 
+            else
                 cAgent.GodLevel = (byte) 0;
 
             cAgent.AlwaysRun = SetAlwaysRun;
@@ -4640,7 +4640,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.ParentPart = ParentUUID;
             cAgent.SitOffset = PrevSitOffset;
-            
+
             lock (scriptedcontrols)
             {
                 ControllerData[] controls = new ControllerData[scriptedcontrols.Count];
@@ -4675,7 +4675,7 @@ namespace OpenSim.Region.Framework.Scenes
                 cAgent.CrossingFlags |= 1;
             }
             else
-                 cAgent.CrossingFlags = 0;           
+                 cAgent.CrossingFlags = 0;
 
             if(isCrossUpdate)
             {
@@ -4708,7 +4708,7 @@ namespace OpenSim.Region.Framework.Scenes
             PrevSitOffset = cAgent.SitOffset;
 
             // When we get to the point of re-computing neighbors everytime this
-            // changes, then start using the agent's drawdistance rather than the 
+            // changes, then start using the agent's drawdistance rather than the
             // region's draw distance.
             DrawDistance = cAgent.Far;
             //DrawDistance = Scene.DefaultDrawDistance;
@@ -4727,7 +4727,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_headrotation = cAgent.HeadRotation;
             Rotation = cAgent.BodyRotation;
-            m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags; 
+            m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags;
 
             if (cAgent.GodLevel >200 && m_scene.Permissions.IsGod(cAgent.AgentID))
                 GodLevel = cAgent.GodLevel;
@@ -4738,14 +4738,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             Appearance = new AvatarAppearance(cAgent.Appearance);
 /*
-            bool isFlying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); 
+            bool isFlying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
 
             if (PhysicsActor != null)
             {
                 RemoveFromPhysicalScene();
                 AddToPhysicalScene(isFlying);
             }
-*/            
+*/
             try
             {
                 lock (scriptedcontrols)
@@ -4800,7 +4800,7 @@ namespace OpenSim.Region.Framework.Scenes
                     ControllingClient.ActiveGroupId = cAgent.ActiveGroupID;
                     ControllingClient.ActiveGroupName = cAgent.ActiveGroupName;
                     Grouptitle = cAgent.ActiveGroupTitle;
-                    ControllingClient.ActiveGroupPowers = 
+                    ControllingClient.ActiveGroupPowers =
                             ControllingClient.GetGroupPowers(cAgent.ActiveGroupID);
                 }
                 else
@@ -4871,7 +4871,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_forceToApplyValid = false;
 
             PhysicsScene scene = m_scene.PhysicsScene;
-            Vector3 pVec = AbsolutePosition;                  
+            Vector3 pVec = AbsolutePosition;
 
             PhysicsActor = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
@@ -5007,7 +5007,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         else
                         {
-                        
+
                         }
                     }
 
@@ -5040,13 +5040,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             // Clear known regions
             KnownRegions = new Dictionary<ulong, string>();
-            
+
             // I don't get it but mono crashes when you try to dispose of this timer,
             // unsetting the elapsed callback should be enough to allow for cleanup however.
-            // m_reprioritizationTimer.Dispose(); 
+            // m_reprioritizationTimer.Dispose();
 
             RemoveFromPhysicalScene();
-          
+
             m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
             RemoveClientEvents();
 
@@ -5106,7 +5106,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            
+
             return attachments;
         }
 
@@ -5269,7 +5269,7 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (SceneObjectGroup sog in m_attachments)
                 {
                     SendAttachmentFullUpdateToAgentNF(sog, p);
-                }               
+                }
             }
         }
 
@@ -5689,14 +5689,14 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             if(objectID == m_scene.RegionInfo.RegionID) // for all objects
             {
-            
+
             }
             else
             {
                 SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                 if(part != null)
                 {
-                
+
                 }
             }
         }
@@ -5759,7 +5759,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 ScriptControlled allflags = ScriptControlled.CONTROL_ZERO;
-    
+
                 if (MouseDown)
                 {
                     allflags = LastCommands & (ScriptControlled.CONTROL_ML_LBUTTON | ScriptControlled.CONTROL_LBUTTON);
@@ -5769,35 +5769,35 @@ namespace OpenSim.Region.Framework.Scenes
                         MouseDown = true;
                     }
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_ML_LBUTTON;
                     MouseDown = true;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_LBUTTON;
                     MouseDown = true;
                 }
-    
+
                 // find all activated controls, whether the scripts are interested in them or not
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_FWD;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_BACK;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_UP;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_DOWN;
@@ -5807,17 +5807,17 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     allflags |= ScriptControlled.CONTROL_LEFT;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_RIGHT;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_ROT_RIGHT;
                 }
-    
+
                 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
                 {
                     allflags |= ScriptControlled.CONTROL_ROT_LEFT;
@@ -5830,7 +5830,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         UUID scriptUUID = kvp.Key;
                         ScriptControllers scriptControlData = kvp.Value;
-    
+
                         ScriptControlled localHeld = allflags & scriptControlData.eventControls;     // the flags interesting for us
                         ScriptControlled localLast = LastCommands & scriptControlData.eventControls; // the activated controls in the last cycle
                         ScriptControlled localChange = localHeld ^ localLast;                        // the changed bits
@@ -5842,7 +5842,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                 }
-    
+
                 LastCommands = allflags;
             }
         }
@@ -5885,7 +5885,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         // returns true it local teleport allowed and sets the destiny position into pos
-        
+
         private bool CheckLocalTPLandingPoint(ref Vector3 pos)
         {
             // Never constrain lures
@@ -5930,7 +5930,7 @@ namespace OpenSim.Region.Framework.Scenes
                         spawnPos = spawnPoints[0].GetLocation(hubPos, hubRot);
                         spawnDistSQ = Vector3.DistanceSquared(spawnPos, pos);
 
-                        float testDistSQ; 
+                        float testDistSQ;
                         Vector3 testSpawnPos;
                         for(int i = 1; i< spawnPoints.Length; i++)
                         {
@@ -5960,7 +5960,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
 
-            if (land.LandData.LandingType != (byte)LandingType.LandingPoint 
+            if (land.LandData.LandingType != (byte)LandingType.LandingPoint
                         || land.LandData.OwnerID == m_uuid)
                 return true;
 
@@ -5978,7 +5978,7 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
-        const TeleportFlags TeleHubTPFlags = TeleportFlags.ViaLogin 
+        const TeleportFlags TeleHubTPFlags = TeleportFlags.ViaLogin
                     | TeleportFlags.ViaHGLogin | TeleportFlags.ViaLocation;
 
         private bool CheckAndAdjustTelehub(SceneObjectGroup telehub, ref Vector3 pos, ref bool positionChanged)
@@ -6011,7 +6011,7 @@ namespace OpenSim.Region.Framework.Scenes
                 bool selected = false;
                 bool validhub = false;
                 Vector3 spawnPosition;
-                
+
                 Quaternion teleHubRotation = telehub.GroupRotation;
 
                 switch(m_scene.SpawnPointRouting)
@@ -6033,14 +6033,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                         if(tries <= 0)
                             goto case "sequence";
-                        
+
                         pos = spawnPosition;
                         return true;
 
                     case "sequence":
                         tries = spawnPoints.Length;
-                        selected = false; 
-                        validhub = false;                      
+                        selected = false;
+                        validhub = false;
                         do
                         {
                             index = m_scene.SpawnPoint();
@@ -6092,7 +6092,7 @@ namespace OpenSim.Region.Framework.Scenes
                             closest = i;
                         }
 
-                        if(!validhub) 
+                        if(!validhub)
                             return false;
 
                         if(closest < 0)
@@ -6437,28 +6437,28 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         private void TeleportFlagsDebug() {
-    
+
             // Some temporary debugging help to show all the TeleportFlags we have...
             bool HG = false;
             if((m_teleportFlags & TeleportFlags.ViaHGLogin) == TeleportFlags.ViaHGLogin)
                 HG = true;
-    
+
             m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
-    
+
             uint i = 0u;
             for (int x = 0; x <= 30 ; x++, i = 1u << x)
             {
                 i = 1u << x;
-    
+
                 if((m_teleportFlags & (TeleportFlags)i) == (TeleportFlags)i)
                     if (HG == false)
                         m_log.InfoFormat("[SCENE PRESENCE]: Teleport Flags include {0}", ((TeleportFlags) i).ToString());
                     else
                         m_log.InfoFormat("[SCENE PRESENCE]: HG Teleport Flags include {0}", ((TeleportFlags)i).ToString());
             }
-    
+
             m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
-    
+
         }
 
         private void parcelGodCheck(UUID currentParcelID, bool isGod)
@@ -6509,7 +6509,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         // those on not on parcel see me
                         if (currentParcelID != p.currentParcelUUID)
-                        {                         
+                        {
                             viewsToSendto.Add(p); // they see me
                         }
                     }
@@ -6584,7 +6584,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                     allpresences.Clear();
-                } // now on a private parcel end 
+                } // now on a private parcel end
 
                 else
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
index cae7fe5..e7b09ea 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Scenes
     /// Running               => PreRemove, Removing
     /// PreRemove             => Running, Removing
     /// Removing              => Removed
-    /// 
+    ///
     /// All other methods should only see the scene presence in running state - this is the normal operational state
     /// Removed state occurs when the presence has been removed.  This is the end state with no exit.
     /// </remarks>
@@ -89,13 +89,13 @@ namespace OpenSim.Region.Framework.Scenes
                 else if (newState == ScenePresenceState.PreRemove && m_state == ScenePresenceState.Running)
                     transitionOkay = true;
                 else if (newState == ScenePresenceState.Removing)
-                {   
+                {
                     if (m_state == ScenePresenceState.Running || m_state == ScenePresenceState.PreRemove)
                         transitionOkay = true;
                 }
                 else if (newState == ScenePresenceState.Removed && m_state == ScenePresenceState.Removing)
                     transitionOkay = true;
-            }           
+            }
 
             if (!transitionOkay)
             {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 998789d..7f7977e 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -68,54 +68,54 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// </param>
         /// <returns></returns>
         public static string ToXml(CoalescedSceneObjects coa, bool doScriptStates)
-        {            
+        {
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter writer = new XmlTextWriter(sw))
-                {                                        
+                {
                     Vector3 size;
-                    
+
                     List<SceneObjectGroup> coaObjects = coa.Objects;
-                    
+
 //                    m_log.DebugFormat(
-//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object", 
+//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object",
 //                        coaObjects.Count);
-                    
+
                     // This is weak - we're relying on the set of coalesced objects still being identical
                     Vector3[] offsets = coa.GetSizeAndOffsets(out size);
 
                     writer.WriteStartElement("CoalescedObject");
-                    
+
                     writer.WriteAttributeString("x", size.X.ToString());
                     writer.WriteAttributeString("y", size.Y.ToString());
-                    writer.WriteAttributeString("z", size.Z.ToString());                    
-                    
+                    writer.WriteAttributeString("z", size.Z.ToString());
+
                     // Embed the offsets into the group XML
                     for (int i = 0; i < coaObjects.Count; i++)
                     {
                         SceneObjectGroup obj = coaObjects[i];
-                        
+
 //                        m_log.DebugFormat(
-//                            "[COALESCED SCENE OBJECTS SERIALIZER]: Writing offset for object {0}, {1}", 
-//                            i, obj.Name);                        
-                        
+//                            "[COALESCED SCENE OBJECTS SERIALIZER]: Writing offset for object {0}, {1}",
+//                            i, obj.Name);
+
                         writer.WriteStartElement("SceneObjectGroup");
                         writer.WriteAttributeString("offsetx", offsets[i].X.ToString());
                         writer.WriteAttributeString("offsety", offsets[i].Y.ToString());
                         writer.WriteAttributeString("offsetz", offsets[i].Z.ToString());
-                        
+
                         SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, doScriptStates);
-                        
+
                         writer.WriteEndElement(); // SceneObjectGroup
-                    }  
-                    
+                    }
+
                     writer.WriteEndElement(); // CoalescedObject
                 }
 
                 string output = sw.ToString();
-                
+
 //                Console.WriteLine(output);
-                
+
                 return output;
             }
         }
@@ -123,14 +123,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
         {
 //            m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
-            
+
             coa = null;
-            
+
             try
             {
                 // Quickly check if this is a coalesced object, without fully parsing the XML
                 using (StringReader sr = new StringReader(xml))
-                {                
+                {
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
                         reader.MoveToContent(); // skip possible xml declaration
@@ -138,9 +138,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                         if (reader.Name != "CoalescedObject")
                         {
     //                        m_log.DebugFormat(
-    //                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 
+    //                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
     //                            reader.Name);
-                            
+
                             return false;
                         }
                     }
@@ -151,12 +151,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
                 if (e == null)
                     return false;
-                        
+
                 coa = new CoalescedSceneObjects(UUID.Zero);
 
                 XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
                 int i = 0;
-                
+
                 foreach (XmlNode n in groups)
                 {
                     SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
@@ -166,10 +166,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     }
                     else
                     {
-                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
+                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the
                         // coalesced object fails to load.
                         m_log.WarnFormat(
-                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
+                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.",
                             i);
                     }
 
@@ -181,8 +181,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ",  e);
                 Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
                 return false;
-            }                        
-            
+            }
+
             return true;
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 0b7379b..b8d210c 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                         part.LinkNum = linkNum;
                         part.TrimPermissions();
                     }
-                }                    
+                }
                 while (reader.ReadToNextSibling("Part"));
             }
 
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         {
             ToOriginalXmlFormat(sceneObject, writer, doScriptStates, false);
         }
-        
+
         public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject, string scriptedState)
         {
             using (StringWriter sw = new StringWriter())
@@ -190,7 +190,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             if (!noRootElement)
                 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
-            
+
             writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
             ToXmlFormat(sceneObject.RootPart, writer);
             writer.WriteEndElement();
@@ -212,23 +212,23 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             if (doScriptStates)
                 sceneObject.SaveScriptedState(writer);
-            
+
             if (!noRootElement)
                 writer.WriteEndElement(); // SceneObjectGroup
 
 //            m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", sceneObject.Name, System.Environment.TickCount - time);
-        }        
+        }
 
         protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer)
         {
             SOPToXml2(writer, part, new Dictionary<string, object>());
         }
-        
+
         public static SceneObjectGroup FromXml2Format(string xmlData)
         {
             //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
             //int time = System.Environment.TickCount;
-            
+
             try
             {
                 XmlDocument doc = new XmlDocument();
@@ -780,7 +780,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 obj.VehicleParams = vehicle;
             }
         }
-                   
+
         private static void ProcessShape(SceneObjectPart obj, XmlReader reader)
         {
             List<string> errorNodeNames;
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         {
             shp.HollowShape = Util.ReadEnum<HollowShape>(reader, "HollowShape");
         }
-        
+
         private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptTexture = Util.ReadUUID(reader, "SculptTexture");
@@ -1367,13 +1367,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             if (sog.RootPart.KeyframeMotion != null)
             {
-                Byte[] data = sog.RootPart.KeyframeMotion.Serialize();               
+                Byte[] data = sog.RootPart.KeyframeMotion.Serialize();
 
                 writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
                 writer.WriteBase64(data, 0, data.Length);
                 writer.WriteEndElement();
             }
-            
+
 
             writer.WriteEndElement();
         }
@@ -1438,7 +1438,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             WriteShape(writer, sop.Shape, options);
 
             WriteVector(writer, "Scale", sop.Scale);
-            WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation); 
+            WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation);
             WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition);
             WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL);
             WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL);
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             if (sop.MediaUrl != null)
                 writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
             WriteVector(writer, "AttachedPos", sop.AttachedPos);
-            
+
             if (sop.DynAttrs.CountNamespaces > 0)
             {
                 writer.WriteStartElement("DynAttrs");
@@ -1520,7 +1520,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString().ToLower());
             }
             writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower());
-            
+
             writer.WriteEndElement();
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index c8f525e..bc440fc 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -113,12 +113,12 @@ namespace OpenSim.Region.Framework.Scenes
             SimSpareMs = 32,
             SimSleepMs = 33,
             SimIoPumpTime = 34,
-                SimPCTSscriptsRun = 35,
-                SimRegionIdle = 36, // dataserver only
-                SimRegionIdlePossible  = 37, // dataserver only
-                SimAIStepTimeMS = 38,
-                SimSkippedSillouet_PS  = 39,
-                SimSkippedCharsPerC  = 40,
+            SimPCTSscriptsRun = 35,
+            SimRegionIdle = 36, // dataserver only
+            SimRegionIdlePossible  = 37, // dataserver only
+            SimAIStepTimeMS = 38,
+            SimSkippedSillouet_PS  = 39,
+            SimSkippedCharsPerC  = 40,
 
 // extra stats IDs irrelevant, just far from viewer defined ones
             SimExtraCountStart = 1000,
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes
             TotalGeoPrim = 1003,
             TotalMesh = 1004,
             ThreadCount = 1005,
-        
+
             SimExtraCountEnd = 1006
         }
 
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         private float m_statisticsFPSfactor = 5.0f;
         private float m_targetFrameTime = 0.1f;
-        // saved last reported value so there is something available for llGetRegionFPS 
+        // saved last reported value so there is something available for llGetRegionFPS
         private float lastReportedSimFPS;
         private float[] lastReportedSimStats = new float[m_statisticExtraArraySize + m_statisticViewerArraySize];
         private float m_pfps;
@@ -336,7 +336,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
               if (!m_scene.Active)
                 return;
-            
+
             // dont do it if if still been done
 
             if(Monitor.TryEnter(m_statsLock))
@@ -367,8 +367,8 @@ namespace OpenSim.Region.Framework.Scenes
                 // factor to consider updates integration time
                 float updateTimeFactor = 1.0f / updateElapsed;
 
-               
-                // scene frame stats 
+
+                // scene frame stats
                 float reportedFPS;
                 float physfps;
                 float timeDilation;
@@ -393,7 +393,7 @@ namespace OpenSim.Region.Framework.Scenes
                     sleeptime      = m_sleeptimeMS;
                     scriptTimeMS   = m_scriptTimeMS;
                     totalFrameTime = m_frameMS;
-                    // still not inv 
+                    // still not inv
                     invFrameElapsed = (float)((m_FrameStatsTS - m_prevFrameStatsTS) / 1000.0);
 
                     ResetFrameStats();
@@ -424,10 +424,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // some engines track frame time with error related to the simulation step size
-                if(physfps > reportedFPS) 
+                if(physfps > reportedFPS)
                     physfps = reportedFPS;
 
-                // save the reported value so there is something available for llGetRegionFPS 
+                // save the reported value so there is something available for llGetRegionFPS
                 lastReportedSimFPS = reportedFPS;
 
                 // scale frame stats
@@ -461,13 +461,13 @@ namespace OpenSim.Region.Framework.Scenes
 
                  // FIXME: Checking for stat sanity is a complex approach.  What we really need to do is fix the code
                 // so that stat numbers are always consistent.
-                CheckStatSanity(); 
- 
+                CheckStatSanity();
+
                 for (int i = 0; i < m_statisticViewerArraySize; i++)
                 {
                     sb[i] = new SimStatsPacket.StatBlock();
                 }
-              
+
                 sb[0].StatID = (uint) Stats.TimeDilation;
                 sb[0].StatValue = (Single.IsNaN(timeDilation)) ? 0.0f : (float)Math.Round(timeDilation,3);
 
@@ -546,13 +546,13 @@ namespace OpenSim.Region.Framework.Scenes
 
                 sb[24].StatID = (uint)Stats.ResidentSizeKb;
                 sb[24].StatValue = 0;
-                
+
                 sb[25].StatID = (uint)Stats.PendingLocalUploads;
                 sb[25].StatValue = 0;
-                
+
                 sb[26].StatID = (uint)Stats.PhysicsPinnedTasks;
                 sb[26].StatValue = 0;
-                
+
                 sb[27].StatID = (uint)Stats.PhysicsLodTasks;
                 sb[27].StatValue = 0;
 
@@ -623,7 +623,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sbex[5].StatValue = m_inUseThreads;
                 lastReportedSimStats[43] = m_inUseThreads;
 
-                SimStats simStats 
+                SimStats simStats
                     = new SimStats(
                         ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)m_objectCapacity,
                         rb, sb, sbex, m_scene.RegionInfo.originRegionID);
@@ -643,7 +643,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
 
                         Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats();
-        
+
                         if (physicsStats != null)
                         {
                             foreach (KeyValuePair<string, float> tuple in physicsStats)
@@ -717,7 +717,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_FrameStatsTS = Util.GetTimeStampMS();
             }
-        } 
+        }
 
         private void ResetFrameStats()
         {
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1aa1194..89d78cf 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (Double.IsNaN(value) || Double.IsInfinity(value))
                     return;
- 
+
                 m_terrainData[x, y] = (float)value;
             }
         }
@@ -486,7 +486,7 @@ namespace OpenSim.Region.Framework.Scenes
             int index = 0;
 
             m_terrainData = new HeightmapTerrainData(Height, Width, (int)Constants.RegionHeight);
-            
+
             for (int y = 0; y < Height; y++)
             {
                 for (int x = 0; x < Width; x++)
diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
index fd65735..9d1f815 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
@@ -400,7 +400,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     block[k++] = (terrData[x, y] - sub) * premult;
                 }
             }
- 
+
             wbits = (prequant >> 1);
 
             dct16x16(block, iout, ref wbits);
@@ -490,22 +490,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         #region DCT
 
         /* DCT (Discrete Cosine Transform)
-        adaptation from 
+        adaptation from
         General Purpose 2D,3D FFT (Fast Fourier Transform) Package
         by Takuya OOURA (email: ooura@kurims.kyoto-u.ac.jp)
 
         -------- 16x16 DCT (Discrete Cosine Transform) / Inverse of DCT --------
             [definition]
                 <case1> Normalized 16x16 IDCT
-                    C[k1 + k2] = (1/8) * sum_j1=0^15 sum_j2=0^15 
-                                    tmp[j1 + j2] * s[j1] * s[j2] * 
-                                    cos(pi*j1*(k1+1/2)/16) * 
+                    C[k1 + k2] = (1/8) * sum_j1=0^15 sum_j2=0^15
+                                    tmp[j1 + j2] * s[j1] * s[j2] *
+                                    cos(pi*j1*(k1+1/2)/16) *
                                     cos(pi*j2*(k2+1/2)/16), 0<=k1<16, 0<=k2<16
                                     (s[0] = 1/sqrt(2), s[j] = 1, j > 0)
                 <case2> Normalized 16x16 DCT
-                    C[k1 + k2] = (1/8) * s[k1] * s[k2] * sum_j1=0^15 sum_j2=0^15 
-                                    tmp[j1 + j2] * 
-                                    cos(pi*(j1+1/2)*k1/16) * 
+                    C[k1 + k2] = (1/8) * s[k1] * s[k2] * sum_j1=0^15 sum_j2=0^15
+                                    tmp[j1 + j2] *
+                                    cos(pi*(j1+1/2)*k1/16) *
                                     cos(pi*(j2+1/2)*k2/16), 0<=k1<16, 0<=k2<16
                                     (s[0] = 1/sqrt(2), s[j] = 1, j > 0)
         */
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index da18941..fa698a9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void T010_AddObjects()
         {
             TestHelpers.InMethod();
-            
+
             random = new Random();
             SceneObjectGroup found;
             EntityManager entman = new EntityManager();
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID obj2 = sog.UUID;
             uint li2 = sog.LocalId;
             entman.Add(sog);
-            
+
             found = (SceneObjectGroup)entman[obj1];
             Assert.That(found.UUID ,Is.EqualTo(obj1));
             found = (SceneObjectGroup)entman[li1];
@@ -85,15 +85,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void T011_ThreadAddRemoveTest()
         {
             TestHelpers.InMethod();
-            
-            // This test adds and removes with mutiple threads, attempting to break the 
+
+            // This test adds and removes with mutiple threads, attempting to break the
             // uuid and localid dictionary coherence.
             EntityManager entman = new EntityManager();
             SceneObjectGroup sog = NewSOG();
             for (int j=0; j<20; j++)
             {
                 List<Thread> trdlist = new List<Thread>();
-                
+
                 for (int i=0; i<4; i++)
                 {
                     // Adds scene object
@@ -101,14 +101,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                     Thread start = new Thread(new ThreadStart(test.TestAddSceneObject));
                     start.Start();
                     trdlist.Add(start);
-                        
+
                     // Removes it
                     test = new NewTestThreads(entman,sog);
                     start = new Thread(new ThreadStart(test.TestRemoveSceneObject));
                     start.Start();
                     trdlist.Add(start);
                 }
-                foreach (Thread thread in trdlist) 
+                foreach (Thread thread in trdlist)
                 {
                     thread.Join();
                 }
@@ -133,14 +133,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
             scene.AddNewSceneObject(sog, false);
-            
+
             return sog;
         }
-                
+
         private static string RandomName()
         {
             StringBuilder name = new StringBuilder();
-            int size = random.Next(40,80); 
+            int size = random.Next(40,80);
             char ch ;
             for (int i=0; i<size; i++)
             {
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         private EntityManager entman;
         private SceneObjectGroup sog;
         private Random random;
-        
+
         public NewTestThreads(EntityManager entman, SceneObjectGroup sog)
         {
             this.entman = entman;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index ee7c8a9..56723bf 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -55,29 +55,29 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID part2Id = new UUID("00000000-0000-0000-0000-000000000002");
 
             SceneObjectPart part1
-                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = part1Name, UUID = part1Id };
             SceneObjectGroup so = new SceneObjectGroup(part1);
-            SceneObjectPart part2 
-                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
-                    { Name = part2Name, UUID = part2Id }; 
+            SceneObjectPart part2
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
+                    { Name = part2Name, UUID = part2Id };
             so.AddPart(part2);
 
             scene.AddNewSceneObject(so, false);
-            
-            SceneObjectGroup dupeSo 
+
+            SceneObjectGroup dupeSo
                 = scene.SceneGraph.DuplicateObject(
                     part1.LocalId, new Vector3(10, 0, 0), 0, ownerId, UUID.Zero, Quaternion.Identity);
             Assert.That(dupeSo.Parts.Length, Is.EqualTo(2));
-            
+
             SceneObjectPart dupePart1 = dupeSo.GetLinkNumPart(1);
             SceneObjectPart dupePart2 = dupeSo.GetLinkNumPart(2);
             Assert.That(dupePart1.LocalId, Is.Not.EqualTo(part1.LocalId));
             Assert.That(dupePart2.LocalId, Is.Not.EqualTo(part2.LocalId));
-            
+
             Assert.That(dupePart1.Flags, Is.EqualTo(part1.Flags));
             Assert.That(dupePart2.Flags, Is.EqualTo(part2.Flags));
-            
+
             /*
             Assert.That(part1.PhysActor, Is.Not.Null);
             Assert.That(part2.PhysActor, Is.Not.Null);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index ac8c32d..8961a26 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.AddNewSceneObject(so, false), Is.True);
             SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID);
             SceneObjectPart[] retrievedParts = retrievedSo.Parts;
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount));
@@ -126,19 +126,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
 
             SceneObjectPart part1
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj1Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
 
             SceneObjectPart part2
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj2Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False);
-            
+
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name));
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.GetGroupByPrim(soid), Is.Null);
             Assert.That(scene.GetGroupByPrim(spid), Is.Null);
         }
-        
+
         /// <summary>
         /// Test deleting an object from a scene.
         /// </summary>
@@ -205,10 +205,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(retrievedPart, Is.Null);
         }
-        
+
         /// <summary>
         /// Changing a scene object uuid changes the root part uuid.  This is a valid operation if the object is not
-        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by 
+        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by
         /// OpenSim.
         /// </summary>
         [Test]
@@ -218,24 +218,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string childPartName = "childPart";
             UUID childPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
-            
+
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = childPartName, UUID = childPartUuid };
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
-            
+
             Assert.That(sog.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
-            
+
             UUID newRootPartUuid = new UUID("00000000-0000-0000-0000-000000000002");
             sog.UUID = newRootPartUuid;
-                        
+
             Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
index dc3b717..c27bc1a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
             uint soLocalId = so.LocalId;
@@ -119,11 +119,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
             Assert.That(item, Is.Not.Null);
         }
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
             uint soLocalId = so.LocalId;
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we do not have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
             Assert.That(item, Is.Null);
         }
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
             uint soLocalId = so.LocalId;
@@ -219,11 +219,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
             Assert.That(item, Is.Not.Null);
         }
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
             uint soLocalId = so.LocalId;
@@ -272,11 +272,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
@@ -303,11 +303,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
@@ -334,11 +334,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index 4a98746..e1e973c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // crossing is async
             Thread.Sleep(500);
-            
+
             Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
             Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
         }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index f0debd0..b84ecac 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -77,19 +77,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDeRezSceneObject()
         {
             TestHelpers.InMethod();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
             SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
-            
+
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", userId);
             uint soLocalId = so.LocalId;
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
 
             sogd.InventoryDeQueueAndDelete();
-            
+
 //            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart, Is.Null);              
+            Assert.That(retrievedPart, Is.Null);
         }
 
         /// <summary>
@@ -154,48 +154,48 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             sceneA.DeleteSceneObject(so, false);
         }
-        
+
         /// <summary>
         /// Test deleting an object from a scene where the deleter is not the owner
         /// </summary>
         /// <remarks>
-        /// This test assumes that the deleter is not a god.       
+        /// This test assumes that the deleter is not a god.
         /// </remarks>
         [Test]
         public void TestDeRezSceneObjectNotOwner()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
-            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });            
+            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
-            
+
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
-            
+            sogd.Enabled = false;
+
             SceneObjectPart part
                 = new SceneObjectPart(objectOwnerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
             part.Name = "obj1";
             scene.AddNewSceneObject(new SceneObjectGroup(part), false);
             List<uint> localIds = new List<uint>();
-            localIds.Add(part.LocalId);            
+            localIds.Add(part.LocalId);
 
             scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
             sogd.InventoryDeQueueAndDelete();
-            
+
             // Object should still be in the scene.
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
             Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
-        }   
- 
+        }
+
         /// <summary>
         /// Test deleting an object asynchronously to user inventory.
         /// </summary>
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestScene scene = new SceneHelpers().SetupScene();
 
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Modules");            
+            IConfig config = configSource.AddConfig("Modules");
             config.Set("InventoryAccessModule", "BasicInventoryAccessModule");
             SceneHelpers.SetupSceneModules(
                 scene, configSource, new object[] { new BasicInventoryAccessModule() });
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 1718734..41f61ac 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -66,8 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestLinkDelink2SceneObjects()
         {
             TestHelpers.InMethod();
-            
-            bool debugtest = false; 
+
+            bool debugtest = false;
 
             Scene scene = new SceneHelpers().SetupScene();
             SceneObjectGroup grp1 = SceneHelpers.AddSceneObject(scene);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // <180,0,0>
             grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
-            
+
             // Required for linking
             grp1.RootPart.ClearUpdateSchedule();
             grp2.RootPart.ClearUpdateSchedule();
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, 
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity,
                 "root part should have no offset position or rotation");
 
             // offset position should be root part position - part2.absolute position.
@@ -125,13 +125,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // There's a euler anomoly at 180, 0, 0 so expect 180 to turn into -180.
             part1.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
             Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
-            
+
             if (debugtest)
                 m_log.Debug(rotEuler1);
 
             part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
             Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
-             
+
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestLinkDelink2groups4SceneObjects()
         {
             TestHelpers.InMethod();
-            
+
             bool debugtest = false;
 
             Scene scene = new SceneHelpers().SetupScene();
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Link grp4 to grp3.
             grp3.LinkToGroup(grp4);
-            
+
             // At this point we should have 4 parts total in two groups.
             Assert.That(grp1.Parts.Length == 2, "Group1 children count should be 2");
             Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
@@ -202,7 +202,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(grp3.Parts.Length == 2, "Group3 children count should be 2");
             Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
             Assert.That(grp4.Parts.Length, Is.EqualTo(0), "Group 4 still contained parts after delink.");
-            
+
             if (debugtest)
             {
                 m_log.Debug("--------After Link-------");
@@ -273,13 +273,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(part2.AbsolutePosition == Vector3.Zero, "Badness 1");
             Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20), "Badness 2");
             Quaternion compareQuaternion = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
-            Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003) 
-                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
-                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
+            Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003)
+                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003)
+                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003)
                 && (part4.RotationOffset.W - compareQuaternion.W < 0.00003),
                 "Badness 3");
         }
-        
+
         /// <summary>
         /// Test that a new scene object which is already linked is correctly persisted to the persistence layer.
         /// </summary>
@@ -288,37 +288,37 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
-            
+
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string linkPartName = "linkpart";
             UUID linkPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
 
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = linkPartName, UUID = linkPartUuid };
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
             scene.AddNewSceneObject(sog, true);
-            
+
             // In a test, we have to crank the backup handle manually.  Normally this would be done by the timer invoked
             // scene backup thread.
             scene.Backup(true);
-            
+
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
-            
+
             Assert.That(storedObjects.Count, Is.EqualTo(1));
             Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(2));
             Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
             Assert.That(storedObjects[0].ContainsPart(linkPartUuid));
         }
-        
+
         /// <summary>
         /// Test that a delink of a previously linked object is correctly persisted to the database
         /// </summary>
@@ -327,20 +327,20 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
-            
+
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string linkPartName = "linkpart";
             UUID linkPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
 
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
-            
+
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = linkPartName, UUID = linkPartUuid };
             SceneObjectGroup linkGroup = new SceneObjectGroup(linkPart);
             scene.AddNewSceneObject(linkGroup, true);
@@ -359,7 +359,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectGroup groupToDelete = sog.DelinkFromGroup(linkPart, false);
             Assert.IsFalse(groupToDelete.GroupContainsForeignPrims);
 
-/* backup is async            
+/* backup is async
             scene.DeleteSceneObject(groupToDelete, false);
 
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
index ec58a5a..c2c7822 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 childPosition = new Vector3(rootPartPosition + rotatedChildOffsetPosition);
 
             SceneObjectPart childPart = so.Parts[1];
-            
+
             Assert.That(childPart.AbsolutePosition, Is.EqualTo(childPosition));
 
             Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index e98e631..8d88083 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             m_so1.ScriptSetTemporaryStatus(false);
 
             Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
-            Assert.That(m_so1.Backup, Is.True);          
+            Assert.That(m_so1.Backup, Is.True);
         }
 
         [Test]
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetPhantomStatus(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
         }
 
         [Test]
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetVolumeDetect(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
         }
 
         [Test]
@@ -152,9 +152,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetVolumeDetect(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));
         }
-        
+
         [Test]
         public void TestSetPhysicsLinkset()
         {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index a92e364..4ec69cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -53,30 +53,30 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
-            
+
             IConfig startupConfig = configSource.AddConfig("Startup");
             startupConfig.Set("serverside_object_permissions", true);
-            
-            IConfig groupsConfig = configSource.AddConfig("Groups");            
+
+            IConfig groupsConfig = configSource.AddConfig("Groups");
             groupsConfig.Set("Enabled", true);
-            groupsConfig.Set("Module", "GroupsModule");            
-            groupsConfig.Set("DebugEnabled", true);            
-                       
+            groupsConfig.Set("Module", "GroupsModule");
+            groupsConfig.Set("DebugEnabled", true);
+
             SceneHelpers.SetupSceneModules(
-                scene, configSource, new object[] 
-                   { new DefaultPermissionsModule(), 
-                     new GroupsModule(), 
+                scene, configSource, new object[]
+                   { new DefaultPermissionsModule(),
+                     new GroupsModule(),
                      new MockGroupsServicesConnector() });
-            
-            IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;            
-            
-            IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();     
-            
+
+            IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
+
+            IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();
+
             groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true);
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index ada407f..0f386bc 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Check rest of exepcted parameters.
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
-          
+
             Assert.That(sp.IsChildAgent, Is.False);
             Assert.That(sp.UUID, Is.EqualTo(spUuid));
 
@@ -262,9 +262,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
 //            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
-            
+
             TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
             TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
 
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             EventQueueGetModule eqgm2 = new EventQueueGetModule();
             SceneHelpers.SetupSceneModules(myScene2, configSource, etm, eqgm2);
-            
+
 //            SceneHelpers.AddScenePresence(myScene1, agent1Id);
 //            ScenePresence childPresence = myScene2.GetScenePresence(agent1);
 //
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index b8f7458..86500c7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -465,7 +465,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 teleportLookAt,
                 (uint)TeleportFlags.ViaLocation);
 
-            // FIXME: Not setting up InformClientOfNeighbour on the TestClient means that it does not initiate 
+            // FIXME: Not setting up InformClientOfNeighbour on the TestClient means that it does not initiate
             // communication with the destination region.  But this is a very non-obvious way of doing it - really we
             // should be forced to expicitly set this up.
 
@@ -627,8 +627,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Both these operations will occur on different threads and will wait for each other.
             // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
             // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
-            tc.OnTestClientSendRegionTeleport 
-                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+            tc.OnTestClientSendRegionTeleport
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL)
                     => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
 
             sceneA.RequestTeleportLocation(
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
index 584a03c..dbb6a37 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Must still be possible to successfully log in
             UUID loggingInUserId = TestHelpers.ParseTail(0x2);
 
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
 
             SceneHelpers.AddScenePresence(scene, ua);
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Must still be possible to successfully log in
             UUID loggingInUserId = TestHelpers.ParseTail(0x2);
 
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
 
             SceneHelpers.AddScenePresence(scene, ua);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 517faf1..6c0af8f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             uint sizeX = 512;
             uint sizeY = 512;
 
-            Scene scene 
+            Scene scene
                 = new SceneHelpers().SetupScene("scene", regionUuid, 1000, 1000, sizeX, sizeY, new IniConfigSource());
 
             Assert.AreEqual(sizeX, scene.RegionInfo.RegionSizeX);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Scene scene = new SceneHelpers().SetupScene();
             scene.Update(1);
-            
+
             Assert.That(scene.Frame, Is.EqualTo(1));
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
index eeda84f..c74c83f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            rmcp.LoadModulesFromAddins = false;
 ////            reg.RegisterInterface<IRegionModulesController>(rmcp);
 //            rmcp.Initialise(sim);
-//            rmcp.PostInitialise();           
+//            rmcp.PostInitialise();
 //            TypeExtensionNode node = new TypeExtensionNode();
 //            node.
 //            rmcp.AddNode(node, configSource.Configs["Modules"], new Dictionary<RuntimeAddin, IList<int>>());
@@ -120,9 +120,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             int expectedEventCount = 6;
 
             Assert.AreEqual(
-                expectedEventCount, 
-                co.Count, 
-                "Expected {0} events but only got {1} ({2})", 
+                expectedEventCount,
+                co.Count,
+                "Expected {0} events but only got {1} ({2})",
                 expectedEventCount, co.Count, string.Join(",", co));
             Assert.AreEqual("Initialise",       co[0]);
             Assert.AreEqual("PostInitialise",   co[1]);
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     {
         // FIXME: Should really use MethodInfo
         public List<string> CallOrder = new List<string>();
-                
+
         public string Name { get { return "TestSharedRegion"; } }
 
         public Type ReplaceableInterface { get { return null; } }
@@ -186,13 +186,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
         public void Initialise() {}
 
-        public void Initialise(OpenSimBase sim) 
+        public void Initialise(OpenSimBase sim)
         {
             m_openSim = sim;
         }
 
         /// <summary>
-        /// Called when the application loading is completed 
+        /// Called when the application loading is completed
         /// </summary>
         public void PostInitialise()
         {
@@ -228,8 +228,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             scene.RegionModules.Clear();
-        }       
-        
+        }
+
         public void AddNode(ISharedRegionModule module)
         {
             m_sharedInstances.Add(module);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 33a630c..8273e32 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -130,18 +130,18 @@ namespace OpenSim.Region.Framework.Tests
                 = TaskInventoryHelpers.AddNotecard(
                     scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
 
-            InventoryFolderBase folder 
+            InventoryFolderBase folder
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0];
-            
+
             // Perform test
             string message;
             scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID, out message);
-                
+
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem");
             Assert.That(ncUserItem, Is.Not.Null, "Objects/ncItem was not found");
         }
-        
+
         /// <summary>
         /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned.
         /// </summary>
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -162,11 +162,11 @@ namespace OpenSim.Region.Framework.Tests
             TaskInventoryItem sopItem1
                 = TaskInventoryHelpers.AddNotecard(
                     scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
-            
+
             // Perform test
             string message;
             scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID, out message);
-                
+
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem");
             Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 142ad84..58e157c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
             UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 937c414..4ceebc1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     {
         protected IAssetService m_assetService;
         protected UuidGatherer m_uuidGatherer;
-            
+
         [SetUp]
         public void Init()
         {
@@ -55,9 +55,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestCorruptAsset()
         {
             TestHelpers.InMethod();
-            
+
             UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            AssetBase corruptAsset 
+            AssetBase corruptAsset
                 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
             m_assetService.Store(corruptAsset);
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // We count the uuid as gathered even if the asset itself is corrupt.
             Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(1));
         }
-        
+
         /// <summary>
         /// Test requests made for non-existent assets while we're gathering
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestMissingAsset()
         {
             TestHelpers.InMethod();
-            
+
             UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
 
             m_uuidGatherer.AddForInspection(missingAssetUuid);
@@ -89,23 +89,23 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-                      
+
             UUID ownerId = TestHelpers.ParseTail(0x10);
             UUID embeddedId = TestHelpers.ParseTail(0x20);
             UUID secondLevelEmbeddedId = TestHelpers.ParseTail(0x21);
             UUID missingEmbeddedId = TestHelpers.ParseTail(0x22);
             UUID ncAssetId = TestHelpers.ParseTail(0x30);
 
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateNotecardAsset(
                     ncAssetId, string.Format("Hello{0}World{1}", embeddedId, missingEmbeddedId));
             m_assetService.Store(ncAsset);
 
-            AssetBase embeddedAsset 
+            AssetBase embeddedAsset
                 = AssetHelpers.CreateNotecardAsset(embeddedId, string.Format("{0} We'll meet again.", secondLevelEmbeddedId));
             m_assetService.Store(embeddedAsset);
 
-            AssetBase secondLevelEmbeddedAsset 
+            AssetBase secondLevelEmbeddedAsset
                 = AssetHelpers.CreateNotecardAsset(secondLevelEmbeddedId, "Don't know where, don't know when.");
             m_assetService.Store(secondLevelEmbeddedAsset);
 
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 7bbf1bd..8fff38f 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="part"></param>
         /// <param name="change">bit field with what is changed</param>
-        /// 
+        ///
         public UndoState(SceneObjectPart part, ObjectChangeType change)
         {
             data = new ObjectChangeData();
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
         /// <summary>
-        /// check if undo or redo is too old 
+        /// check if undo or redo is too old
         /// </summary>
 
         public bool checkExpire()
@@ -97,8 +97,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="part"></param>
         /// <returns>true what fiels and related data are equal, False otherwise.</returns>
-        /// 
-        public bool Compare(SceneObjectPart part, ObjectChangeType change)    
+        ///
+        public bool Compare(SceneObjectPart part, ObjectChangeType change)
         {
             if (data.change != change) // if diferent targets, then they are diferent
                 return false;
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// executes the undo or redo to a part or its group
         /// </summary>
         /// <param name="part"></param>
-        /// 
+        ///
 
         public void PlayState(SceneObjectPart part)
         {
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (grp != null)
             {
-                grp.doChangeObject(part, data);              
+                grp.doChangeObject(part, data);
             }
             part.Undoing = false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 37b91d3..93406cb 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="assetService">
         /// Asset service.
         /// </param>
-        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}       
+        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}
 
         /// <summary>
         /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Asset service.
         /// </param>
         /// <param name="collector">
-        /// Gathered UUIDs will be collected in this dictinaory.  
+        /// Gathered UUIDs will be collected in this dictinaory.
         /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected.
         /// </param>
         public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector)
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_assetUuidsToInspect.Enqueue(uuid);
             return true;
         }
-        
+
         /// <summary>
         /// Gather all the asset uuids associated with a given object.
         /// </summary>
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes
                         catch (Exception)
                         {
                             m_log.WarnFormat(
-                                "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
+                                "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.",
                                 part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
                         }
                     }
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes
                     foreach (TaskInventoryItem tii in taskDictionary.Values)
                     {
                         //                        m_log.DebugFormat(
-                        //                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 
+                        //                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}",
                         //                            tii.Name, tii.Type, part.Name, part.UUID);
 
                         if (!GatheredUuids.ContainsKey(tii.AssetID))
@@ -214,19 +214,19 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
                     // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
-                    // inventory transfer.  There needs to be a way for a module to register a method without assuming a 
+                    // inventory transfer.  There needs to be a way for a module to register a method without assuming a
                     // Scene.EventManager is present.
                     //                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
 
 
                     // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
-                    RecordMaterialsUuids(part); 
+                    RecordMaterialsUuids(part);
                 }
                 catch (Exception e)
                 {
                     m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e);
                     m_log.DebugFormat(
-                        "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)", 
+                        "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)",
                         part.Shape.TextureEntry.Length);
                 }
             }
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             try
-            {              
+            {
                 AssetBase assetBase = GetAsset(assetUuid);
 
                 if (null != assetBase)
@@ -322,14 +322,14 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid);
                 throw;
             }
-        }       
+        }
 
         private void AddForInspection(UUID assetUuid, sbyte assetType)
         {
             // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
             try
-            {               
-                if ((sbyte)AssetType.Bodypart == assetType 
+            {
+                if ((sbyte)AssetType.Bodypart == assetType
                     || (sbyte)AssetType.Clothing == assetType
                     || (sbyte)AssetType.Gesture == assetType
                     || (sbyte)AssetType.Notecard == assetType
@@ -347,7 +347,7 @@ namespace OpenSim.Region.Framework.Scenes
             catch (Exception)
             {
                 m_log.ErrorFormat(
-                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
+                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}",
                     assetUuid, assetType);
                 throw;
             }
@@ -511,7 +511,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="gestureAsset"></param>
         private void RecordGestureAssetUuids(AssetBase gestureAsset)
-        {           
+        {
             using (MemoryStream ms = new MemoryStream(gestureAsset.Data))
                 using (StreamReader sr = new StreamReader(ms))
             {
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 8b8ebe0..83b534b 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -589,8 +589,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
             return new Dictionary<UUID, ulong>();
         }
-        
-        public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }        
+
+        public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
 
         public ulong GetGroupPowers(UUID groupID)
         {
@@ -898,12 +898,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void InPacket(object NewPack)
         {
-            
+
         }
 
         public void ProcessInPacket(Packet NewPack)
         {
-            
+
         }
 
         public void Close()
@@ -953,32 +953,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendWearables(AvatarWearable[] wearables, int serial)
         {
-            
+
         }
 
         public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
         {
-            
+
         }
-        
+
         public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
         {
 
         }
-        
+
         public void SendStartPingCheck(byte seq)
         {
-            
+
         }
 
         public void SendKillObject(List<uint> localID)
         {
-            
+
         }
 
         public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
         {
-            
+
         }
 
         public void SendChatMessage(
@@ -1005,7 +1005,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
         {
-            
+
         }
 
         public virtual bool CanSendLayerData()
@@ -1015,32 +1015,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendLayerData(float[] map)
         {
-            
+
         }
 
         public void SendLayerData(int px, int py, float[] map)
         {
-            
+
         }
 
         public void SendWindData(int version, Vector2[] windSpeeds)
         {
-            
+
         }
 
         public void SendCloudData(int version, float[] cloudCover)
         {
-            
+
         }
 
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
-            
+
         }
 
         public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
         {
-            
+
         }
 
         public AgentCircuitData RequestClientInfo()
@@ -1050,32 +1050,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL)
         {
-            
+
         }
 
         public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
         {
-            
+
         }
 
         public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
         {
-            
+
         }
 
         public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL)
         {
-            
+
         }
 
         public void SendTeleportFailed(string reason)
         {
-            
+
         }
 
         public void SendTeleportStart(uint flags)
         {
-            
+
         }
 
         public void SendTeleportProgress(uint flags, string message)
@@ -1084,17 +1084,17 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
         {
-            
+
         }
 
         public void SendPayPrice(UUID objectID, int[] payPrice)
         {
-            
+
         }
 
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
-            
+
         }
 
         public void SendAvatarDataImmediate(ISceneEntity avatar)
@@ -1119,12 +1119,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
         {
-            
+
         }
 
         public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
         {
-            
+
         }
 
         public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
@@ -1139,72 +1139,72 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendRemoveInventoryItem(UUID itemID)
         {
-            
+
         }
 
         public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
         {
-            
+
         }
 
         public void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
         {
-            
+
         }
 
         public void SendBulkUpdateInventory(InventoryNodeBase node)
         {
-            
+
         }
 
         public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
-            
+
         }
 
         public void SendAbortXferPacket(ulong xferID)
         {
-            
+
         }
 
         public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
         {
-            
+
         }
 
         public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
         {
-            
+
         }
 
         public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
         {
-            
+
         }
 
         public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
         {
-            
+
         }
 
         public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags)
         {
-            
+
         }
 
         public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
         {
-            
+
         }
 
         public void SendAttachedSoundGainChange(UUID objectID, float gain)
         {
-            
+
         }
 
         public void SendNameReply(UUID profileId, string firstname, string lastname)
         {
-            
+
         }
 
         public void SendAlertMessage(string message)
@@ -1214,12 +1214,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendAgentAlertMessage(string message, bool modal)
         {
-            
+
         }
 
         public void SendAlertMessage(string message, string info)
         {
-            
+
         }
 
         public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
@@ -1229,77 +1229,77 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
         {
-            
+
         }
 
         public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition)
         {
-            
+
         }
 
         public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
         {
-            
+
         }
 
         public void SendViewerTime(int phase)
         {
-            
+
         }
 
         public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
         {
-            
+
         }
 
         public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question)
         {
-            
+
         }
 
         public void SendHealth(float health)
         {
-            
+
         }
 
         public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
         {
-            
+
         }
 
         public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
         {
-            
+
         }
 
         public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
         {
-            
+
         }
 
         public void SendEstateCovenantInformation(UUID covenant)
         {
-            
+
         }
 
         public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
         {
-            
+
         }
 
         public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
         {
-            
+
         }
 
         public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID)
         {
-            
+
         }
 
         public void SendForceClientSelectObjects(List<uint> objectIDs)
         {
-            
+
         }
 
         public void SendCameraConstraint(Vector4 ConstraintPlane)
@@ -1309,57 +1309,57 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
         {
-            
+
         }
 
         public void SendLandParcelOverlay(byte[] data, int sequence_id)
         {
-            
+
         }
 
         public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
         {
-            
+
         }
 
         public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
         {
-            
+
         }
 
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
-            
+
         }
 
         public void SendConfirmXfer(ulong xferID, uint PacketID)
         {
-            
+
         }
 
         public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
         {
-            
+
         }
 
         public void SendInitiateDownload(string simFileName, string clientFileName)
         {
-            
+
         }
 
         public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
         {
-            
+
         }
 
         public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
         {
-            
+
         }
 
         public void SendImageNotFound(UUID imageid)
         {
-            
+
         }
 
         public void SendShutdownConnectionNotice()
@@ -1369,12 +1369,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendSimStats(SimStats stats)
         {
-            
+
         }
 
         public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
         {
-            
+
         }
 
         public void SendObjectPropertiesReply(ISceneEntity entity)
@@ -1383,12 +1383,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendAgentOffline(UUID[] agentIDs)
         {
-            
+
         }
 
         public void SendAgentOnline(UUID[] agentIDs)
         {
-            
+
         }
 
         public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
@@ -1397,62 +1397,62 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
         {
-            
+
         }
 
         public void SendAdminResponse(UUID Token, uint AdminLevel)
         {
-            
+
         }
 
         public void SendGroupMembership(GroupMembershipData[] GroupMembership)
         {
-            
+
         }
 
         public void SendGroupNameReply(UUID groupLLUID, string GroupName)
         {
-            
+
         }
 
         public void SendJoinGroupReply(UUID groupID, bool success)
         {
-            
+
         }
 
         public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
         {
-            
+
         }
 
         public void SendLeaveGroupReply(UUID groupID, bool success)
         {
-            
+
         }
 
         public void SendCreateGroupReply(UUID groupID, bool success, string message)
         {
-            
+
         }
 
         public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
         {
-            
+
         }
 
         public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
         {
-            
+
         }
 
         public void SendAsset(AssetRequestToClient req)
         {
-            
+
         }
 
         public void SendTexture(AssetBase TextureAsset)
         {
-            
+
         }
 
         public virtual void SetChildAgentThrottle(byte[] throttle)
@@ -1467,7 +1467,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SetAgentThrottleSilent(int throttle, int setting)
         {
-           
+
 
         }
         public byte[] GetThrottlesPacked(float multiplier)
@@ -1498,12 +1498,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SetClientInfo(ClientInfo info)
         {
-            
+
         }
 
         public void SetClientOption(string option, string value)
         {
-            
+
         }
 
         public string GetClientOption(string option)
@@ -1518,67 +1518,67 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters)
         {
-            
+
         }
 
         public void SendClearFollowCamProperties(UUID objectID)
         {
-            
+
         }
 
         public void SendRegionHandle(UUID regoinID, ulong handle)
         {
-            
+
         }
 
         public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
         {
-            
+
         }
 
         public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt)
         {
-            
+
         }
 
         public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data)
         {
-            
+
         }
 
         public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data)
         {
-            
+
         }
 
         public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data)
         {
-            
+
         }
 
         public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data)
         {
-            
+
         }
 
         public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data)
         {
-            
+
         }
 
         public void SendDirLandReply(UUID queryID, DirLandReplyData[] data)
         {
-            
+
         }
 
         public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data)
         {
-            
+
         }
 
         public void SendEventInfoReply(EventData info)
         {
-            
+
         }
 
         public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
@@ -1588,7 +1588,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags)
         {
-            
+
         }
 
         public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
@@ -1603,78 +1603,78 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendOfferCallingCard(UUID srcID, UUID transactionID)
         {
-            
+
         }
 
         public void SendAcceptCallingCard(UUID transactionID)
         {
-            
+
         }
 
         public void SendDeclineCallingCard(UUID transactionID)
         {
-            
+
         }
 
         public void SendTerminateFriend(UUID exFriendID)
         {
-            
+
         }
 
         public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name)
         {
-            
+
         }
 
         public void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price)
         {
-            
+
         }
 
         public void SendAgentDropGroup(UUID groupID)
         {
-            
+
         }
 
         public void RefreshGroupMembership()
         {
-            
+
         }
 
         public void UpdateGroupMembership(GroupMembershipData[] data)
         {
-            
+
         }
 
         public void GroupMembershipRemove(UUID GroupID)
         {
-            
+
         }
 
         public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
         {
-            
+
         }
 
 
         public void SendAvatarNotesReply(UUID targetID, string text)
         {
-            
+
         }
 
         public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks)
         {
-            
+
         }
 
         public void SendPickInfoReply(UUID pickID, UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled)
         {
-            
+
         }
 
         public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds)
         {
-            
+
         }
 
         public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
@@ -1684,22 +1684,22 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
         {
-            
+
         }
 
         public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
         {
-            
+
         }
 
         public void SendUseCachedMuteList()
         {
-            
+
         }
 
         public void SendMuteListUpdate(string filename)
         {
-            
+
         }
 
         public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
@@ -1716,15 +1716,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
-        
+
         public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
         {
         }
-        
+
         public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
         {
         }
-        
+
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
         {
         }
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
-        
+
         public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data)
         {
         }
diff --git a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
index c897aa5..e93fcdc 100644
--- a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
@@ -54,36 +54,36 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
-        
+
         public string Name { get { return "Asset Information Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -117,10 +117,10 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
                 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
                 return;
             }
-            
+
             AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
             if (asset == null)
-            {                
+            {
                 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
                 return;
             }
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 071530b..3be5a07 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -52,48 +52,48 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")]
     public class LindenUDPInfoModule : ISharedRegionModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
-        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
-        
-        public string Name { get { return "Linden UDP Module"; } }        
-        
+
+        public string Name { get { return "Linden UDP Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes[scene.RegionInfo.RegionID] = scene;
 
             scene.AddCommand(
                 "Comms", this, "show pqueues",
                 "show pqueues [full]",
-                "Show priority queue data for each client", 
+                "Show priority queue data for each client",
                 "Without the 'full' option, only root agents are shown."
-                  + "  With the 'full' option child agents are also shown.",                                          
+                  + "  With the 'full' option child agents are also shown.",
                 (mod, cmd) => MainConsole.Instance.Output(GetPQueuesReport(cmd)));
-            
+
             scene.AddCommand(
                 "Comms", this, "show queues",
                 "show queues [full]",
-                "Show queue data for each client", 
+                "Show queue data for each client",
                 "Without the 'full' option, only root agents are shown.\n"
                     + "With the 'full' option child agents are also shown.\n\n"
                     + "Type          - Rt is a root (avatar) client whilst cd is a child (neighbour interacting) client.\n"
@@ -116,13 +116,13 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "clear image queues <first-name> <last-name>",
                 "Clear the image queues (textures downloaded via UDP) for a particular client.",
                 (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd)));
-            
+
             scene.AddCommand(
                 "Comms", this, "show throttles",
                 "show throttles [full]",
-                "Show throttle settings for each client and for the server overall", 
+                "Show throttle settings for each client and for the server overall",
                 "Without the 'full' option, only root agents are shown."
-                  + "  With the 'full' option child agents are also shown.",                                          
+                  + "  With the 'full' option child agents are also shown.",
                 (mod, cmd) => MainConsole.Instance.Output(GetThrottlesReport(cmd)));
 
             scene.AddCommand(
@@ -134,15 +134,15 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 (mod, cmd) => MainConsole.Instance.Output(HandleClientStatsReport(cmd)));
 
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Remove(scene.RegionInfo.RegionID);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             foreach (ScenePresence agent in foundAgents)
             {
                 LLClientView client = agent.ControllingClient as LLClientView;
-    
+
                 if (client == null)
                     return "This command is only supported for LLClientView";
 
@@ -191,10 +191,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
         }
 
         protected string GetColumnEntry(string entry, int maxLength, int columnPadding)
-        {                       
+        {
             return string.Format(
-                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}", 
-                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 
+                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}",
+                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry,
                 "");
         }
 
@@ -207,29 +207,29 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
         {
             bool showChildren = false;
             string pname = "";
-            
+
             if (showParams.Length > 2 && showParams[2] == "full")
-                showChildren = true;               
+                showChildren = true;
             else if (showParams.Length > 3)
                 pname = showParams[2] + " " + showParams[3];
-            
-            StringBuilder report = new StringBuilder();            
+
+            StringBuilder report = new StringBuilder();
 
             int columnPadding = 2;
-            int maxNameLength = 18;                                    
+            int maxNameLength = 18;
             int maxRegionNameLength = 14;
             int maxTypeLength = 4;
-//            int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;                        
-                                    
+//            int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
+
             report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
             report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
             report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
-            
+
             report.AppendFormat(
                 "{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7} {10,7} {11,7}\n",
                 "Pri 0",
                 "Pri 1",
-                "Pri 2",                                
+                "Pri 2",
                 "Pri 3",
                 "Pri 4",
                 "Pri 5",
@@ -252,16 +252,16 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
-                        
+
                                 string name = client.Name;
                                 if (pname != "" && name != pname)
                                     return;
-                                
+
                                 string regionName = scene.RegionInfo.RegionName;
-                                
+
                                 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
                                 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
-                                report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));                                  
+                                report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
                                 report.AppendLine(((LLClientView)client).EntityUpdateQueue.ToString());
                             }
                         });
@@ -306,17 +306,17 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             foreach (ScenePresence agent in foundAgents)
             {
                 LLClientView client = agent.ControllingClient as LLClientView;
-    
+
                 if (client == null)
                     return "This command is only supported for LLClientView";
-    
+
                 J2KImage[] images = client.ImageManager.GetImages();
 
                 report.AppendFormat(
                     "In region {0} ({1} agent)\n",
                     agent.Scene.RegionInfo.RegionName, agent.IsChildAgent ? "child" : "root");
                 report.AppendFormat("Images in queue: {0}\n", images.Length);
-    
+
                 if (images.Length > 0)
                 {
                     report.AppendFormat(
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                     "Start Pkt",
                     "Has Asset",
                     "Decoded");
-    
+
                     foreach (J2KImage image in images)
                         report.AppendFormat(
                             "{0,36}  {1,8}  {2,10}  {3,10}  {4,9}  {5,7}\n",
@@ -337,7 +337,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
 
             return report.ToString();
         }
-        
+
         /// <summary>
         /// Generate UDP Queue data report for each client
         /// </summary>
@@ -347,16 +347,16 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
         {
             bool showChildren = false;
             string pname = "";
-            
+
             if (showParams.Length > 2 && showParams[2] == "full")
-                showChildren = true;               
+                showChildren = true;
             else if (showParams.Length > 3)
                 pname = showParams[2] + " " + showParams[3];
-            
-            StringBuilder report = new StringBuilder();            
-            
+
+            StringBuilder report = new StringBuilder();
+
             int columnPadding = 2;
-            int maxNameLength = 18;                                    
+            int maxNameLength = 18;
             int maxRegionNameLength = 14;
             int maxTypeLength = 4;
 
@@ -364,11 +364,11 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 = maxNameLength + columnPadding
                 + maxRegionNameLength + columnPadding
                 + maxTypeLength + columnPadding;
-                                    
+
             report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
             report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
             report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
-            
+
             report.AppendFormat(
                 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
                 "Since",
@@ -383,7 +383,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Q Pkts",
                 "Q Pkts",
                 "Q Pkts");
-    
+
             report.AppendFormat("{0,-" + totalInfoFieldsLength +  "}", "");
             report.AppendFormat(
                 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
@@ -398,8 +398,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Cloud",
                 "Task",
                 "Texture",
-                "Asset");            
-            
+                "Asset");
+
             lock (m_scenes)
             {
                 foreach (Scene scene in m_scenes.Values)
@@ -413,7 +413,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
-                        
+
                                 string name = client.Name;
                                 if (pname != "" && name != pname)
                                     return;
@@ -424,7 +424,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
                                 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
 
-                                IStatsCollector stats = (IStatsCollector)client;                            
+                                IStatsCollector stats = (IStatsCollector)client;
                                 report.AppendLine(stats.Report());
                             }
                         });
@@ -432,8 +432,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             }
 
             return report.ToString();
-        }  
-        
+        }
+
         /// <summary>
         /// Show throttle data
         /// </summary>
@@ -443,28 +443,28 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
         {
             bool showChildren = false;
             string pname = "";
-            
+
             if (showParams.Length > 2 && showParams[2] == "full")
-                showChildren = true;               
+                showChildren = true;
             else if (showParams.Length > 3)
                 pname = showParams[2] + " " + showParams[3];
-            
-            StringBuilder report = new StringBuilder();               
-            
+
+            StringBuilder report = new StringBuilder();
+
             int columnPadding = 2;
-            int maxNameLength = 18;                                    
+            int maxNameLength = 18;
             int maxRegionNameLength = 14;
-            int maxTypeLength = 4;     
-            int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;                        
-            
+            int maxTypeLength = 4;
+            int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
+
             report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
             report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
-            report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));            
-            
+            report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
+
             report.AppendFormat(
                 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
                 "Max",
-                "Target", 
+                "Target",
                 "Actual",
                 "Resend",
                 "Land",
@@ -472,8 +472,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Cloud",
                 "Task",
                 "Texture",
-                "Asset");          
-    
+                "Asset");
+
             report.AppendFormat("{0,-" + totalInfoFieldsLength +  "}", "");
             report.AppendFormat(
                 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
@@ -486,10 +486,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "kb/s",
                 "kb/s",
                 "kb/s",
-                "kb/s");                 
-            
+                "kb/s");
+
             report.AppendLine();
-            
+
             lock (m_scenes)
             {
                 foreach (Scene scene in m_scenes.Values)
@@ -504,25 +504,25 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
-                        
+
                                 string name = client.Name;
                                 if (pname != "" && name != pname)
                                     return;
 
                                 string regionName = scene.RegionInfo.RegionName;
-                            
+
                                 LLUDPClient llUdpClient = llClient.UDPClient;
                                 ClientInfo ci = llUdpClient.GetClientInfo();
-                            
+
                                 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
                                 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
-                                report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));                                                             
-                            
+                                report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
+
                                 report.AppendFormat(
                                     "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
                                     ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-",
-                                    llUdpClient.FlowThrottle.AdaptiveEnabled 
-                                        ? ((ci.targetThrottle * 8) / 1000).ToString() 
+                                    llUdpClient.FlowThrottle.AdaptiveEnabled
+                                        ? ((ci.targetThrottle * 8) / 1000).ToString()
                                         : (llUdpClient.FlowThrottle.TotalDripRequest * 8 / 1000).ToString(),
                                     (ci.totalThrottle * 8) / 1000,
                                     (ci.resendThrottle * 8) / 1000,
@@ -538,7 +538,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             }
 
             return report.ToString();
-        }         
+        }
 
         /// <summary>
         /// Show client stats data
@@ -568,20 +568,20 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 string childAgentStatus;
 
                                 if (llClient.SceneAgent != null)
-                                    childAgentStatus = llClient.SceneAgent.IsChildAgent ? "N" : "Y"; 
+                                    childAgentStatus = llClient.SceneAgent.IsChildAgent ? "N" : "Y";
                                 else
                                     childAgentStatus = "Off!";
 
-                                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", 
+                                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}",
                                     scene.RegionInfo.RegionName, llClient.Name,
-                                         childAgentStatus, 
+                                         childAgentStatus,
                                          (DateTime.Now - cinfo.StartedTime).Minutes,
-                                         avg_reqs, 
+                                         avg_reqs,
                                          string.Format(
-                                            "{0} ({1:0.00}%)", 
-                                            llClient.TotalAgentUpdates, 
-                                            cinfo.SyncRequests.ContainsKey("AgentUpdate") 
-                                                ? (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100 
+                                            "{0} ({1:0.00}%)",
+                                            llClient.TotalAgentUpdates,
+                                            cinfo.SyncRequests.ContainsKey("AgentUpdate")
+                                                ? (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100
                                                 : 0));
                             }
                         });
diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
index 7639c6c..906e1ee 100644
--- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
@@ -50,36 +50,36 @@ namespace OpenSim.Region.OptionalModules.Asset
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
-        
+
         public string Name { get { return "Asset Information Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[ASSET INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -118,27 +118,27 @@ namespace OpenSim.Region.OptionalModules.Asset
                 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
                 return;
             }
-            
+
             AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
             if (asset == null)
-            {                
+            {
                 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
-                return;                
+                return;
             }
-            
+
             string fileName = rawAssetId;
 
             if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
                 return;
-            
+
             using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
             {
                 using (BinaryWriter bw = new BinaryWriter(fs))
                 {
                     bw.Write(asset.Data);
                 }
-            }   
-            
+            }
+
             MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
         }
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
index 5c45e4d..0698cec 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
@@ -57,41 +57,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
         private List<Scene> m_scenes = new List<Scene>();
 
         public string Name { get { return "Animations Command Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Remove(scene);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Add(scene);
 
@@ -156,18 +156,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
 
             string cma = spa.CurrentMovementAnimation;
             cdl.AddRow(
-                "Current movement anim", 
+                "Current movement anim",
                 string.Format("{0}, {1}", DefaultAvatarAnimations.GetDefaultAnimation(cma), cma));
 
             UUID defaultAnimId = anims.DefaultAnimation.AnimID;
             cdl.AddRow(
-                "Default anim", 
+                "Default anim",
                 string.Format("{0}, {1}", defaultAnimId, sp.Animator.GetAnimName(defaultAnimId)));
 
             UUID implicitDefaultAnimId = anims.ImplicitDefaultAnimation.AnimID;
             cdl.AddRow(
-                "Implicit default anim", 
-                string.Format("{0}, {1}", 
+                "Implicit default anim",
+                string.Format("{0}, {1}",
                     implicitDefaultAnimId, sp.Animator.GetAnimName(implicitDefaultAnimId)));
 
             cdl.AddToStringBuilder(sb);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index 2f9bb1e..60ae0cb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -54,43 +54,43 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         private List<Scene> m_scenes = new List<Scene>();
 
 //        private IAvatarFactoryModule m_avatarFactory;
-        
-        public string Name { get { return "Appearance Information Module"; } }        
-        
+
+        public string Name { get { return "Appearance Information Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
-//            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);                                     
+//            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Remove(scene);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Add(scene);
 
@@ -99,7 +99,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                 "show appearance [<first-name> <last-name>]",
                 "Synonym for 'appearance show'",
                 HandleShowAppearanceCommand);
-            
+
             scene.AddCommand(
                 "Users", this, "appearance show",
                 "appearance show [<first-name> <last-name>]",
@@ -222,7 +222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
             }
 
             lock (m_scenes)
-            {   
+            {
                 foreach (Scene scene in m_scenes)
                 {
                     if (targetNameSupplied)
@@ -344,7 +344,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             if (targetNameSupplied)
             {
-                lock (m_scenes)   
+                lock (m_scenes)
                 {
                     foreach (Scene scene in m_scenes)
                     {
@@ -360,12 +360,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                 cdt.AddColumn("Name", ConsoleDisplayUtil.UserNameSize);
                 cdt.AddColumn("Wearables", 2);
 
-                lock (m_scenes)   
+                lock (m_scenes)
                 {
                     foreach (Scene scene in m_scenes)
                     {
                         scene.ForEachRootScenePresence(
-                            sp => 
+                            sp =>
                             {
                                 int count = 0;
 
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
                                     uuidGatherer.AddForInspection(wi.AssetID);
                                     uuidGatherer.GatherAll();
-                                    string[] assetStrings 
+                                    string[] assetStrings
                                         = Array.ConvertAll<UUID, string>(uuidGatherer.GatheredUuids.Keys.ToArray(), u => u.ToString());
 
                                     bool[] existChecks = scene.AssetService.AssetsExist(assetStrings);
@@ -438,10 +438,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                                     cdt.AddColumn("Type", 10);
                                     cdt.AddColumn("UUID", ConsoleDisplayUtil.UuidSize);
                                     cdt.AddColumn("Found", 5);
-                                            
+
                                     for (int k = 0; k < existChecks.Length; k++)
                                         cdt.AddRow(
-                                            (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])], 
+                                            (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])],
                                             assetStrings[k], existChecks[k] ? "yes" : "no");
 
                                     sb.Append(cdt.ToString());
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
index a147e9b..3685041 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
@@ -55,41 +55,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 //        private IAvatarFactoryModule m_avatarFactory;
 
         public string Name { get { return "Attachments Command Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Remove(scene);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-            
+
             lock (m_scenes)
                 m_scenes.Add(scene);
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index 535bf67..ed27385 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 SendConsoleOutput(agentID, "Command parameter error");
                 return;
             }
-             
+
             m_scene.StoreExtraSetting("auto_grant_attach_perms", val);
 
             SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val));
@@ -155,7 +155,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             ScenePresence target;
             if (!m_scene.TryGetScenePresence(item.PermsGranter, out target))
                 return 0;
-            
+
             if (target.UUID != hostPart.ParentGroup.OwnerID)
             {
                 uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions();
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index 73215cb..27ab32f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.OptionalModules.Avatar.Chat
 {
 
-    // An instance of this class exists for each unique combination of 
+    // An instance of this class exists for each unique combination of
     // IRC chat interface characteristics, as determined by the supplied
     // configuration file.
 
@@ -266,11 +266,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             ChannelState cs = p_cs;
 
             // Check to see if we have an existing server/channel setup that can be used
-            // In the absence of variable substitution this will always resolve to the 
-            // same ChannelState instance, and the table will only contains a single 
-            // entry, so the performance considerations for the existing behavior are 
+            // In the absence of variable substitution this will always resolve to the
+            // same ChannelState instance, and the table will only contains a single
+            // entry, so the performance considerations for the existing behavior are
             // zero. Only the IRC connector is shared, the ChannelState still contains
-            // values that, while independent of the IRC connetion, do still distinguish 
+            // values that, while independent of the IRC connetion, do still distinguish
             // this region's behavior.
 
             lock (IRCBridgeModule.m_channels)
@@ -335,7 +335,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
         }
 
-        // These routines allow differentiating changes to 
+        // These routines allow differentiating changes to
         // the underlying channel state. If necessary, a
         // new channel state will be created.
 
@@ -426,7 +426,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
         }
 
         // This level of obsessive matching allows us to produce
-        // a minimal overhead int he case of a server which does 
+        // a minimal overhead int he case of a server which does
         // need to differentiate IRC at a region level.
 
         private bool IsAPerfectMatchFor(ChannelState cs)
@@ -447,8 +447,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             );
         }
 
-        // This function implements the variable substitution mechanism 
-        // for the configuration values. Each string read from the 
+        // This function implements the variable substitution mechanism
+        // for the configuration values. Each string read from the
         // configuration file is scanned for '[...]' enclosures. Each
         // one that is found is replaced by either a runtime variable
         // (%xxx) or an existing configuration key. When no further
@@ -585,7 +585,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
         }
 
-        // This function is lifted from the IRCConnector because it 
+        // This function is lifted from the IRCConnector because it
         // contains information that is not differentiating from an
         // IRC point-of-view.
 
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             {
 
                 // Scan through the set of unique channel configuration for those
-                // that belong to this connector. And then forward the message to 
+                // that belong to this connector. And then forward the message to
                 // all regions known to those channels.
                 // Note that this code is responsible for completing some of the
                 // settings for the inbound OSChatMessage
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index 941379f..ffbebe7 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -97,14 +97,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
         // How many regions depend upon this connection
         // This count is updated by the ChannelState object and reflects the sum
-        // of the region clients associated with the set of associated channel 
+        // of the region clients associated with the set of associated channel
         // state instances. That's why it cannot be managed here.
 
         internal int depends = 0;
 
         // This variable counts the number of resets that have been performed
-        // on the connector. When a listener thread terminates, it checks to 
-        // see of the reset count has changed before it schedules another 
+        // on the connector. When a listener thread terminates, it checks to
+        // see of the reset count has changed before it schedules another
         // reset.
 
         internal int m_resetk = 0;
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
         public void PrivMsg(string pattern, string from, string region, string msg)
         {
 
-            // m_log.DebugFormat("[IRC-Connector-{0}] PrivMsg to IRC from {1}: <{2}>", idn, from, 
+            // m_log.DebugFormat("[IRC-Connector-{0}] PrivMsg to IRC from {1}: <{2}>", idn, from,
             //     String.Format(pattern, m_ircChannel, from, region, msg));
 
             // One message to the IRC server
@@ -510,7 +510,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                             c.Sender = null;
                             c.SenderUUID = UUID.Zero;
 
-                            // Is message "\001ACTION foo bar\001"? 
+                            // Is message "\001ACTION foo bar\001"?
                             // Then change to: "/me foo bar"
 
                             if ((1 == c.Message[0]) && c.Message.Substring(1).StartsWith("ACTION"))
@@ -608,8 +608,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             string parms = String.Empty;
 
             // ":" indicates that a prefix is present
-            // There are NEVER more than 17 real 
-            // fields. A parameter that starts with 
+            // There are NEVER more than 17 real
+            // fields. A parameter that starts with
             // ":" indicates that the remainder of the
             // line is a single parameter value.
 
@@ -873,7 +873,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                             }
 
                             // Being marked connected is not enough to ping. Socket establishment can sometimes take a long
-                            // time, in which case the watch dog might try to ping the server before the socket has been 
+                            // time, in which case the watch dog might try to ping the server before the socket has been
                             // set up, with nasty side-effects.
 
                             else if (_pdk_ == 0)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index 5505001..a3ef83b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             }
         }
 
-        // This method gives the region an opportunity to interfere with 
+        // This method gives the region an opportunity to interfere with
         // message delivery. For now we just enforce the enable/disable
         // flag.
 
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             }
         }
 
-        // This supports any local message traffic that might be needed in 
+        // This supports any local message traffic that might be needed in
         // support of command processing. At present there is none.
 
         internal void LocalChat(string msg)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 6c147f4..c0de3d9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                     // replace it.
                     m_replacingChatModule = false;
                 }
-                else 
+                else
                 {
                     m_replacingChatModule  = !configSource.Configs["Chat"].GetBoolean("enabled", true);
                 }
@@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             {
                 m_replacingChatModule = false;
             }
-            
+
             m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing");
 
             // take note of concierge channel and of identity
@@ -119,7 +119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             m_xmlRpcPassword = config.GetString("password", m_xmlRpcPassword);
             m_brokerURI = config.GetString("broker", m_brokerURI);
             m_brokerUpdateTimeout = config.GetInt("broker_timeout", m_brokerUpdateTimeout);
-            
+
             m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami);
 
             // calculate regions Regex
@@ -207,7 +207,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
         {
         }
 
-        new public Type ReplaceableInterface 
+        new public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -278,7 +278,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                     // range of chat to cover the whole
                     // region. however, we don't do this for whisper
                     // (got to have some privacy)
-                    if (c.Type != ChatTypeEnum.Whisper) 
+                    if (c.Type != ChatTypeEnum.Whisper)
                     {
                         base.OnChatBroadcast(sender, c);
                         return;
@@ -296,17 +296,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
         {
             client.OnLogout += OnClientLoggedOut;
 
-            if (m_replacingChatModule) 
+            if (m_replacingChatModule)
                 client.OnChatFromClient += OnChatFromClient;
         }
 
-        
+
 
         public void OnClientLoggedOut(IClientAPI client)
         {
             client.OnLogout -= OnClientLoggedOut;
             client.OnConnectionClosed -= OnClientLoggedOut;
-            
+
             if (m_conciergedScenes.Contains(client.Scene))
             {
                 Scene scene = client.Scene as Scene;
@@ -324,7 +324,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                 Scene scene = agent.Scene;
                 m_log.DebugFormat("[Concierge]: {0} enters {1}", agent.Name, scene.RegionInfo.RegionName);
                 WelcomeAvatar(agent, scene);
-                AnnounceToAgentsRegion(scene, String.Format(m_announceEntering, agent.Name, 
+                AnnounceToAgentsRegion(scene, String.Format(m_announceEntering, agent.Name,
                                                             scene.RegionInfo.RegionName, scene.GetRootAgentCount()));
                 UpdateBroker(scene);
             }
@@ -337,7 +337,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             {
                 Scene scene = agent.Scene;
                 m_log.DebugFormat("[Concierge]: {0} leaves {1}", agent.Name, scene.RegionInfo.RegionName);
-                AnnounceToAgentsRegion(scene, String.Format(m_announceLeaving, agent.Name, 
+                AnnounceToAgentsRegion(scene, String.Format(m_announceLeaving, agent.Name,
                                                             scene.RegionInfo.RegionName, scene.GetRootAgentCount()));
                 UpdateBroker(scene);
             }
@@ -374,7 +374,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
 
             scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                list.Append(String.Format("    <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID));                    
+                list.Append(String.Format("    <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID));
             });
 
             list.Append("</avatars>");
@@ -437,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
         private void UpdateBrokerDone(IAsyncResult result)
         {
             BrokerState bs = null;
-            try 
+            try
             {
                 bs = result.AsyncState as BrokerState;
                 HttpWebRequest updatePost = bs.Poster;
@@ -450,15 +450,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             catch (WebException we)
             {
                 m_log.ErrorFormat("[Concierge] broker update to {0} failed with status {1}", bs.Uri, we.Status);
-                if (null != we.Response) 
+                if (null != we.Response)
                 {
                     using (HttpWebResponse resp = we.Response as HttpWebResponse)
                     {
                         m_log.ErrorFormat("[Concierge] response from {0} status code: {1}", bs.Uri, resp.StatusCode);
                         m_log.ErrorFormat("[Concierge] response from {0} status desc: {1}", bs.Uri, resp.StatusDescription);
                         m_log.ErrorFormat("[Concierge] response from {0} server:      {1}", bs.Uri, resp.Server);
-                        
-                        if (resp.ContentLength > 0) 
+
+                        if (resp.ContentLength > 0)
                         {
                             StreamReader content = new StreamReader(resp.GetResponseStream());
                             m_log.ErrorFormat("[Concierge] response from {0} content:     {1}", bs.Uri, content.ReadToEnd());
@@ -476,12 +476,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             // welcome file there: if yes, send it to the agent
             if (!String.IsNullOrEmpty(m_welcomes))
             {
-                string[] welcomes = new string[] { 
+                string[] welcomes = new string[] {
                     Path.Combine(m_welcomes, agent.Scene.RegionInfo.RegionName),
                     Path.Combine(m_welcomes, "DEFAULT")};
                 foreach (string welcome in welcomes)
                 {
-                    if (File.Exists(welcome)) 
+                    if (File.Exists(welcome))
                     {
                         try
                         {
@@ -500,7 +500,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                         {
                             m_log.ErrorFormat("[Concierge]: welcome file {0} is malformed: {1}", welcome, fe);
                         }
-                    } 
+                    }
                     return;
                 }
                 m_log.DebugFormat("[Concierge]: no welcome message for region {0}", scene.RegionInfo.RegionName);
@@ -512,7 +512,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
         // protected void AnnounceToAgentsRegion(Scene scene, string msg)
         // {
         //     ScenePresence agent = null;
-        //     if ((client.Scene is Scene) && (client.Scene as Scene).TryGetScenePresence(client.AgentId, out agent)) 
+        //     if ((client.Scene is Scene) && (client.Scene as Scene).TryGetScenePresence(client.AgentId, out agent))
         //         AnnounceToAgentsRegion(agent, msg);
         //     else
         //         m_log.DebugFormat("[Concierge]: could not find an agent for client {0}", client.Name);
@@ -587,7 +587,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
 
                 string regionName = (string)requestData["region"];
                 IScene scene = m_scenes.Find(delegate(IScene s) { return s.RegionInfo.RegionName == regionName; });
-                if (scene == null) 
+                if (scene == null)
                     throw new Exception(String.Format("unknown region \"{0}\"", regionName));
 
                 if (!m_conciergedScenes.Contains(scene))
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 026ceca..31fc56a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -61,31 +61,31 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
         private IPresenceService m_presenceService;
 
 //        private IAvatarFactoryModule m_avatarFactory;
-        
-        public string Name { get { return "Appearance Information Module"; } }        
-        
+
+        public string Name { get { return "Appearance Information Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[FRIENDS COMMAND MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[FRIENDS COMMAND MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[FRIENDS COMMAND MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[FRIENDS COMMANDO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[FRIENDS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index 5a6b284..1b5ee04 100644
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -54,34 +54,34 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
         private Scene m_scene;
 
         public string Name { get { return "SitStand Command Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -143,7 +143,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
                 if (sitPart != null)
                 {
                     MainConsole.Instance.OutputFormat(
-                        "Sitting {0} on {1} {2} in {3}", 
+                        "Sitting {0} on {1} {2} in {3}",
                         sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name);
 
                     sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero);
@@ -202,14 +202,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
                 foreach (ScenePresence sp in scenePresences)
                 {
-                    if (!sp.IsChildAgent && nameRegex.IsMatch(sp.Name)) 
+                    if (!sp.IsChildAgent && nameRegex.IsMatch(sp.Name))
                         scenePresencesMatched.Add(sp);
                 }
             }
             else
             {
                 ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
-        
+
                 if (sp != null && !sp.IsChildAgent)
                     scenePresencesMatched.Add(sp);
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 3db0781..c6d7fe6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 if (String.IsNullOrEmpty(m_freeSwitchRealm) ||
                     String.IsNullOrEmpty(m_freeSwitchAPIPrefix))
                 {
-                    m_log.Error("[FreeSwitchVoice]: Freeswitch service mis-configured.  Not starting.");                    
+                    m_log.Error("[FreeSwitchVoice]: Freeswitch service mis-configured.  Not starting.");
                     return;
                 }
 
@@ -168,9 +168,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
                 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
                                  FreeSwitchSLVoiceBuddyHTTPHandler);
-                
+
                 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_watcher.php", m_freeSwitchAPIPrefix),
-                                 FreeSwitchSLVoiceWatcherHTTPHandler);                
+                                 FreeSwitchSLVoiceWatcherHTTPHandler);
 
                 m_log.InfoFormat("[FreeSwitchVoice]: using FreeSwitch server {0}", m_freeSwitchRealm);
 
@@ -302,7 +302,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         public void OnRegisterCaps(Scene scene, UUID agentID, Caps caps)
         {
             m_log.DebugFormat(
-                "[FreeSwitchVoice]: OnRegisterCaps() called with agentID {0} caps {1} in scene {2}", 
+                "[FreeSwitchVoice]: OnRegisterCaps() called with agentID {0} caps {1} in scene {2}",
                 agentID, caps, scene.RegionInfo.RegionName);
 
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
@@ -352,7 +352,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         {
             m_log.DebugFormat(
                 "[FreeSwitchVoice][PROVISIONVOICE]: ProvisionVoiceAccountRequest() request: {0}, path: {1}, param: {2}", request, path, param);
-            
+
             ScenePresence avatar = scene.GetScenePresence(agentID);
             if (avatar == null)
             {
@@ -423,9 +423,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                                              UUID agentID, Caps caps)
         {
             m_log.DebugFormat(
-                "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}", 
+                "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}",
                 scene.RegionInfo.RegionName, agentID);
-            
+
             ScenePresence avatar = scene.GetScenePresence(agentID);
             string avatarName = avatar.Name;
 
@@ -512,7 +512,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
             m_log.DebugFormat("[FreeSwitchVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}",
                               avatarName, request, path, param);
-            
+
             return "<llsd>true</llsd>";
         }
 
@@ -610,7 +610,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         public Hashtable FreeSwitchSLVoiceBuddyHTTPHandler(Hashtable request)
         {
             m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceBuddyHTTPHandler called");
-            
+
             Hashtable response = new Hashtable();
             response["int_response_code"] = 200;
             response["str_response_string"] = string.Empty;
@@ -678,16 +678,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 //            Regex normalizeEndLines = new Regex(@"(\r\n|\n)", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline);
 //
 //            m_log.DebugFormat(
-//                "[FREESWITCH]: FreeSwitchSLVoiceBuddyHTTPHandler() response {0}", 
+//                "[FREESWITCH]: FreeSwitchSLVoiceBuddyHTTPHandler() response {0}",
 //                normalizeEndLines.Replace((string)response["str_response_string"],""));
-            
+
             return response;
         }
 
         public Hashtable FreeSwitchSLVoiceWatcherHTTPHandler(Hashtable request)
         {
             m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceWatcherHTTPHandler called");
-            
+
             Hashtable response = new Hashtable();
             response["int_response_code"] = 200;
             response["content-type"] = "text/xml";
@@ -700,8 +700,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
             StringBuilder resp = new StringBuilder();
             resp.Append("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?><response xmlns=\"http://www.vivox.com\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation= \"/xsd/buddy_list.xsd\">");
-            
-            // FIXME: This is enough of a response to stop viewer 2 complaining about a login failure and get voice to work.  If we don't 
+
+            // FIXME: This is enough of a response to stop viewer 2 complaining about a login failure and get voice to work.  If we don't
             // give an OK response, then viewer 2 engages in an continuous viv_signin.php, viv_buddy.php, viv_watcher.php loop
             // Viewer 1 appeared happy to ignore the lack of reply and still works with this reply.
             //
@@ -711,19 +711,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                         <cookie_name>lib_session</cookie_name>
                         <cookie>{0}</cookie>
                         <auth_token>{0}</auth_token>
-                        <body/></level0></response>", auth_token));            
-            
+                        <body/></level0></response>", auth_token));
+
             response["str_response_string"] = resp.ToString();
-            
+
 //            Regex normalizeEndLines = new Regex(@"(\r\n|\n)", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline);
 //
 //            m_log.DebugFormat(
-//                "[FREESWITCH]: FreeSwitchSLVoiceWatcherHTTPHandler() response {0}", 
+//                "[FREESWITCH]: FreeSwitchSLVoiceWatcherHTTPHandler() response {0}",
 //                normalizeEndLines.Replace((string)response["str_response_string"],""));
-            
+
             return response;
         }
-        
+
         public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request)
         {
             //m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called");
@@ -771,10 +771,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     </level0>
                 </response>", userid, pos, avatarName);
 
-            response["int_response_code"] = 200;            
-            
+            response["int_response_code"] = 200;
+
 //            m_log.DebugFormat("[FreeSwitchVoice]: Sending FreeSwitchSLVoiceSigninHTTPHandler response");
-            
+
             return response;
         }
 
@@ -859,23 +859,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             response["keepalive"] = false;
             response["int_response_code"] = 500;
 
-            Hashtable requestBody = ParseRequestBody((string)request["body"]);                                   
+            Hashtable requestBody = ParseRequestBody((string)request["body"]);
 
-            string section = (string) requestBody["section"];                       
+            string section = (string) requestBody["section"];
 
             if (section == "directory")
             {
                 string eventCallingFunction = (string)requestBody["Event-Calling-Function"];
                 m_log.DebugFormat(
-                    "[FreeSwitchVoice]: Received request for config section directory, event calling function '{0}'", 
-                    eventCallingFunction);                            
-                
+                    "[FreeSwitchVoice]: Received request for config section directory, event calling function '{0}'",
+                    eventCallingFunction);
+
                 response = m_FreeswitchService.HandleDirectoryRequest(requestBody);
             }
             else if (section == "dialplan")
-            {     
+            {
                 m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section dialplan");
-                
+
                 response = m_FreeswitchService.HandleDialplanRequest(requestBody);
             }
             else
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 5ea4a31..57930d7 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         private static Dictionary<string,string> m_parents = new Dictionary<string,string>();
         private static bool m_dumpXml;
-        
+
         private IConfig m_config;
 
         private object m_Lock;
@@ -153,22 +153,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 // Validate against constraints and default if necessary
                 if (m_vivoxChannelRollOff < CHAN_ROLL_OFF_MIN || m_vivoxChannelRollOff > CHAN_ROLL_OFF_MAX)
                 {
-                    m_log.WarnFormat("[VivoxVoice] Invalid value for roll off ({0}), reset to {1}.", 
+                    m_log.WarnFormat("[VivoxVoice] Invalid value for roll off ({0}), reset to {1}.",
                                               m_vivoxChannelRollOff, CHAN_ROLL_OFF_DEFAULT);
                     m_vivoxChannelRollOff = CHAN_ROLL_OFF_DEFAULT;
                 }
 
                 if (m_vivoxChannelMaximumRange < CHAN_MAX_RANGE_MIN || m_vivoxChannelMaximumRange > CHAN_MAX_RANGE_MAX)
                 {
-                    m_log.WarnFormat("[VivoxVoice] Invalid value for maximum range ({0}), reset to {1}.", 
+                    m_log.WarnFormat("[VivoxVoice] Invalid value for maximum range ({0}), reset to {1}.",
                                               m_vivoxChannelMaximumRange, CHAN_MAX_RANGE_DEFAULT);
                     m_vivoxChannelMaximumRange = CHAN_MAX_RANGE_DEFAULT;
                 }
 
-                if (m_vivoxChannelClampingDistance < CHAN_CLAMPING_DISTANCE_MIN || 
+                if (m_vivoxChannelClampingDistance < CHAN_CLAMPING_DISTANCE_MIN ||
                                             m_vivoxChannelClampingDistance > CHAN_CLAMPING_DISTANCE_MAX)
                 {
-                    m_log.WarnFormat("[VivoxVoice] Invalid value for clamping distance ({0}), reset to {1}.", 
+                    m_log.WarnFormat("[VivoxVoice] Invalid value for clamping distance ({0}), reset to {1}.",
                                               m_vivoxChannelClampingDistance, CHAN_CLAMPING_DISTANCE_DEFAULT);
                     m_vivoxChannelClampingDistance = CHAN_CLAMPING_DISTANCE_DEFAULT;
                 }
@@ -180,7 +180,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     case "presentation" : break;
                     case "auditorium" : break;
                     default :
-                        m_log.WarnFormat("[VivoxVoice] Invalid value for channel mode ({0}), reset to {1}.", 
+                        m_log.WarnFormat("[VivoxVoice] Invalid value for channel mode ({0}), reset to {1}.",
                                                   m_vivoxChannelMode, CHAN_MODE_DEFAULT);
                         m_vivoxChannelMode = CHAN_MODE_DEFAULT;
                         break;
@@ -191,7 +191,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     case "positional" : break;
                     case "channel" : break;
                     default :
-                        m_log.WarnFormat("[VivoxVoice] Invalid value for channel type ({0}), reset to {1}.", 
+                        m_log.WarnFormat("[VivoxVoice] Invalid value for channel type ({0}), reset to {1}.",
                                                   m_vivoxChannelType, CHAN_TYPE_DEFAULT);
                         m_vivoxChannelType = CHAN_TYPE_DEFAULT;
                         break;
@@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         public void AddRegion(Scene scene)
         {
-            if (m_pluginEnabled) 
+            if (m_pluginEnabled)
             {
                 lock (vlock)
                 {
@@ -238,13 +238,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
                     string sceneUUID  = scene.RegionInfo.RegionID.ToString();
                     string sceneName  = scene.RegionInfo.RegionName;
-                    
+
                     // Make sure that all local channels are deleted.
                     // So we have to search for the children, and then do an
                     // iteration over the set of chidren identified.
                     // This assumes that there is just one directory per
                     // region.
-                    
+
                     if (VivoxTryGetDirectory(sceneUUID + "D", out channelId))
                     {
                         m_log.DebugFormat("[VivoxVoice]: region {0}: uuid {1}: located directory id {2}",
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                                 {
                                     if (!IsOK(VivoxDeleteChannel(channelId, id)))
                                         m_log.WarnFormat("[VivoxVoice] Channel delete failed {0}:{1}:{2}", i, channelId, id);
-                                } 
+                                }
                             }
                         }
                     }
@@ -311,7 +311,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         public void RemoveRegion(Scene scene)
         {
-            if (m_pluginEnabled) 
+            if (m_pluginEnabled)
             {
                 lock (vlock)
                 {
@@ -319,7 +319,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
                     string sceneUUID  = scene.RegionInfo.RegionID.ToString();
                     string sceneName  = scene.RegionInfo.RegionName;
-                    
+
                     // Make sure that all local channels are deleted.
                     // So we have to search for the children, and then do an
                     // iteration over the set of chidren identified.
@@ -343,7 +343,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                                 {
                                     if (!IsOK(VivoxDeleteChannel(channelId, id)))
                                         m_log.WarnFormat("[VivoxVoice] Channel delete failed {0}:{1}:{2}", i, channelId, id);
-                                } 
+                                }
                             }
                         }
                     }
@@ -353,7 +353,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
                     // Remove the channel umbrella entry
 
-                    lock (m_parents) 
+                    lock (m_parents)
                     {
                         if (m_parents.ContainsKey(sceneUUID))
                         {
@@ -375,7 +375,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 VivoxLogout();
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -396,11 +396,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         // (login, region crossing). We contribute two capabilities to
         // the set of capabilities handed back to the client:
         // ProvisionVoiceAccountRequest and ParcelVoiceInfoRequest.
-        // 
+        //
         // ProvisionVoiceAccountRequest allows the client to obtain
         // the voice account credentials for the avatar it is
         // controlling (e.g., user name, password, etc).
-        // 
+        //
         // ParcelVoiceInfoRequest is invoked whenever the client
         // changes from one region or parcel to another.
         //
@@ -493,9 +493,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
                     if (XmlFind(resp, "response.level0.status", out code))
                     {
-                        if (code != "OK") 
+                        if (code != "OK")
                         {
-                            if (XmlFind(resp, "response.level0.body.code", out code)) 
+                            if (XmlFind(resp, "response.level0.body.code", out code))
                             {
                                 // If the request was recognized, then this should be set to something
                                 switch (code)
@@ -530,27 +530,27 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                                             switch (code)
                                             {
                                                 case "201" : // Account expired
-                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : expired credentials", 
+                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : expired credentials",
                                                                       avatarName);
                                                     m_adminConnected = false;
                                                     retry = DoAdminLogin();
                                                     break;
-                                                    
+
                                                 case "202" : // Missing credentials
-                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : missing credentials", 
+                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : missing credentials",
                                                                       avatarName);
                                                     break;
-                                                    
+
                                                 case "212" : // Not authorized
                                                     m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : not authorized",
                                                                       avatarName);
                                                     break;
-                                                    
+
                                                 case "300" : // Required parameter missing
-                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : parameter missing", 
+                                                    m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : parameter missing",
                                                                       avatarName);
                                                     break;
-                                                    
+
                                                 case "400" : // Create failed
                                                     m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Create account information failed : create failed",
                                                                       avatarName);
@@ -558,7 +558,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                                             }
                                         }
                                         break;
-                                        
+
                                     case "404" : // Failed to retrieve account
                                         m_log.ErrorFormat("[VivoxVoice]: avatar \"{0}\": Get account information failed : retrieve failed");
                                         // [AMW] Sleep and retry for a fixed period? Or just abandon?
@@ -575,7 +575,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: Get Account Request failed for \"{0}\"", avatarName);
                     throw new Exception("Unable to execute request");
                 }
-          
+
                 // Unconditionally change the password on each request
                 VivoxPassword(agentname, password);
 
@@ -613,7 +613,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             string        avatarName = avatar.Name;
 
             // - check whether we have a region channel in our cache
-            // - if not: 
+            // - if not:
             //       create it and cache it
             // - send it to the client
             // - send channel_uri: as "sip:regionID@m_sipDomain"
@@ -622,7 +622,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 LLSDParcelVoiceInfoResponse parcelVoiceInfo;
                 string channel_uri;
 
-                if (null == scene.LandChannel) 
+                if (null == scene.LandChannel)
                     throw new Exception(String.Format("region \"{0}\": avatar \"{1}\": land data not yet available",
                                                       scene.RegionInfo.RegionName, avatarName));
 
@@ -667,15 +667,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
                 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
 
-//                    m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", 
+//                    m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
 //                                      scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
                 return r;
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": avatar \"{1}\": {2}, retry later", 
+                m_log.ErrorFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": avatar \"{1}\": {2}, retry later",
                                   scene.RegionInfo.RegionName, avatarName, e.Message);
-                m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": avatar \"{1}\": {2} failed", 
+                m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": avatar \"{1}\": {2} failed",
                                   scene.RegionInfo.RegionName, avatarName, e.ToString());
 
                 return "<llsd><undef /></llsd>";
@@ -721,17 +721,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             {
                 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name);
                 landUUID = land.GlobalID.ToString();
-                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}", 
+                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",
                                   landName, land.LocalID, landUUID);
             }
             else
             {
                 landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, scene.RegionInfo.RegionName);
                 landUUID = scene.RegionInfo.RegionID.ToString();
-                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}", 
+                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",
                                   landName, land.LocalID, landUUID);
             }
-                    
+
             lock (vlock)
             {
                 // Added by Adam to help debug channel not availible errors.
@@ -742,7 +742,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 else
                     throw new Exception("vivox channel uri not available");
 
-                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parent channel id {1}: retrieved parcel channel_uri {2} ", 
+                m_log.DebugFormat("[VivoxVoice]: Region:Parcel \"{0}\": parent channel id {1}: retrieved parcel channel_uri {2} ",
                                   landName, parentId, channelUri);
             }
 
@@ -817,14 +817,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         /// <summary>
         /// Create a channel.
-        /// Once again, there a multitude of options possible. In the simplest case 
+        /// Once again, there a multitude of options possible. In the simplest case
         /// we specify only the name and get a non-persistent cannel in return. Non
         /// persistent means that the channel gets deleted if no-one uses it for
         /// 5 hours. To accomodate future requirements, it may be a good idea to
         /// initially create channels under the umbrella of a parent ID based upon
         /// the region name. That way we have a context for side channels, if those
         /// are required in a later phase.
-        /// 
+        ///
         /// In this case the call handles parent and description as optional values.
         /// </summary>
         private bool VivoxTryCreateChannel(string parent, string channelId, string description, out string channelUri)
@@ -846,7 +846,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             requrl = String.Format("{0}&chan_dist_model={1}",        requrl, m_vivoxChannelDistanceModel);
             requrl = String.Format("{0}&chan_max_range={1}",         requrl, m_vivoxChannelMaximumRange);
             requrl = String.Format("{0}&chan_clamping_distance={1}", requrl, m_vivoxChannelClampingDistance);
-            
+
             XmlElement resp = VivoxCall(requrl, true);
             if (XmlFind(resp, "response.level0.body.chan_uri", out channelUri))
                 return true;
@@ -889,7 +889,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         /// <summary>
         /// Retrieve a channel.
-        /// Once again, there a multitude of options possible. In the simplest case 
+        /// Once again, there a multitude of options possible. In the simplest case
         /// we specify only the name and get a non-persistent cannel in return. Non
         /// persistent means that the channel gets deleted if no-one uses it for
         /// 5 hours. To accomodate future requirements, it may be a good idea to
@@ -898,7 +898,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         /// are required in a later phase.
         /// In this case the call handles parent and description as optional values.
         /// </summary>
-        private bool VivoxTryGetChannel(string channelParent, string channelName, 
+        private bool VivoxTryGetChannel(string channelParent, string channelName,
                                         out string channelId, out string channelUri)
         {
             string count;
@@ -1006,7 +1006,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     string type;
 
                     // skip if not a directory
-                    if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.type", i, out type) || 
+                    if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.type", i, out type) ||
                         type != "dir")
                         continue;
 
@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         /// <summary>
         /// Delete a channel.
-        /// Once again, there a multitude of options possible. In the simplest case 
+        /// Once again, there a multitude of options possible. In the simplest case
         /// we specify only the name and get a non-persistent cannel in return. Non
         /// persistent means that the channel gets deleted if no-one uses it for
         /// 5 hours. To accomodate future requirements, it may be a good idea to
@@ -1098,7 +1098,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         //                         return VivoxGetChannelById(null, id);
         //                     }
         //                 }
-        //             } 
+        //             }
         //         }
         //     }
 
@@ -1106,12 +1106,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         //     return VivoxGetChannel(null, Guid.NewGuid().ToString());
 
         // }
-   
+
         /// <summary>
         /// This method handles the WEB side of making a request over the
         /// Vivox interface. The returned values are tansferred to a has
         /// table which is returned as the result.
-        /// The outcome of the call can be determined by examining the 
+        /// The outcome of the call can be determined by examining the
         /// status value in the hash table.
         /// </summary>
         private XmlElement VivoxCall(string requrl, bool admin)
@@ -1127,7 +1127,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             doc = new XmlDocument();
 
             // Let's serialize all calls to Vivox. Most of these are driven by
-            // the clients (CAPs), when the user arrives at the region. We don't 
+            // the clients (CAPs), when the user arrives at the region. We don't
             // want to issue many simultaneous http requests to Vivox, because mono
             // doesn't like that
             lock (m_Lock)
@@ -1173,7 +1173,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         /// <summary>
         /// Login has been factored in this way because it gets called
-        /// from several places in the module, and we want it to work 
+        /// from several places in the module, and we want it to work
         /// the same way each time.
         /// </summary>
         private bool DoAdminLogin()
@@ -1188,15 +1188,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     XmlElement resp = null;
 
                     resp = VivoxLogin(m_vivoxAdminUser, m_vivoxAdminPassword);
- 
-                    if (XmlFind(resp, "response.level0.body.status", out status)) 
+
+                    if (XmlFind(resp, "response.level0.body.status", out status))
                     {
                         if (status == "Ok")
                         {
                             m_log.Info("[VivoxVoice] Admin connection established");
                             if (XmlFind(resp, "response.level0.body.auth_token", out m_authToken))
                             {
-                                if (m_dumpXml) m_log.DebugFormat("[VivoxVoice] Auth Token <{0}>", 
+                                if (m_dumpXml) m_log.DebugFormat("[VivoxVoice] Auth Token <{0}>",
                                                             m_authToken);
                                 m_adminConnected = true;
                             }
@@ -1215,9 +1215,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
         /// <summary>
         /// The XmlScan routine is provided to aid in the
-        /// reverse engineering of incompletely 
+        /// reverse engineering of incompletely
         /// documented packets returned by the Vivox
-        /// voice server. It is only called if the 
+        /// voice server. It is only called if the
         /// m_dumpXml switch is set.
         /// </summary>
         private void XmlScanl(XmlElement e, int index)
@@ -1262,7 +1262,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         private bool XmlFind(XmlElement root, string tag, int nth, out string result)
         {
             if (root == null || tag == null || tag == String.Empty)
-            { 
+            {
                 result = String.Empty;
                 return false;
             }
@@ -1273,7 +1273,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         {
             int nth = 0;
             if (root == null || tag == null || tag == String.Empty)
-            { 
+            {
                 result = String.Empty;
                 return false;
             }
@@ -1284,7 +1284,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         /// XmlSearch is initially called by XmlFind, and then
         /// recursively called by itself until the document
         /// supplied to XmlFind is either exhausted or the name hierarchy
-        /// is matched. 
+        /// is matched.
         ///
         /// If the hierarchy is matched, the value is returned in
         /// result, and true returned as the function's
@@ -1298,7 +1298,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 result = String.Empty;
                 return false;
             }
-                
+
             if (tags.Length-index == 1)
             {
                 if (nth == 0)
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;
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
index 4e766eb..0436f96 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.DataSnapshot
 
         public void Initialise(IConfigSource config)
         {
-            if (!m_configLoaded) 
+            if (!m_configLoaded)
             {
                 m_configLoaded = true;
                 //m_log.Debug("[DATASNAPSHOT]: Loading configuration");
@@ -248,7 +248,7 @@ namespace OpenSim.Region.DataSnapshot
             m_snapStore.ForceSceneStale(scene);
         }
 
-        public void Close() 
+        public void Close()
         {
             if (!m_enabled)
                 return;
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
index eb2867d..8e6a30e 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
 
                     LandData parcel = land.LandData;
                     if (m_parent.ExposureLevel.Equals("all") ||
-                        (m_parent.ExposureLevel.Equals("minimum") && 
+                        (m_parent.ExposureLevel.Equals("minimum") &&
                         (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory))
                     {
 
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
index bbf7168..95a2dd6 100644
--- a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
@@ -46,12 +46,12 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared
     /// </summary>
     /// <remarks>
     /// This module is the simplest possible example of a non-shared region module (a module where each scene/region
-    /// in the simulator has its own copy).  If anybody wants to create a more complex example in the future then 
+    /// in the simulator has its own copy).  If anybody wants to create a more complex example in the future then
     /// please create a separate class.
-    /// 
-    /// This module is not active by default.  If you want to see it in action, 
+    ///
+    /// This module is not active by default.  If you want to see it in action,
     /// then just uncomment the line below starting with [Extension(Path...
-    /// 
+    ///
     /// When the module is enabled it will print messages when it receives certain events to the screen and the log
     /// file.
     /// </remarks>
@@ -59,34 +59,34 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared
     public class BareBonesNonSharedModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        public string Name { get { return "Bare Bones Non Shared Module"; } }        
-        
+
+        public string Name { get { return "Bare Bones Non Shared Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
             m_log.DebugFormat("[BARE BONES NON SHARED]: INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
             m_log.DebugFormat("[BARE BONES NON SHARED]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-        }                
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
index 46fea3e..1271e3f 100644
--- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
@@ -46,52 +46,52 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesShared
     /// </summary>
     /// <remarks>
     /// This module is the simplest possible example of a shared region module (a module which is shared by every
-    /// scene/region running on the simulator).  If anybody wants to create a more complex example in the future then 
+    /// scene/region running on the simulator).  If anybody wants to create a more complex example in the future then
     /// please create a separate class.
-    /// 
-    /// This module is not active by default.  If you want to see it in action, 
+    ///
+    /// This module is not active by default.  If you want to see it in action,
     /// then just uncomment the line below starting with [Extension(Path...
-    /// 
+    ///
     /// When the module is enabled it will print messages when it receives certain events to the screen and the log
     /// file.
     /// </remarks>
     //[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BareBonesSharedModule")]
     public class BareBonesSharedModule : ISharedRegionModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
-        
-        public string Name { get { return "Bare Bones Shared Module"; } }        
-        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public string Name { get { return "Bare Bones Shared Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
             m_log.DebugFormat("[BARE BONES SHARED]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
             m_log.DebugFormat("[BARE BONES SHARED]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
             m_log.DebugFormat("[BARE BONES SHARED]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} ADDED", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
             m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-        }                
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
index 5bf0ed4..0747cc0 100644
--- a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
 {
-    
+
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebSocketEchoModule")]
     public class WebSocketEchoModule : ISharedRegionModule
     {
@@ -111,7 +111,7 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
             obj.SendPingCheck();
         }
 
-        
+
         private void HandlerOnOnUpgradeCompleted(object sender, UpgradeCompletedEventArgs completeddata)
         {
             WebSocketHttpServerHandler obj = sender as WebSocketHttpServerHandler;
@@ -136,14 +136,14 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
             obj.Dispose();
         }
 
-        // Shutting down..  so shut down all sockets.   
+        // Shutting down..  so shut down all sockets.
         // Note..    this should be done outside of an ienumerable if you're also hook to the close event.
         public void Close()
         {
             if (!enabled)
                 return;
-        
-            // We convert this to a for loop so we're not in in an IEnumerable when the close 
+
+            // We convert this to a for loop so we're not in in an IEnumerable when the close
             //call triggers an event which then removes item from _activeHandlers that we're enumerating
             WebSocketHttpServerHandler[] items = new WebSocketHttpServerHandler[_activeHandlers.Count];
             _activeHandlers.CopyTo(items);
diff --git a/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs b/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs
index a25e034..95bb13e 100644
--- a/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs
+++ b/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Region.OptionalModules.Framework.Monitoring
         protected Scene m_scene;
 
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public string Name { get { return "Services Health Monitoring Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -64,7 +64,7 @@ namespace OpenSim.Region.OptionalModules.Framework.Monitoring
         public void Close()
         {
         }
-        
+
         public void AddRegion(Scene scene)
         {
             if (m_scene == null)
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index b259f52..52fa908 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -59,8 +59,8 @@ namespace OpenSim.Region.OptionalModules.Materials
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string Name { get { return "MaterialsModule"; } }        
-        
+        public string Name { get { return "MaterialsModule"; } }
+
         public Type ReplaceableInterface { get { return null; } }
 
         IAssetCache m_cache;
@@ -88,13 +88,13 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (m_enabled)
                 m_log.DebugFormat("[Materials]: Initialized");
         }
-        
+
         public void Close()
         {
             if (!m_enabled)
                 return;
         }
-        
+
         public void AddRegion(Scene scene)
         {
             if (!m_enabled)
@@ -152,7 +152,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                         m_scene.AssetService.Store(a);
                     }
                 });
-            }       
+            }
         }
 
         private void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
@@ -166,7 +166,7 @@ namespace OpenSim.Region.OptionalModules.Materials
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
-            IRequestHandler renderMaterialsPostHandler 
+            IRequestHandler renderMaterialsPostHandler
                 = new RestStreamHandler("POST", capsBase + "/",
                     (request, path, param, httpRequest, httpResponse)
                         => RenderMaterialsPostCap(request, agentID),
@@ -177,7 +177,7 @@ namespace OpenSim.Region.OptionalModules.Materials
             // and POST handlers, (at least at the time this was originally written), so we first set up a POST
             // handler normally and then add a GET handler via MainServer
 
-            IRequestHandler renderMaterialsGetHandler 
+            IRequestHandler renderMaterialsGetHandler
                 = new RestStreamHandler("GET", capsBase + "/",
                     (request, path, param, httpRequest, httpResponse)
                         => RenderMaterialsGetCap(request),
@@ -185,14 +185,14 @@ namespace OpenSim.Region.OptionalModules.Materials
             MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
 
             // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
-            IRequestHandler renderMaterialsPutHandler 
+            IRequestHandler renderMaterialsPutHandler
                 = new RestStreamHandler("PUT", capsBase + "/",
                     (request, path, param, httpRequest, httpResponse)
                         => RenderMaterialsPutCap(request, agentID),
                     "RenderMaterials", null);
             MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
             if (!m_enabled)
@@ -201,8 +201,8 @@ namespace OpenSim.Region.OptionalModules.Materials
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
             m_scene.EventManager.OnBackup -= EventManager_OnBackup;
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
             if (!m_enabled) return;
@@ -285,7 +285,7 @@ namespace OpenSim.Region.OptionalModules.Materials
         /// Find the materials used in the SOP, and add them to 'm_regionMaterials'.
         /// </summary>
         private void GetStoredMaterialsInPart(SceneObjectPart part)
-        { 
+        {
             if (part.Shape == null)
                 return;
 
@@ -299,7 +299,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                 GetStoredMaterialInFace(part, te.DefaultTexture);
             else
                 m_log.WarnFormat(
-                    "[Materials]: Default texture for part {0} (part of object {1}) in {2} unexpectedly null.  Ignoring.", 
+                    "[Materials]: Default texture for part {0} (part of object {1}) in {2} unexpectedly null.  Ignoring.",
                     part.Name, part.ParentGroup.Name, m_scene.Name);
 
             foreach (Primitive.TextureEntryFace face in te.FaceTextures)
@@ -363,7 +363,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
                 byte[] inBytes = req["Zipped"].AsBinary();
 
-                try 
+                try
                 {
                     osd = ZDecompressBytesToOsd(inBytes);
 
@@ -409,7 +409,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                     //return "";
                 }
             }
-            
+
             resp["Zipped"] = ZCompressOSD(respArr, false);
             string response = OSDParser.SerializeLLSDXmlString(resp);
 
@@ -435,7 +435,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
                 byte[] inBytes = req["Zipped"].AsBinary();
 
-                try 
+                try
                 {
                     osd = ZDecompressBytesToOsd(inBytes);
 
@@ -493,7 +493,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                                             m_log.WarnFormat("[Materials]: Error in TextureEntry for SOP {0} {1}", sop.Name, sop.UUID);
                                             continue;
                                         }
-                                        
+
                                         UUID id;
                                         if (mat == null)
                                         {
@@ -588,7 +588,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                     //return "";
                 }
             }
-            
+
             resp["Zipped"] = ZCompressOSD(respArr, false);
             string response = OSDParser.SerializeLLSDXmlString(resp);
 
@@ -684,7 +684,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
             if (sop.Name != "Primitive")
                 return sop.Name;
-            
+
             if ((sop.ParentGroup != null) && (sop.ParentGroup.Name != "Primitive"))
                 return sop.ParentGroup.Name;
 
@@ -748,7 +748,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
             using (MemoryStream msSinkCompressed = new MemoryStream())
             {
-                using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkCompressed, 
+                using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkCompressed,
                     Ionic.Zlib.CompressionMode.Compress, CompressionLevel.BestCompression, true))
                 {
                     zOut.Write(data, 0, data.Length);
diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
index 1d9179c..bcfb34d 100755
--- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
+++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
@@ -54,10 +54,10 @@ namespace OpenSim.Region.OptionalModules.PhysicsParameters
         private static bool m_commandsLoaded = false;
 
         #region ISharedRegionModule
-        public string Name { get { return "Runtime Physics Parameter Module"; } }        
-        
+        public string Name { get { return "Runtime Physics Parameter Module"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
             // m_log.DebugFormat("{0}: INITIALIZED MODULE", LogHeader);
@@ -68,29 +68,29 @@ namespace OpenSim.Region.OptionalModules.PhysicsParameters
             // m_log.DebugFormat("[{0}: POST INITIALIZED MODULE", LogHeader);
             InstallInterfaces();
         }
-        
+
         public void Close()
         {
             // m_log.DebugFormat("{0}: CLOSED MODULE", LogHeader);
         }
-        
+
         public void AddRegion(Scene scene)
         {
             // m_log.DebugFormat("{0}: REGION {1} ADDED", LogHeader, scene.RegionInfo.RegionName);
             m_scenes.Add(scene);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
             // m_log.DebugFormat("{0}: REGION {1} REMOVED", LogHeader, scene.RegionInfo.RegionName);
             if (m_scenes.Contains(scene))
                 m_scenes.Remove(scene);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
             // m_log.DebugFormat("{0}: REGION {1} LOADED", LogHeader, scene.RegionInfo.RegionName);
-        }                
+        }
         #endregion INonSharedRegionModule
 
         private const string getInvocation = "physics get [<param>|ALL]";
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 4ffb03b..9c0fa75 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -52,14 +52,14 @@ namespace OpenSim.Region.OptionalModules
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_enabled;
 
-        public string Name { get { return "PrimLimitsModule"; } }        
-        
+        public string Name { get { return "PrimLimitsModule"; } }
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource config)
         {
             string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules",
-                new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); 
+                new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule");
 
             List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim()));
 
@@ -69,11 +69,11 @@ namespace OpenSim.Region.OptionalModules
             m_log.DebugFormat("[PRIM LIMITS]: Initialized module");
             m_enabled = true;
         }
-        
+
         public void Close()
         {
         }
-        
+
         public void AddRegion(Scene scene)
         {
             if (!m_enabled)
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules
 
             m_log.DebugFormat("[PRIM LIMITS]: Region {0} added", scene.RegionInfo.RegionName);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
             if (m_enabled)
@@ -97,8 +97,8 @@ namespace OpenSim.Region.OptionalModules
             scene.Permissions.OnRezObject -= CanRezObject;
             scene.Permissions.OnObjectEntry -= CanObjectEnter;
             scene.Permissions.OnDuplicateObject -= CanDuplicateObject;
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
@@ -158,7 +158,7 @@ namespace OpenSim.Region.OptionalModules
 
             Vector3 oldPoint = obj.GroupPosition;
             ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
-            
+
             // The prim hasn't crossed a region boundry so we don't need to worry
             // about prim counts here
             if(oldParcel != null && oldParcel.Equals(newParcel))
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 78a9c58..cbfd2d2 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/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.Region.OptionalModules")]
@@ -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/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index c38bb3e..9343aab 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors 
+ * Copyright (c) Contributors
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         protected List<TakeValueCallbackClass> m_TakeStore;
         protected List<TakeValueCallbackClass> m_ReadStore;
-        
+
         // add separators for quoted paths and array references
         protected static Regex m_ParsePassOne = new Regex("({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])");
 
@@ -98,10 +98,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// </summary>
         // -----------------------------------------------------------------
         public int StringSpace { get; set; }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public static bool CanonicalPathExpression(string ipath, out string opath)
@@ -116,13 +116,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             opath = PathExpressionToKey(path);
             return true;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
-        public JsonStore() 
+        public JsonStore()
         {
             StringSpace = 0;
             m_TakeStore = new List<TakeValueCallbackClass>();
@@ -132,17 +132,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public JsonStore(string value) : this()
         {
             // This is going to throw an exception if the value is not
-            // a valid JSON chunk. Calling routines should catch the 
+            // a valid JSON chunk. Calling routines should catch the
             // exception and handle it appropriately
             if (String.IsNullOrEmpty(value))
                 ValueStore = new OSDMap();
             else
                 ValueStore = OSDParser.DeserializeJson(value);
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public JsonStoreNodeType GetNodeType(string expr)
@@ -150,27 +150,27 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             Stack<string> path;
             if (! ParsePathExpression(expr,out path))
                 return JsonStoreNodeType.Undefined;
-            
+
             OSD result = ProcessPathExpression(ValueStore,path);
 
             if (result == null)
                 return JsonStoreNodeType.Undefined;
-            
+
             if (result is OSDMap)
                 return JsonStoreNodeType.Object;
-            
+
             if (result is OSDArray)
                 return JsonStoreNodeType.Array;
-            
+
             if (OSDBaseType(result.Type))
                 return JsonStoreNodeType.Value;
-            
+
             return JsonStoreNodeType.Undefined;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public JsonStoreValueType GetValueType(string expr)
@@ -178,18 +178,18 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             Stack<string> path;
             if (! ParsePathExpression(expr,out path))
                 return JsonStoreValueType.Undefined;
-            
+
             OSD result = ProcessPathExpression(ValueStore,path);
 
             if (result == null)
                 return JsonStoreValueType.Undefined;
-            
+
             if (result is OSDMap)
                 return JsonStoreValueType.Undefined;
-            
+
             if (result is OSDArray)
                 return JsonStoreValueType.Undefined;
-            
+
             if (result is OSDBoolean)
                 return JsonStoreValueType.Boolean;
 
@@ -204,10 +204,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             return JsonStoreValueType.Undefined;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public int ArrayLength(string expr)
@@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool GetValue(string expr, out string value, bool useJson)
@@ -241,23 +241,23 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             }
 
             OSD result = ProcessPathExpression(ValueStore,path);
-            return ConvertOutputValue(result,out value,useJson); 
+            return ConvertOutputValue(result,out value,useJson);
         }
-     
-                
+
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool RemoveValue(string expr)
         {
             return SetValueFromExpression(expr,null);
         }
-       
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool SetValue(string expr, string value, bool useJson)
@@ -272,7 +272,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 // There doesn't appear to be a good way to determine if the
                 // value is valid Json other than to let the parser crash
-                try 
+                try
                 {
                     ovalue = OSDParser.DeserializeJson(value);
                 }
@@ -292,13 +292,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 ovalue = new OSDString(value);
             }
-            
+
             return SetValueFromExpression(expr,ovalue);
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool TakeValue(string expr, bool useJson, TakeValueCallback cback)
@@ -315,7 +315,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 m_TakeStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
                 return false;
             }
-            
+
             string value = String.Empty;
             if (! ConvertOutputValue(result,out value,useJson))
             {
@@ -332,7 +332,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool ReadValue(string expr, bool useJson, TakeValueCallback cback)
@@ -349,7 +349,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 m_ReadStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
                 return false;
             }
-            
+
             string value = String.Empty;
             if (! ConvertOutputValue(result,out value,useJson))
             {
@@ -362,10 +362,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             return true;
         }
-     
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected bool SetValueFromExpression(string expr, OSD ovalue)
@@ -447,7 +447,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 Match match = hmatches[0];
                 GroupCollection groups = match.Groups;
                 string hkey = groups[1].Value;
-                
+
                 if (result is OSDMap)
                 {
                     // this is the assignment case
@@ -456,7 +456,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     {
                         StringSpace -= ComputeSizeOf(hmap[hkey]);
                         StringSpace += ComputeSizeOf(ovalue);
-                        
+
                         hmap[hkey] = ovalue;
                         InvokeNextCallback(pexpr + pkey);
                         return true;
@@ -483,13 +483,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected bool InvokeNextCallback(string pexpr)
         {
             // Process all of the reads that match the expression first
-            List<TakeValueCallbackClass> reads = 
+            List<TakeValueCallbackClass> reads =
                 m_ReadStore.FindAll(delegate(TakeValueCallbackClass tb) { return pexpr.StartsWith(tb.Path); });
 
             foreach (TakeValueCallbackClass readcb in reads)
@@ -501,7 +501,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             // Process one take next
             TakeValueCallbackClass takecb =
                 m_TakeStore.Find(delegate(TakeValueCallbackClass tb) { return pexpr.StartsWith(tb.Path); });
-                                                               
+
             if (takecb != null)
             {
                 m_TakeStore.Remove(takecb);
@@ -525,13 +525,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             // add front and rear separators
             expr = "." + expr + ".";
-            
+
             // add separators for quoted exprs and array references
             expr = m_ParsePassOne.Replace(expr,".$1.",-1,0);
-                
+
             // add quotes to bare identifier
             expr = m_ParsePassThree.Replace(expr,".{$1}",-1,0);
-                
+
             // remove extra separators
             expr = m_ParsePassFour.Replace(expr,".",-1,0);
 
@@ -550,7 +550,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param>path is a stack where the top level of the path is at the bottom of the stack</param>
         // -----------------------------------------------------------------
@@ -558,13 +558,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         {
             if (path.Count == 0)
                 return map;
-            
+
             string pkey = path.Pop();
 
             OSD rmap = ProcessPathExpression(map,path);
             if (rmap == null)
                 return null;
-            
+
             // ---------- Check for an array index ----------
             MatchCollection amatches = m_SimpleArrayPattern.Matches(pkey,0);
 
@@ -582,7 +582,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 GroupCollection groups = match.Groups;
                 string akey = groups[1].Value;
                 int aval = Convert.ToInt32(akey);
-                
+
                 if (aval < amap.Count)
                     return (OSD) amap[aval];
 
@@ -599,13 +599,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     m_log.WarnFormat("[JsonStore] wrong type for key {2}, expecting {0}, got {1}",OSDType.Map,rmap.Type,pkey);
                     return null;
                 }
-                
+
                 OSDMap hmap = rmap as OSDMap;
 
                 Match match = hmatches[0];
                 GroupCollection groups = match.Groups;
                 string hkey = groups[1].Value;
-                
+
                 if (hmap.ContainsKey(hkey))
                     return (OSD) hmap[hkey];
 
@@ -619,13 +619,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected static bool ConvertOutputValue(OSD result, out string value, bool useJson)
         {
             value = String.Empty;
-            
+
             // If we couldn't process the path
             if (result == null)
                 return false;
@@ -646,13 +646,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return true;
                 }
 
-                value = "'" + result.AsString() + "'"; 
+                value = "'" + result.AsString() + "'";
                 return true;
             }
 
             if (OSDBaseType(result.Type))
             {
-                value = result.AsString(); 
+                value = result.AsString();
                 return true;
             }
 
@@ -661,24 +661,24 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected static string PathExpressionToKey(Stack<string> path)
         {
             if (path.Count == 0)
                 return "";
-                
+
             string pkey = "";
             foreach (string k in path)
                 pkey = (pkey == "") ? k : (k + "." + pkey);
-            
+
             return pkey;
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected static bool OSDBaseType(OSDType type)
@@ -705,7 +705,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected static int ComputeSizeOf(OSD value)
@@ -731,7 +731,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         private Scene m_scene;
         private UUID m_objectID;
 
-        protected override OSD ValueStore 
+        protected override OSD ValueStore
         {
             get
             {
@@ -741,7 +741,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     // This is bad
                     return null;
                 }
-                
+
                 return sop.DynAttrs.TopLevelMap;
             }
 
@@ -761,5 +761,5 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             StringSpace = ComputeSizeOf(ValueStore);
         }
     }
-    
+
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
index d4b19dd..9bf9cb0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors 
+ * Copyright (c) Contributors
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void Initialise(IConfigSource config)
         {
-            try 
+            try
             {
                 if ((m_config = config.Configs["JsonStore"]) == null)
                 {
@@ -127,7 +127,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             if (m_enabled)
             {
                 m_scene = scene;
-                
+
             }
         }
 
@@ -143,7 +143,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// Called when all modules have been added for a region. This is 
+        /// Called when all modules have been added for a region. This is
         /// where we hook up events
         /// </summary>
         // -----------------------------------------------------------------
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 26044f0..ae8341f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors 
+ * Copyright (c) Contributors
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void Initialise(IConfigSource config)
         {
-            try 
+            try
             {
                 if ((m_config = config.Configs["JsonStore"]) == null)
                 {
@@ -159,7 +159,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// Called when all modules have been added for a region. This is 
+        /// Called when all modules have been added for a region. This is
         /// where we hook up events
         /// </summary>
         // -----------------------------------------------------------------
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 #region SceneEvents
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public void EventManagerOnObjectBeingRemovedFromScene(SceneObjectGroup obj)
@@ -196,10 +196,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
 #region ScriptInvocationInteface
 
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public JsonStoreStats GetStoreStats()
@@ -210,13 +210,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 stats.StoreCount = m_JsonValueStore.Count;
             }
-            
+
             return stats;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool AttachObjectStore(UUID objectID)
@@ -235,17 +235,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 if (m_JsonValueStore.ContainsKey(objectID))
                     return true;
-                
+
                 JsonStore map = new JsonObjectStore(m_scene,objectID);
                 m_JsonValueStore.Add(objectID,map);
             }
-            
+
             return true;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool CreateStore(string value, ref UUID result)
@@ -254,12 +254,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 result = UUID.Random();
 
             JsonStore map = null;
-            
+
             if (! m_enabled) return false;
-            
+
 
             try
-            { 
+            {
                 map = new JsonStore(value);
             }
             catch (Exception)
@@ -270,13 +270,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             lock (m_JsonValueStore)
                 m_JsonValueStore.Add(result,map);
-            
+
             return true;
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool DestroyStore(UUID storeID)
@@ -289,7 +289,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool TestStore(UUID storeID)
@@ -302,7 +302,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public JsonStoreNodeType GetNodeType(UUID storeID, string path)
@@ -318,7 +318,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return JsonStoreNodeType.Undefined;
                 }
             }
-            
+
             try
             {
                 lock (map)
@@ -334,7 +334,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public JsonStoreValueType GetValueType(UUID storeID, string path)
@@ -350,7 +350,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return JsonStoreValueType.Undefined;
                 }
             }
-            
+
             try
             {
                 lock (map)
@@ -366,7 +366,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool SetValue(UUID storeID, string path, string value, bool useJson)
@@ -382,7 +382,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return false;
                 }
             }
-            
+
             try
             {
                 lock (map)
@@ -393,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                                          storeID,map.StringSpace,m_maxStringSpace);
                         return false;
                     }
-                    
+
                     return map.SetValue(path,value,useJson);
                 }
             }
@@ -404,10 +404,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             return false;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool RemoveValue(UUID storeID, string path)
@@ -423,7 +423,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return false;
                 }
             }
-            
+
             try
             {
                 lock (map)
@@ -436,10 +436,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             return false;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public int GetArrayLength(UUID storeID, string path)
@@ -464,19 +464,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.Error("[JsonStore]: unable to retrieve value", e);
             }
-            
+
             return -1;
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public bool GetValue(UUID storeID, string path, bool useJson, out string value)
         {
             value = String.Empty;
-            
+
             if (! m_enabled) return false;
 
             JsonStore map = null;
@@ -497,13 +497,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.Error("[JsonStore]: unable to retrieve value", e);
             }
-            
+
             return false;
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback)
@@ -536,13 +536,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.Error("[JsonStore] unable to retrieve value", e);
             }
-            
+
             cback(String.Empty);
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         public void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback)
@@ -575,7 +575,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.Error("[JsonStore]: unable to retrieve value", e);
             }
-            
+
             cback(String.Empty);
         }
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 7a0370a..a9fdb66 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors 
+ * Copyright (c) Contributors
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void Initialise(IConfigSource config)
         {
-            try 
+            try
             {
                 if ((m_config = config.Configs["JsonStore"]) == null)
                 {
@@ -166,7 +166,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// Called when all modules have been added for a region. This is 
+        /// Called when all modules have been added for a region. This is
         /// where we hook up events
         /// </summary>
         // -----------------------------------------------------------------
@@ -251,7 +251,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 #region ScriptInvocationInteface
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -260,13 +260,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             UUID uuid = UUID.Zero;
             if (! m_store.AttachObjectStore(hostID))
                 GenerateRuntimeError("Failed to create Json store");
-            
+
             return hostID;
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -275,12 +275,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             UUID uuid = UUID.Zero;
             if (! m_store.CreateStore(value, ref uuid))
                 GenerateRuntimeError("Failed to create Json store");
-            
+
             lock (m_scriptStores)
             {
                 if (! m_scriptStores.ContainsKey(scriptID))
                     m_scriptStores[scriptID] = new HashSet<UUID>();
-                
+
                 m_scriptStores[scriptID].Add(uuid);
             }
             return uuid;
@@ -288,7 +288,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -305,7 +305,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -316,7 +316,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -330,7 +330,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -341,10 +341,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 o => DoJsonReadNotecard(reqID, hostID, scriptID, storeID, path, notecardIdentifier), null, "JsonStoreScriptModule.JsonReadNotecard");
             return reqID;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -358,7 +358,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -366,7 +366,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         {
             string ipath = ConvertList2Path(pathlist);
             string opath;
-            
+
             if (JsonStore.CanonicalPathExpression(ipath,out opath))
                 return opath;
 
@@ -375,10 +375,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             // the entire store
             return "**INVALID**";
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -389,7 +389,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -400,7 +400,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -417,7 +417,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -425,10 +425,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         {
             return m_store.RemoveValue(storeID,path) ? 1 : 0;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -436,10 +436,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         {
             return m_store.GetArrayLength(storeID,path);
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -457,10 +457,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             m_store.GetValue(storeID,path,true, out value);
             return value;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -480,10 +480,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 o => DoJsonTakeValue(scriptID,reqID,storeID,path,true), null, "JsonStoreScriptModule.DoJsonTakeValueJson");
             return reqID;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
@@ -503,12 +503,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 o => DoJsonReadValue(scriptID,reqID,storeID,path,true), null, "JsonStoreScriptModule.DoJsonReadValueJson");
             return reqID;
         }
-        
+
 #endregion
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected void GenerateRuntimeError(string msg)
@@ -516,10 +516,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             m_log.InfoFormat("[JsonStore] runtime error: {0}",msg);
             throw new Exception("JsonStore Runtime Error: " + msg);
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         protected void DispatchValue(UUID scriptID, UUID reqID, string value)
@@ -529,7 +529,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         private void DoJsonTakeValue(UUID scriptID, UUID reqID, UUID storeID, string path, bool useJson)
@@ -543,14 +543,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.InfoFormat("[JsonStoreScripts]: unable to retrieve value; {0}",e.ToString());
             }
-            
+
             DispatchValue(scriptID,reqID,String.Empty);
         }
 
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         private void DoJsonReadValue(UUID scriptID, UUID reqID, UUID storeID, string path, bool useJson)
@@ -564,13 +564,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             {
                 m_log.InfoFormat("[JsonStoreScripts]: unable to retrieve value; {0}",e.ToString());
             }
-            
+
             DispatchValue(scriptID,reqID,String.Empty);
         }
 
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         private void DoJsonReadNotecard(
@@ -580,7 +580,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             if (!UUID.TryParse(notecardIdentifier, out assetID))
             {
-                SceneObjectPart part = m_scene.GetSceneObjectPart(hostID);               
+                SceneObjectPart part = m_scene.GetSceneObjectPart(hostID);
                 assetID = ScriptUtils.GetAssetIdFromItemName(part, notecardIdentifier, (int)AssetType.Notecard);
             }
 
@@ -590,10 +590,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             if (a.Type != (sbyte)AssetType.Notecard)
                 GenerateRuntimeError(String.Format("Invalid notecard asset {0}", assetID));
-            
+
             m_log.DebugFormat("[JsonStoreScripts]: read notecard in context {0}",storeID);
 
-            try 
+            try
             {
                 string jsondata = SLUtil.ParseNotecardToString(a.Data);
                 int result = m_store.SetValue(storeID, path, jsondata,true) ? 1 : 0;
@@ -612,10 +612,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             GenerateRuntimeError(String.Format("Json parsing failed for {0}", assetID));
             m_comms.DispatchReply(scriptID, 0, "", reqID.ToString());
         }
-            
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         private void DoJsonWriteNotecard(UUID reqID, UUID hostID, UUID scriptID, UUID storeID, string path, string name)
@@ -626,9 +626,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 m_comms.DispatchReply(scriptID,0,UUID.Zero.ToString(),reqID.ToString());
                 return;
             }
-                
+
             SceneObjectPart host = m_scene.GetSceneObjectPart(hostID);
-            
+
             // Create new asset
             UUID assetID = UUID.Random();
             AssetBase asset = new AssetBase(assetID, name, (sbyte)AssetType.Notecard, host.OwnerID.ToString());
@@ -681,7 +681,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             for (int i = 0; i < pathlist.Length; i++)
             {
                 string token = "";
-                
+
                 if (pathlist[i] is string)
                 {
                     token = pathlist[i].ToString();
@@ -699,16 +699,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 {
                     token = "." + pathlist[i].ToString() + ".";
                 }
-                
+
                 path += token + ".";
             }
-            
+
             return path;
         }
-        
+
         // -----------------------------------------------------------------
         /// <summary>
-        /// 
+        ///
         /// </summary>
         // -----------------------------------------------------------------
         private void DoJsonRezObject(UUID hostID, UUID scriptID, UUID reqID, string name, Vector3 pos, Vector3 vel, Quaternion rot, string param)
@@ -801,7 +801,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
                 group.ScheduleGroupForFullUpdate();
 
-                // send the reply back to the host object, use the integer param to indicate the number 
+                // send the reply back to the host object, use the integer param to indicate the number
                 // of remaining objects
                 m_comms.DispatchReply(scriptID, objlist.Count-i-1, group.RootPart.UUID.ToString(), reqID.ToString());
             }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index 99a7076..77ee785 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Two' } }"); 
+            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Two' } }");
 
             {
                 string value = (string)InvokeOp("JsonGetValue", storeId, "Hello.World");
@@ -213,7 +213,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Two' } }"); 
+            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Two' } }");
 
             {
                 string value = (string)InvokeOp("JsonGetJson", storeId, "Hello.World");
@@ -246,11 +246,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            TestHelpers.InMethod();
 ////            TestHelpers.EnableLogging();
 //
-//            UUID storeId 
+//            UUID storeId
 //                = (UUID)m_smcm.InvokeOperation(
-//                    UUID.Zero, UUID.Zero, "JsonCreateStore", new object[] { "{ 'Hello' : 'World' }" }); 
+//                    UUID.Zero, UUID.Zero, "JsonCreateStore", new object[] { "{ 'Hello' : 'World' }" });
 //
-//            string value 
+//            string value
 //                = (string)m_smcm.InvokeOperation(
 //                    UUID.Zero, UUID.Zero, "JsonTakeValue", new object[] { storeId, "Hello" });
 //
@@ -271,7 +271,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test remove of node in object pointing to a string
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : 'World' }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : 'World' }");
 
                 int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello");
                 Assert.That(returnValue, Is.EqualTo(1));
@@ -285,7 +285,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test remove of node in object pointing to another object
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Wally' } }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'Wally' } }");
 
                 int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello");
                 Assert.That(returnValue, Is.EqualTo(1));
@@ -299,7 +299,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test remove of node in an array
             {
-                UUID storeId 
+                UUID storeId
                     = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : [ 'value1', 'value2' ] }");
 
                 int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello[0]");
@@ -320,7 +320,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test remove of non-existing value
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : 'World' }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : 'World' }");
 
                 int fakeValueRemove = (int)InvokeOp("JsonRemoveValue", storeId, "Cheese");
                 Assert.That(fakeValueRemove, Is.EqualTo(0));
@@ -340,7 +340,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            TestHelpers.InMethod();
 ////            TestHelpers.EnableLogging();
 //
-//            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'One' } }"); 
+//            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'One' } }");
 //
 //            {
 //                int result = (int)InvokeOp("JsonTestPath", storeId, "Hello.World");
@@ -372,7 +372,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            TestHelpers.InMethod();
 ////            TestHelpers.EnableLogging();
 //
-//            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'One' } }"); 
+//            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : 'One' } }");
 //
 //            {
 //                int result = (int)InvokeOp("JsonTestPathJson", storeId, "Hello.World");
@@ -437,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : [ 'one', 2 ] } }"); 
+            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello' : { 'World' : [ 'one', 2 ] } }");
 
             {
                 int result = (int)InvokeOp("JsonGetNodeType", storeId, ".");
@@ -509,7 +509,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            TestHelpers.EnableLogging();
 
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -520,7 +520,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing periods with delineation
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun.Circus}", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -533,7 +533,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced ] without delineation.  Expecting failure
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun]Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -544,7 +544,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced [ without delineation.  Expecting failure
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun[Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -555,7 +555,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced [] without delineation.  Expecting failure
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun[]Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -566,7 +566,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced ] with delineation
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun]Circus}", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -577,7 +577,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced [ with delineation
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun[Circus}", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -588,7 +588,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing empty balanced [] with delineation
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun[]Circus}", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -600,7 +600,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            // Commented out as this currently unexpectedly fails.
 //            // Test setting a key containing brackets around an integer with delineation
 //            {
-//                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+//                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 //
 //                int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun[0]Circus}", "Times");
 //                Assert.That(result, Is.EqualTo(1));
@@ -610,10 +610,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            }
 
             // *** Test {} ***
-           
+
             // Test setting a key containing unbalanced } without delineation.  Expecting failure (?)
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun}Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -624,7 +624,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced { without delineation.  Expecting failure (?)
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun{Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -636,7 +636,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 //            // Commented out as this currently unexpectedly fails.
 //            // Test setting a key containing unbalanced }
 //            {
-//                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+//                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 //
 //                int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun}Circus}", "Times");
 //                Assert.That(result, Is.EqualTo(0));
@@ -644,7 +644,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing unbalanced { with delineation
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun{Circus}", "Times");
                 Assert.That(result, Is.EqualTo(1));
@@ -655,7 +655,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting a key containing balanced {} with delineation.  This should fail.
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun{Filled}Circus}", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -666,7 +666,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting to location that does not exist.  This should fail.
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
 
                 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun.Circus", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -691,7 +691,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Single quoted token case
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
 
                 int result = (int)InvokeOp("JsonSetJson", storeId, "Fun", "'Times'");
                 Assert.That(result, Is.EqualTo(1));
@@ -702,7 +702,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Sub-tree case
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
 
                 int result = (int)InvokeOp("JsonSetJson", storeId, "Fun", "{ 'Filled' : 'Times' }");
                 Assert.That(result, Is.EqualTo(1));
@@ -713,7 +713,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // If setting single strings in JsonSetValueJson, these must be single quoted tokens, not bare strings.
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
 
                 int result = (int)InvokeOp("JsonSetJson", storeId, "Fun", "Times");
                 Assert.That(result, Is.EqualTo(0));
@@ -724,7 +724,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             // Test setting to location that does not exist.  This should fail.
             {
-                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }"); 
+                UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
 
                 int result = (int)InvokeOp("JsonSetJson", storeId, "Fun.Circus", "'Times'");
                 Assert.That(result, Is.EqualTo(0));
@@ -757,7 +757,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
             m_scene.AddSceneObject(so);
 
-            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }"); 
+            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }");
 
             {
                 string notecardName = "nc1";
@@ -820,14 +820,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
             m_scene.AddSceneObject(so);
 
-            UUID creatingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }"); 
+            UUID creatingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }");
 
             // Write notecard
             InvokeOpOnHost("JsonWriteNotecard", so.UUID, creatingStoreId, "", notecardName);
 
             {
                 // Read notecard
-                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}");
                 UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "", notecardName);
                 Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
 
@@ -837,10 +837,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             {
                 // Read notecard to new single component path
-                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}");
                 UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "make", notecardName);
                 Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
-            
+
                 string value = (string)InvokeOp("JsonGetValue", receivingStoreId, "Hello");
                 Assert.That(value, Is.EqualTo(""));
 
@@ -850,7 +850,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             {
                 // Read notecard to new multi-component path.  This should not work.
-                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}"); 
+                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{}");
                 UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "make.it", notecardName);
                 Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
 
@@ -863,7 +863,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             {
                 // Read notecard to existing multi-component path.  This should work
-                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'make' : { 'it' : 'so' } }"); 
+                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'make' : { 'it' : 'so' } }");
                 UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "make.it", notecardName);
                 Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
 
@@ -876,7 +876,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
             {
                 // Read notecard to invalid path.  This should not work.
-                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'make' : { 'it' : 'so' } }"); 
+                UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'make' : { 'it' : 'so' } }");
                 UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "/", notecardName);
                 Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs
index 1993948..2368a23 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// Describes where on the avatar the attachment is located
         /// </value>
         int Location { get ; }
-        
+
         //// <value>
         /// Accessor to the rez'ed asset, representing the attachment
         /// </value>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
index a8e545c..d61f52a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
 using OpenMetaverse.Assets;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{    
+{
     /// <summary>
     /// This implements the methods needed to operate on individual inventory items.
     /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index e189489..dc2edd9 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -60,19 +60,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// <summary>
         /// Returns whether or not this object is still in the world.
         /// Eg, if you store an IObject reference, however the object
-        /// is deleted before you use it, it will throw a NullReference 
+        /// is deleted before you use it, it will throw a NullReference
         /// exception. 'Exists' allows you to check the object is still
         /// in play before utilizing it.
         /// </summary>
         /// <example>
         /// IObject deleteMe = World.Objects[0];
-        /// 
+        ///
         /// if (deleteMe.Exists) {
         ///     deleteMe.Say("Hello, I still exist!");
         /// }
-        /// 
+        ///
         /// World.Objects.Remove(deleteMe);
-        /// 
+        ///
         /// if (!deleteMe.Exists) {
         ///     Host.Console.Info("I was deleted");
         /// }
@@ -81,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// Objects should be near-guarunteed to exist for any event which
         /// passes them as an argument. Storing an object for a longer period
         /// of time however will limit their reliability.
-        /// 
+        ///
         /// It is a good practice to use Try/Catch blocks handling for
         /// NullReferenceException, when accessing remote objects.
         /// </remarks>
@@ -118,8 +118,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         IObject[] Children { get; }
 
         /// <summary>
-        /// Returns a list of materials attached to this object. Each may contain unique texture 
-        /// and other visual information. For primitive based objects, this correlates with 
+        /// Returns a list of materials attached to this object. Each may contain unique texture
+        /// and other visual information. For primitive based objects, this correlates with
         /// Object Faces. For mesh based objects, this correlates with Materials.
         /// </summary>
         IObjectMaterial[] Materials { get; }
@@ -152,7 +152,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         String TouchText { get; set; }
 
         /// <summary>
-        /// Text to be associated with this object, in the 
+        /// Text to be associated with this object, in the
         /// Second Life(r) viewer, this is shown above the
         /// object.
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
index bf85cbc..bec8f38 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     {
         TaskInventoryItem m_privateItem;
         Scene m_rootScene;
-        
+
         public InventoryItem(Scene rootScene, TaskInventoryItem internalItem)
         {
             m_rootScene = rootScene;
@@ -77,10 +77,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 throw new ApplicationException("[MRM] There is no legal conversion from IInventoryItem to InventoryItem");
             }
         }
-            
+
         public int Type { get { return m_privateItem.Type; } }
         public UUID AssetID { get { return m_privateItem.AssetID; } }
-        
+
         // This method exposes OpenSim/OpenMetaverse internals and needs to be replaced with a IAsset specific to MRM.
         public T RetrieveAsset<T>() where T : OpenMetaverse.Assets.Asset, new()
         {
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
             if ((sbyte)result.AssetType != a.Type)
                 throw new ApplicationException("[MRM] The supplied asset class does not match the found asset");
-            
+
             result.AssetData = a.Data;
             result.Decode();
             return result;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
index 73fe8b8..5861486 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public class MicroScheduler : System.MarshalByRefObject, IMicrothreader 
+    public class MicroScheduler : System.MarshalByRefObject, IMicrothreader
     {
         private readonly List<IEnumerator> m_threads = new List<IEnumerator>();
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 47b9c09..5513cd5 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get { return GetSOP().Description; }
             set
             {
-                if (CanEdit()) 
+                if (CanEdit())
                     GetSOP().Description = value;
             }
         }
@@ -192,7 +192,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 rets = new IObject[total];
 
                 int i = 0;
-                    
+
                 foreach (SceneObjectPart part in my.ParentGroup.Parts)
                 {
                     rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security);
@@ -273,8 +273,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public Vector3 SitTarget
         {
             get { return GetSOP().SitTargetPosition; }
-            set 
-            { 
+            set
+            {
                 if (CanEdit())
                 {
                     GetSOP().SitTargetPosition = value;
@@ -285,8 +285,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public string SitTargetText
         {
             get { return GetSOP().SitName; }
-            set 
-            { 
+            set
+            {
                 if (CanEdit())
                 {
                     GetSOP().SitName = value;
@@ -297,7 +297,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public string TouchText
         {
             get { return GetSOP().TouchName; }
-            set 
+            set
             {
                 if (CanEdit())
                 {
@@ -309,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public string Text
         {
             get { return GetSOP().Text; }
-            set 
+            set
             {
                 if (CanEdit())
                 {
@@ -382,11 +382,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get { return this; }
         }
 
-        public IObjectInventory Inventory 
+        public IObjectInventory Inventory
         {
             get { return new SOPObjectInventory(m_rootScene, GetSOP().TaskInventory); }
         }
-        
+
         #region Public Functions
 
         public void Say(string msg)
@@ -406,7 +406,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             SceneObjectPart sop = GetSOP();
             m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false);
         }
-         
+
         public void Dialog(UUID avatar, string message, string[] buttons, int chat_channel)
         {
             if (!CanEdit())
@@ -445,9 +445,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             dm.SendDialogToUser(
                 avatar, GetSOP().Name, GetSOP().UUID, GetSOP().OwnerID,
                 message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buttons);
-            
+
         }
-        
+
         #endregion
 
 
@@ -540,7 +540,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                     if (hasCut) ret += 2;
                     if (hasDimple) ret += 2;
                     if (hasHollow)
-                        ret += 1; // GOTCHA: LSL shows 2 additional sides here. 
+                        ret += 1; // GOTCHA: LSL shows 2 additional sides here.
                                   // This has been fixed, but may cause porting issues.
                     break;
                 case (int) PrimType.Torus:
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs
index d20f4a4..8c3158c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs
@@ -61,25 +61,25 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
                 if (!m_publicInventory.ContainsKey(privateItem.ItemID))
                        m_publicInventory.Add(privateItem.ItemID, new InventoryItem(m_rootScene, privateItem));
         }
-        
+
         #region IDictionary<UUID, IInventoryItem> implementation
         public void Add (UUID key, IInventoryItem value)
         {
             m_publicInventory.Add(key, value);
             m_privateInventory.Add(key, InventoryItem.FromInterface(value).ToTaskInventoryItem());
         }
-        
+
         public bool ContainsKey (UUID key)
         {
             return m_privateInventory.ContainsKey(key);
         }
-        
+
         public bool Remove (UUID key)
         {
             m_publicInventory.Remove(key);
             return m_privateInventory.Remove(key);
         }
-        
+
         public bool TryGetValue (UUID key, out IInventoryItem value)
         {
             value = null;
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
             {
                 // wasn't found in the public inventory
                 TaskInventoryItem privateItem;
-            
+
                 result = m_privateInventory.TryGetValue(key, out privateItem);
                 if (result)
                 {
@@ -98,16 +98,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
                 }
             } else
                 return true;
-            
+
             return result;
         }
-        
+
         public ICollection<UUID> Keys {
             get {
                 return m_privateInventory.Keys;
             }
         }
-        
+
         public ICollection<IInventoryItem> Values {
             get {
                 SynchronizeDictionaries();
@@ -139,41 +139,41 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
         {
             Add(item.Key, item.Value);
         }
-        
+
         public void Clear ()
         {
             m_publicInventory.Clear();
             m_privateInventory.Clear();
         }
-        
+
         public bool Contains (KeyValuePair<UUID, IInventoryItem> item)
         {
             return m_privateInventory.ContainsKey(item.Key);
         }
-        
+
         public void CopyTo (KeyValuePair<UUID, IInventoryItem>[] array, int arrayIndex)
         {
             throw new NotImplementedException();
         }
-        
+
         public bool Remove (KeyValuePair<UUID, IInventoryItem> item)
         {
             return Remove(item.Key);
         }
-        
+
         public int Count {
             get {
                 return m_privateInventory.Count;
             }
         }
-        
+
         public bool IsReadOnly {
             get {
                 return false;
             }
         }
         #endregion
-        
+
         #region Explicit implementations
         IInventoryItem System.Collections.Generic.IDictionary<UUID, IInventoryItem>.this[UUID key]
         {
@@ -189,13 +189,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
                 m_privateInventory[key] = InventoryItem.FromInterface(value).ToTaskInventoryItem();
             }
         }
-                
+
         void System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<UUID, IInventoryItem>>.CopyTo(System.Collections.Generic.KeyValuePair<UUID,IInventoryItem>[] array, int offset)
         {
             throw new NotImplementedException();
         }
         #endregion
-        
+
         public IInventoryItem this[string name]
         {
             get {
@@ -204,7 +204,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
                     {
                         if (!m_publicInventory.ContainsKey(i.ItemID))
                             m_publicInventory.Add(i.ItemID, new InventoryItem(m_rootScene, i));
-                    
+
                         return m_publicInventory[i.ItemID];
                     }
                 throw new KeyNotFoundException();
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index d192309..a380f66 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -70,18 +70,18 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get { return GetSP().AbsolutePosition; }
             set { GetSP().Teleport(value); }
         }
-        
+
         public bool IsChildAgent
         {
             get { return GetSP().IsChildAgent; }
         }
-        
+
         #region IAvatar implementation
         public IAvatarAttachment[] Attachments
         {
             get {
                 List<IAvatarAttachment> attachments = new List<IAvatarAttachment>();
-                
+
                 List<AvatarAttachment> internalAttachments = GetSP().Appearance.GetAttachments();
                 foreach (AvatarAttachment attach in internalAttachments)
                 {
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                                                            new UUID(attach.ItemID),
                                                            new UUID(attach.AssetID), m_security));
                 }
-                
+
                 return attachments.ToArray();
             }
         }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
index 570459a..bcf6053 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         private readonly UUID m_assetId;
 
         private readonly ISecurityCredential m_security;
-        
+
         public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId, ISecurityCredential security)
         {
             m_rootScene = rootScene;
@@ -51,9 +51,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             //m_itemId = itemId;
             m_assetId = assetId;
         }
-        
+
         public int Location { get { return m_location; } }
-        
+
         public IObject Asset
         {
             get
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs
index 13d0140..724c2a9 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim
 
         public void Microthread(IEnumerable thread)
         {
-            
+
         }
 
         public void RunMicrothread()
@@ -92,7 +92,7 @@ namespace OpenSim
 
         public override void Stop()
         {
-            
+
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index f2324d2..36f70d0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.WorldX;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public class World : System.MarshalByRefObject, IWorld, IWorldAudio 
+    public class World : System.MarshalByRefObject, IWorld, IWorldAudio
     {
         private readonly Scene m_internalScene;
         private readonly ISecurityCredential m_security;
@@ -149,7 +149,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security);
                 e.Text = chat.Message;
                 e.Channel = chat.Channel;
-                
+
                 _OnChat(this, e);
                 return;
             }
@@ -160,7 +160,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security);
                 e.Text = chat.Message;
                 e.Channel = chat.Channel;
-                
+
                 _OnChat(this, e);
                 return;
             }
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index 1725eb4..a1dd711 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionReadyModule")]
     public class RegionReadyModule : IRegionReadyModule, INonSharedRegionModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IConfig m_config = null;
@@ -57,24 +57,24 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
         private bool m_enabled = false;
         private bool m_disable_logins;
         private string m_uri = string.Empty;
-        
+
         Scene m_scene;
-        
+
         #region INonSharedRegionModule interface
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
-            
+
         public void Initialise(IConfigSource config)
         {
             m_config = config.Configs["RegionReady"];
-            if (m_config != null) 
+            if (m_config != null)
             {
                 m_enabled = m_config.GetBoolean("enabled", false);
-                
-                if (m_enabled) 
+
+                if (m_enabled)
                 {
                     m_channelNotify = m_config.GetInt("channel_notify", m_channelNotify);
                     m_disable_logins = m_config.GetBoolean("login_disable", false);
@@ -106,7 +106,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
 
                 // This should always show up to the user but should not trigger warn/errors as these messages are
-                // expected and are not simulator problems.  Ideally, there would be a status level in log4net but 
+                // expected and are not simulator problems.  Ideally, there would be a status level in log4net but
                 // failing that, we will print out to console instead.
                 MainConsole.Instance.OutputFormat("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
 
@@ -152,12 +152,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
         {
             m_log.DebugFormat("[RegionReady]: Script compile queue empty!");
 
-            if (m_firstEmptyCompileQueue || m_oarFileLoading) 
+            if (m_firstEmptyCompileQueue || m_oarFileLoading)
             {
                 OSChatMessage c = new OSChatMessage();
-                if (m_firstEmptyCompileQueue) 
+                if (m_firstEmptyCompileQueue)
                     c.Message = "server_startup,";
-                else 
+                else
                     c.Message = "oar_file_load,";
                 m_firstEmptyCompileQueue = false;
                 m_oarFileLoading = false;
@@ -165,7 +165,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.Backup(false);
 
                 c.From = "RegionReady";
-                if (m_lastOarLoadedOk) 
+                if (m_lastOarLoadedOk)
                     c.Message += "1,";
                 else
                     c.Message += "0,";
@@ -193,7 +193,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
         {
             m_oarFileLoading = true;
 
-            if (message==String.Empty) 
+            if (message==String.Empty)
             {
                 m_lastOarLoadedOk = true;
             }
@@ -226,7 +226,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 //                 m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
 
                 // Putting this out to console to make it eye-catching for people who are running OpenSimulator
-                // without info log messages enabled.  Making this a warning is arguably misleading since it isn't a 
+                // without info log messages enabled.  Making this a warning is arguably misleading since it isn't a
                 // warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
                 // Arguably, log4net needs a status log level (like Apache).
                 MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
@@ -256,7 +256,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
 //                m_scene.EventManager.OnRezScript  += OnRezScript;
 //                m_oarFileLoading = true;
 //                m_firstEmptyCompileQueue = true;
-//                
+//
 //                m_scene.LoginsDisabled = true;
 //                m_scene.LoginLock = true;
 //                if ( m_uri != string.Empty )
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
index 4b7295d..bf33996 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
     public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Dictionary<UUID, UUID> m_Channels =
                 new Dictionary<UUID, UUID>();
 
@@ -94,7 +94,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
             {
                 scriptEngine.OnScriptRemoved += this.ScriptRemoved;
                 scriptEngine.OnObjectRemoved += this.ObjectRemoved;
-          
+
             }
         }
 
@@ -131,7 +131,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
             if (!m_Enabled)
                 return;
 
-            m_log.InfoFormat("[XMLRPC GRID ROUTER]: New receiver Obj: {0} Ch: {1} ID: {2} URI: {3}", 
+            m_log.InfoFormat("[XMLRPC GRID ROUTER]: New receiver Obj: {0} Ch: {1} ID: {2} URI: {3}",
                                 objectID.ToString(), channel.ToString(), itemID.ToString(), uri);
 
             XmlRpcInfo info = new XmlRpcInfo();
diff --git a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
index 78c870a..8654896 100644
--- a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Freeswitch
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Freeswitch
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
index 3f36e32..d3b97b1 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.UserStatistics
                         udata.fps = Convert.ToSingle(sdr["simfps"]);
                         clidata.Add(udata);
                         totalclients += udata.count;
-                        
+
                     }
                 }
                 sdr.Close();
@@ -126,9 +126,9 @@ namespace OpenSim.Region.UserStatistics
                     sql =
                         "select region_id, client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by region_id, client_version order by region_id, count(*) desc;";
                     cmd = new SqliteCommand(sql, dbConn);
-                    
+
                     sdr = cmd.ExecuteReader();
-                    
+
                     if (sdr.HasRows)
                     {
                         while (sdr.Read())
@@ -145,10 +145,10 @@ namespace OpenSim.Region.UserStatistics
                     cmd.Dispose();
                 }
             }
-            
+
             foreach (ClientVersionData cvd in cliRegData)
             {
-                
+
                 if (regionTotals.ContainsKey(cvd.region_id))
                 {
                     int regiontotal = (int)regionTotals[cvd.region_id];
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
index 8745acd..fcc7cee 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.UserStatistics
             Hashtable nh = new Hashtable();
             nh.Add("hdata", mData);
             nh.Add("Reports", pParams["Reports"]);
-            
+
             return nh;
         }
 
@@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics
         public string rep_Default_report_view(stats_default_page_values values)
         {
 
-            
+
             StringBuilder output = new StringBuilder();
 
 
@@ -105,7 +105,7 @@ TD.align_top { vertical-align: top; }
 </STYLE>
 ";
             HTMLUtil.HtmlHeaders_O(ref output);
-            
+
             HTMLUtil.InsertProtoTypeAJAX(ref output);
             string[] ajaxUpdaterDivs = new string[3];
             int[] ajaxUpdaterSeconds = new int[3];
@@ -124,7 +124,7 @@ TD.align_top { vertical-align: top; }
             ajaxUpdaterReportFragments[2] = "activelogajax.html";
 
             HTMLUtil.InsertPeriodicUpdaters(ref output, ajaxUpdaterDivs, ajaxUpdaterSeconds, ajaxUpdaterReportFragments);
-            
+
             output.Append(STYLESHEET);
             HTMLUtil.HtmlHeaders_C(ref output);
             HTMLUtil.AddReportLinks(ref output, values.stats_reports, "");
@@ -200,7 +200,7 @@ TD.align_top { vertical-align: top; }
             return output.ToString();
         }
 
-       
+
 
         public stats_default_page_values rep_DefaultReport_data(SqliteConnection db, List<Scene> m_scene)
         {
@@ -208,8 +208,8 @@ TD.align_top { vertical-align: top; }
             returnstruct.all_scenes = m_scene.ToArray();
             lock (db)
             {
-                string SQL = @"SELECT COUNT(DISTINCT agent_id) as agents, COUNT(*) as sessions, AVG(avg_fps) as client_fps, 
-                                AVG(avg_sim_fps) as savg_sim_fps, AVG(avg_ping) as sav_ping, SUM(n_out_kb) as num_in_kb, 
+                string SQL = @"SELECT COUNT(DISTINCT agent_id) as agents, COUNT(*) as sessions, AVG(avg_fps) as client_fps,
+                                AVG(avg_sim_fps) as savg_sim_fps, AVG(avg_ping) as sav_ping, SUM(n_out_kb) as num_in_kb,
                                 SUM(n_out_pk) as num_in_packets, SUM(n_in_kb) as num_out_kb, SUM(n_in_pk) as num_out_packets, AVG(mem_use) as sav_mem_use
                                 FROM stats_session_data;";
                 SqliteCommand cmd = new SqliteCommand(SQL, db);
@@ -230,7 +230,7 @@ TD.align_top { vertical-align: top; }
                 sdr.Close();
                 cmd.Dispose();
             }
-            
+
             return returnstruct;
         }
 
@@ -276,5 +276,5 @@ TD.align_top { vertical-align: top; }
         public Dictionary<UUID, USimStatsData> sim_stat_data;
         public Dictionary<string, IStatsController> stats_reports;
     }
- 
+
 }
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
index c07619f..20e045a 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.UserStatistics
         {
             o.Append("</table>\n");
         }
-        
+
         public static void BLOCKQUOTE_O(ref StringBuilder o, string pclass)
         {
             o.Append("<blockquote");
@@ -199,7 +199,7 @@ namespace OpenSim.Region.UserStatistics
 ");
             for (int i = 0; i < divID.Length; i++)
             {
-            
+
                 o.Append("new updater('");
                 o.Append(divID[i]);
                 o.Append("', ");
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
index 4d45b80..3e0f45e 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.UserStatistics
         public string RenderView(Hashtable pModelResult)
         {
             StringBuilder output = new StringBuilder();
-            
+
             HTMLUtil.HR(ref output, "");
             output.Append("<H3>ActiveLog</H3>\n");
 
@@ -102,13 +102,13 @@ namespace OpenSim.Region.UserStatistics
                     }
                 }
                 StringBuilder replaceStr = new StringBuilder();
-                //string titlecolorresults = 
-                
+                //string titlecolorresults =
+
                 string formatresult = Regex.Replace(TitleColor.Replace(result[i], "$1"), "[^ABCDEFabcdef0-9]", "");
                 if (formatresult.Length > 6)
                 {
                     formatresult = formatresult.Substring(0, 6);
-                   
+
                 }
                 for (int j = formatresult.Length; j <= 5; j++)
                     formatresult += "0";
@@ -116,12 +116,12 @@ namespace OpenSim.Region.UserStatistics
                 replaceStr.Append(formatresult);
                 replaceStr.Append("\">$3</font>] $4<br />");
                 string repstr = replaceStr.ToString();
-                
+
                 output.Append(formatopen);
                 output.Append(webFormat.Replace(result[i], repstr));
                 output.Append(formatclose);
             }
-                
+
 
             return output.ToString();
         }
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
index 6f8b2aa..63dc87e 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.UserStatistics
             jsFileName = "prototype.js";
         }
 
-        public Prototype_distributor(string jsName) 
+        public Prototype_distributor(string jsName)
         {
             jsFileName = jsName;
         }
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
index 74e9c66..8d5434f 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.UserStatistics
             SqliteConnection dbConn = (SqliteConnection)pParams["DatabaseConnection"];
             List<SessionList> lstSessions = new List<SessionList>();
             Hashtable requestvars = (Hashtable) pParams["RequestVars"];
-            
+
 
             string puserUUID = string.Empty;
             string clientVersionString = string.Empty;
@@ -113,7 +113,7 @@ namespace OpenSim.Region.UserStatistics
                     cmd.Parameters.Add(new SqliteParameter(":client_version", clientVersionString));
 
                 SqliteDataReader sdr = cmd.ExecuteReader();
-                
+
                 if (sdr.HasRows)
                 {
                     UUID userUUID = UUID.Zero;
@@ -134,7 +134,7 @@ namespace OpenSim.Region.UserStatistics
                         }
 
                         ShortSessionData ssd = new ShortSessionData();
-                        
+
                         ssd.last_update = Utils.UnixTimeToDateTime((uint)Convert.ToInt32(sdr["last_updated"]));
                         ssd.start_time = Utils.UnixTimeToDateTime((uint)Convert.ToInt32(sdr["start_time"]));
                         ssd.session_id = UUID.Parse(sdr["session_id"].ToString());
@@ -145,7 +145,7 @@ namespace OpenSim.Region.UserStatistics
                     }
                 }
                 sdr.Close();
-                cmd.Dispose();               
+                cmd.Dispose();
             }
             modeldata["SessionData"] = lstSessions;
             return modeldata;
@@ -248,7 +248,7 @@ TD.align_top { vertical-align: top; }
                     output.Append(sesdata.client_version);
                     HTMLUtil.TD_C(ref output);
                     HTMLUtil.TR_C(ref output);
-                    
+
                 }
                 HTMLUtil.TR_O(ref output, "");
                 HTMLUtil.TD_O(ref output, "align_top", 1, 5);
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
index 06d9e91..513686d 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.UserStatistics
         public Hashtable ProcessModel(Hashtable pParams)
         {
             List<Scene> m_scene = (List<Scene>)pParams["Scenes"];
-            
+
             Hashtable nh = new Hashtable();
             nh.Add("hdata", m_scene);
             nh.Add("simstats", pParams["SimStats"]);
@@ -207,9 +207,9 @@ namespace OpenSim.Region.UserStatistics
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TR_C(ref output);
                 HTMLUtil.TABLE_C(ref output);
-                
+
             }
-            
+
             return output.ToString();
         }
 
@@ -218,7 +218,7 @@ namespace OpenSim.Region.UserStatistics
         /// <pre>
         /// {"REGIONNAME": {
         ///     "region": "REGIONNAME",
-        ///     "timeDilation": "101", 
+        ///     "timeDilation": "101",
         ///     ...     // the rest of the stat info
         ///     },
         ///  ...    // entries for each region
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index bd5289f..c15b194 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.UserStatistics
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static SqliteConnection dbConn;
 
         /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Region.UserStatistics
 
         private List<Scene> m_scenes = new List<Scene>();
         private Dictionary<string, IStatsController> reports = new Dictionary<string, IStatsController>();
-        private Dictionary<UUID, USimStatsData> m_simstatsCounters = new Dictionary<UUID, USimStatsData>(); 
+        private Dictionary<UUID, USimStatsData> m_simstatsCounters = new Dictionary<UUID, USimStatsData>();
         private const int updateStatsMod = 6;
         private int updateLogMod = 1;
         private volatile int updateLogCounter = 0;
@@ -217,7 +217,7 @@ namespace OpenSim.Region.UserStatistics
                     {
                         m_loglines = readLogLines(10);
 
-                        if (updateLogCounter > 10000) 
+                        if (updateLogCounter > 10000)
                             updateLogCounter = 1;
                     }
 
@@ -228,12 +228,12 @@ namespace OpenSim.Region.UserStatistics
                         ss.ConsumeSimStats(stats);
                     }
                 }
-            } 
+            }
             catch (KeyNotFoundException)
             {
             }
         }
-        
+
         private Hashtable HandleUnknownCAPSRequest(Hashtable request)
         {
             //string regpath = request["uri"].ToString();
@@ -257,7 +257,7 @@ namespace OpenSim.Region.UserStatistics
             int response_code = 404;
             string contenttype = "text/html";
             bool jsonFormatOutput = false;
-            
+
             string strOut = string.Empty;
 
             // The request patch should be "/SStats/reportName" where 'reportName'
@@ -288,15 +288,15 @@ namespace OpenSim.Region.UserStatistics
                 repParams["SimStats"] = m_simstatsCounters;
                 repParams["LogLines"] = m_loglines;
                 repParams["Reports"] = reports;
-                
+
                 concurrencyCounter++;
 
-                if (jsonFormatOutput) 
+                if (jsonFormatOutput)
                 {
                     strOut = rep.RenderJson(rep.ProcessModel(repParams));
                     contenttype = "text/json";
                 }
-                else 
+                else
                 {
                     strOut = rep.RenderView(rep.ProcessModel(repParams));
                 }
@@ -312,7 +312,7 @@ namespace OpenSim.Region.UserStatistics
                 }
 
                 concurrencyCounter--;
-                
+
                 response_code = 200;
             }
             else
@@ -463,7 +463,7 @@ namespace OpenSim.Region.UserStatistics
                                       UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat("[WEB STATS MODULE]: Received viewer starts report from {0}", agentID);
- 
+
             UpdateUserStats(ParseViewerStats(request, agentID), dbConn);
 
             return String.Empty;
@@ -525,7 +525,7 @@ namespace OpenSim.Region.UserStatistics
                     }
                 }
             }
-           
+
             usd = uid.session_data;
 
             if (message.Type != OSDType.Map)
@@ -747,16 +747,16 @@ namespace OpenSim.Region.UserStatistics
             );";
 
         private const string SQL_STATS_TABLE_INSERT = @"INSERT OR REPLACE INTO stats_session_data (
-session_id, agent_id, region_id, last_updated, remote_ip, name_f, name_l, avg_agents_in_view, min_agents_in_view, max_agents_in_view, 
-mode_agents_in_view, avg_fps, min_fps, max_fps, mode_fps, a_language, mem_use, meters_traveled, avg_ping, min_ping, max_ping, mode_ping, 
+session_id, agent_id, region_id, last_updated, remote_ip, name_f, name_l, avg_agents_in_view, min_agents_in_view, max_agents_in_view,
+mode_agents_in_view, avg_fps, min_fps, max_fps, mode_fps, a_language, mem_use, meters_traveled, avg_ping, min_ping, max_ping, mode_ping,
 regions_visited, run_time, avg_sim_fps, min_sim_fps, max_sim_fps, mode_sim_fps, start_time, client_version, s_cpu, s_gpu, s_os, s_ram,
 d_object_kb, d_texture_kb, d_world_kb, n_in_kb, n_in_pk, n_out_kb, n_out_pk, f_dropped, f_failed_resends, f_invalid, f_off_circuit,
 f_resent, f_send_packet
 )
 VALUES
 (
-:session_id, :agent_id, :region_id, :last_updated, :remote_ip, :name_f, :name_l, :avg_agents_in_view, :min_agents_in_view, :max_agents_in_view, 
-:mode_agents_in_view, :avg_fps, :min_fps, :max_fps, :mode_fps, :a_language, :mem_use, :meters_traveled, :avg_ping, :min_ping, :max_ping, :mode_ping, 
+:session_id, :agent_id, :region_id, :last_updated, :remote_ip, :name_f, :name_l, :avg_agents_in_view, :min_agents_in_view, :max_agents_in_view,
+:mode_agents_in_view, :avg_fps, :min_fps, :max_fps, :mode_fps, :a_language, :mem_use, :meters_traveled, :avg_ping, :min_ping, :max_ping, :mode_ping,
 :regions_visited, :run_time, :avg_sim_fps, :min_sim_fps, :max_sim_fps, :mode_sim_fps, :start_time, :client_version, :s_cpu, :s_gpu, :s_os, :s_ram,
 :d_object_kb, :d_texture_kb, :d_world_kb, :n_in_kb, :n_in_pk, :n_out_kb, :n_out_pk, :f_dropped, :f_failed_resends, :f_invalid, :f_off_circuit,
 :f_resent, :f_send_packet
@@ -980,7 +980,7 @@ VALUES
 
             if ((srtArr[srtArr.Length - 1]) == 0 || (srtArr[srtArr.Length - 1]) == 1)
                 return 0;
-           
+
             float freqtest = (float)freq.Length / freq.Rank;
 
             for (i = 0; i < freqtest; i++)
@@ -1116,7 +1116,7 @@ VALUES
         public List<float> _sim_fps;
         public List<int> _agents_in_view;
     }
-  
+
     #endregion
 
     public class USimStatsData
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
index 770b1f2..54f3ab6 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
                 {
                     foreach (SceneObjectGroup sog in attachs)
                     {
-                        m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", 
+                        m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}",
                             sog.Name, sp.Name, m_scene.RegionInfo.RegionName);
 
                         m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog);
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index 709a16d..9833086 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
 
                     if (loc == null)
                         continue;
-                    
+
                     loc[d.Title] = OSD.FromString(d.Title);
                 }
             }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
 
                     if (loc == null)
                         continue;
-                    
+
                     loc[d.Title] = OSD.FromString(d.Title);
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
index e0537a4..8ed0bb3 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         private static List<String> m_lastNames = new List<String>();
         private static List<String> m_fullNames = new List<String>();
 
-        public void Initialise(IConfigSource config) 
+        public void Initialise(IConfigSource config)
         {
             IConfig moduleConfig = config.Configs["GodNames"];
 
@@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
                 fnames.Add(name);
             }
             ((OSDMap)namesmap)["full_names"] = fnames;
-            
+
             OSDArray lnames = new OSDArray();
             foreach (string name in m_lastNames) {
                 lnames.Add(name);
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
index 1ae18dd..2c2042d 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -49,7 +49,7 @@ using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
 
 namespace OpenSim.Region.OptionalModules.ViewerSupport
 {
-    public class SimulatorFeaturesHelper 
+    public class SimulatorFeaturesHelper
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index ceb3332..79b80f8 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -63,28 +63,28 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
     /// If specified in Regions.ini, the settings should be within the region's section name.
     /// If specified in OpenSim.ini, the settings should be within the [AutoBackupModule] section.
     /// Region-specific settings take precedence.
-    /// 
+    ///
     /// AutoBackupModuleEnabled: True/False. Default: False. If True, use the auto backup module. This setting does not support per-region basis.
     ///     All other settings under [AutoBackupModule] are ignored if AutoBackupModuleEnabled is false, even per-region settings!
-    /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality. 
-    ///         This is the only required option for enabling auto-backup; the other options have sane defaults. 
+    /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality.
+    ///         This is the only required option for enabling auto-backup; the other options have sane defaults.
     ///         If False for a particular region, the auto-backup module becomes a no-op for the region, and all other AutoBackup* settings are ignored.
     ///         If False globally (the default), only regions that specifically override it in Regions.ini will get AutoBackup functionality.
-    /// AutoBackupInterval: Double, non-negative value. Default: 720 (12 hours). 
-    ///         The number of minutes between each backup attempt. 
+    /// AutoBackupInterval: Double, non-negative value. Default: 720 (12 hours).
+    ///         The number of minutes between each backup attempt.
     ///         If a negative or zero value is given, it is equivalent to setting AutoBackup = False.
-    /// AutoBackupBusyCheck: True/False. Default: True. 
-    ///         If True, we will only take an auto-backup if a set of conditions are met. 
+    /// AutoBackupBusyCheck: True/False. Default: True.
+    ///         If True, we will only take an auto-backup if a set of conditions are met.
     ///         These conditions are heuristics to try and avoid taking a backup when the sim is busy.
     /// AutoBackupSkipAssets
     ///     If true, assets are not saved to the oar file. Considerably reduces impact on simulator when backing up. Intended for when assets db is backed up separately
     /// AutoBackupKeepFilesForDays
     ///     Backup files older than this value (in days) are deleted during the current backup process, 0 will disable this and keep all backup files indefinitely
-    /// AutoBackupScript: String. Default: not specified (disabled). 
+    /// AutoBackupScript: String. Default: not specified (disabled).
     ///         File path to an executable script or binary to run when an automatic backup is taken.
     ///  The file should really be (Windows) an .exe or .bat, or (Linux/Mac) a shell script or binary.
     ///  Trying to "run" directories, or things with weird file associations on Win32, might cause unexpected results!
-    ///         argv[1] of the executed file/script will be the file name of the generated OAR. 
+    ///         argv[1] of the executed file/script will be the file name of the generated OAR.
     ///         If the process can't be spawned for some reason (file not found, no execute permission, etc), write a warning to the console.
     /// AutoBackupNaming: string. Default: Time.
     ///         One of three strings (case insensitive):
@@ -295,7 +295,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             if (args.Length != 2) {
                 MainConsole.Instance.OutputFormat ("Usage: dobackup <regionname>");
                 return;
-            }  
+            }
             bool found = false;
             string name = args [1];
             lock (m_Scenes) {
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
index ce7c368..b90f0c4 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
     /// If you use this class in any way outside of AutoBackupModule, you should treat the class as opaque.
     /// Since it is not part of the framework, you really should not rely upon it outside of the AutoBackupModule implementation.
     /// </summary>
-    /// 
+    ///
     public class AutoBackupModuleState
     {
         private Dictionary<Guid, string> m_liveRequests = null;
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 8565f5a..47edeb9 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -151,13 +151,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
                         // to the command line parameters you use to start up your client
                         // This commonly looks like -helperuri http://127.0.0.1:9000/
 
-                       
+
                         // Local Server..  enables functionality only.
                         httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func);
                         httpServer.AddXmlRPCHandler("buyCurrency", buy_func);
                         httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func);
                         httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
-                       
+
                     }
 
                     if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
@@ -212,7 +212,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
             bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description);
 
-            
+
             BalanceUpdate(fromID, toID, give_result, description);
 
             return give_result;
@@ -303,7 +303,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         private bool doMoneyTransfer(UUID Sender, UUID Receiver, int amount, int transactiontype, string description)
         {
             bool result = true;
-            
+
             return result;
         }
 
@@ -377,10 +377,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             else
             {
                 m_log.ErrorFormat(
-                    "[MONEY]: Could not resolve user {0}", 
+                    "[MONEY]: Could not resolve user {0}",
                     agentID);
             }
-            
+
             return String.Empty;
         }
 
@@ -464,7 +464,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             Hashtable quoteResponse = new Hashtable();
             XmlRpcResponse returnval = new XmlRpcResponse();
 
-            
+
             Hashtable currencyResponse = new Hashtable();
             currencyResponse.Add("estimatedCost", 0);
             currencyResponse.Add("currencyBuy", amount);
@@ -475,7 +475,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
             returnval.Value = quoteResponse;
             return returnval;
-            
+
 
 
         }
@@ -485,7 +485,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             // Hashtable requestData = (Hashtable) request.Params[0];
             // UUID agentId = UUID.Zero;
             // int amount = 0;
-           
+
             XmlRpcResponse returnval = new XmlRpcResponse();
             Hashtable returnresp = new Hashtable();
             returnresp.Add("success", true);
@@ -536,7 +536,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
             // UUID agentId = UUID.Zero;
             // int amount = 0;
-           
+
             retparam.Add("success", true);
             ret.Value = retparam;
 
@@ -553,7 +553,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentID"></param>
         private void CheckExistAndRefreshFunds(UUID agentID)
         {
-            
+
         }
 
         /// <summary>
@@ -564,13 +564,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         private int GetFundsForAgentID(UUID AgentID)
         {
             int returnfunds = 0;
-            
+
             return returnfunds;
         }
 
         // private void SetLocalFundsForAgentID(UUID AgentID, int amount)
         // {
-            
+
         // }
 
         #endregion
@@ -689,7 +689,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <see cref="OpenSim.Region.Framework.Scenes.EventManager.ClientClosed"/>
         public void ClientClosed(UUID AgentID, Scene scene)
         {
-            
+
         }
 
         /// <summary>
@@ -708,19 +708,19 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
         {
-            
-            
+
+
             lock (e)
             {
                 e.economyValidated = true;
             }
-       
-            
+
+
         }
 
         private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
         {
-            
+
         }
 
         /// <summary>
@@ -730,7 +730,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="e"></param>
         private void MoneyTransferAction(Object osender, EventManager.MoneyTransferArgs e)
         {
-            
+
         }
 
         /// <summary>
@@ -739,7 +739,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="avatar"></param>
         private void MakeChildAgent(ScenePresence avatar)
         {
-            
+
         }
 
         /// <summary>
@@ -748,7 +748,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="AgentId"></param>
         private void ClientLoggedOut(UUID AgentId, Scene scene)
         {
-            
+
         }
 
         /// <summary>
@@ -768,7 +768,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="regionID"></param>
         private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
         {
-            
+
             //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
         }
 
@@ -809,12 +809,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
             Scene s = LocateSceneClientIn(remoteClient.AgentId);
 
-            // Implmenting base sale data checking here so the default OpenSimulator implementation isn't useless 
+            // Implmenting base sale data checking here so the default OpenSimulator implementation isn't useless
             // combined with other implementations.  We're actually validating that the client is sending the data
             // that it should.   In theory, the client should already know what to send here because it'll see it when it
-            // gets the object data.   If the data sent by the client doesn't match the object, the viewer probably has an 
-            // old idea of what the object properties are.   Viewer developer Hazim informed us that the base module 
-            // didn't check the client sent data against the object do any.   Since the base modules are the 
+            // gets the object data.   If the data sent by the client doesn't match the object, the viewer probably has an
+            // old idea of what the object properties are.   Viewer developer Hazim informed us that the base module
+            // didn't check the client sent data against the object do any.   Since the base modules are the
             // 'crowning glory' examples of good practice..
 
             // Validate that the object exists in the scene the user is in
@@ -824,15 +824,15 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
                 remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
                 return;
             }
-            
-            // Validate that the client sent the price that the object is being sold for 
+
+            // Validate that the client sent the price that the object is being sold for
             if (part.SalePrice != salePrice)
             {
                 remoteClient.SendAgentAlertMessage("Cannot buy at this price. Buy Failed. If you continue to get this relog.", false);
                 return;
             }
 
-            // Validate that the client sent the proper sale type the object has set 
+            // Validate that the client sent the proper sale type the object has set
             if (part.ObjectSaleType != saleType)
             {
                 remoteClient.SendAgentAlertMessage("Cannot buy this way. Buy Failed. If you continue to get this relog.", false);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 0cabe47..6a7c735 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         }
 
         public delegate void ChatToNPC(
-            string message, byte type, Vector3 fromPos, string fromName, 
+            string message, byte type, Vector3 fromPos, string fromName,
             UUID fromAgentID, UUID ownerID, byte source, byte audible);
 
         /// <summary>
@@ -223,7 +223,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
 
         }
-                
+
         public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
                     Quaternion SitOrientation, bool autopilot,
                     Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
@@ -519,7 +519,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
 
         public event PlacesQuery OnPlacesQuery;
-        
+
         public event FindAgentUpdate OnFindAgent;
         public event TrackAgentUpdate OnTrackAgent;
         public event NewUserReport OnUserReport;
@@ -931,7 +931,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 OnRegionHandShakeReply(this);
             }
         }
-        
+
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
         }
@@ -951,7 +951,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
         {
         }
-        
+
         public void SendImageNotFound(UUID imageid)
         {
         }
@@ -959,7 +959,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
         {
         }
-        
+
         public void SendShutdownConnectionNotice()
         {
         }
@@ -970,7 +970,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
         {
-            
+
         }
 
         public void SendObjectPropertiesReply(ISceneEntity entity)
@@ -984,7 +984,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
         {
         }
-            
+
         public void SendViewerTime(int phase)
         {
         }
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             // We never start the client, so always fail.
             throw new NotImplementedException();
         }
-        
+
         public void Stop()
         {
         }
@@ -1224,11 +1224,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendJoinGroupReply(UUID groupID, bool success)
         {
         }
-        
+
         public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
         {
         }
-        
+
         public void SendLeaveGroupReply(UUID groupID, bool success)
         {
         }
@@ -1318,7 +1318,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
         #endregion
-        
+
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
@@ -1326,15 +1326,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
-        
+
         public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
         {
         }
-        
+
         public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
         {
         }
-        
+
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
         {
         }
@@ -1354,7 +1354,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
         {
         }
-        
+
         public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index a892cf4..9a1ea73 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -209,10 +209,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
 
-            InventoryItemBase att1Item 
+            InventoryItemBase att1Item
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "att1", TestHelpers.ParseTail(0x2), TestHelpers.ParseTail(0x3), sp.UUID, InventoryType.Object);
-            InventoryItemBase att2Item 
+            InventoryItemBase att2Item
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "att2", TestHelpers.ParseTail(0x12), TestHelpers.ParseTail(0x13), sp.UUID, InventoryType.Object);
 
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index bea3a1e..d0d726c 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -54,38 +54,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
         private Scene m_scene;
 
         public string Name { get { return "Scene Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[SCENE COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[SCENE COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[SCENE COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
 
             m_scene = scene;
-            
+
             m_scene.RegisterModuleInterface<ISceneCommandsModule>(this);
         }
-        
+
         public void RemoveRegion(Scene scene)
         {
 //            m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }        
-        
+        }
+
         public void RegionLoaded(Scene scene)
         {
 //            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -101,7 +101,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                     + "client-rot-upd  - the tolerance before clients are updated with new rotation information for an avatar.\n"
                     + "client-vel-upd  - the tolerance before clients are updated with new velocity information for an avatar.\n"
                     + "root-upd-per    - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n"
-                    + "child-upd-per   - if greater than 1, terse updates are only sent to child agents on every n updates.\n"                    
+                    + "child-upd-per   - if greater than 1, terse updates are only sent to child agents on every n updates.\n"
                     + "collisions      - if false then collisions with other objects are turned off.\n"
                     + "pbackup         - if false then periodic scene backup is turned off.\n"
                     + "physics         - if false then all physics objects are non-physical.\n"
@@ -213,7 +213,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, options["appear-refresh"], out newValue))
-                    m_scene.SendPeriodicAppearanceUpdates = newValue;     
+                    m_scene.SendPeriodicAppearanceUpdates = newValue;
             }
 
             if (options.ContainsKey("client-pos-upd"))
@@ -222,7 +222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
-                    m_scene.RootPositionUpdateTolerance = newValue;    
+                    m_scene.RootPositionUpdateTolerance = newValue;
             }
 
             if (options.ContainsKey("client-rot-upd"))
@@ -231,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
-                    m_scene.RootRotationUpdateTolerance = newValue;    
+                    m_scene.RootRotationUpdateTolerance = newValue;
             }
 
             if (options.ContainsKey("client-vel-upd"))
@@ -240,7 +240,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
-                    m_scene.RootVelocityUpdateTolerance = newValue;    
+                    m_scene.RootVelocityUpdateTolerance = newValue;
             }
 
             if (options.ContainsKey("root-upd-per"))
@@ -249,7 +249,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["root-upd-per"], out newValue))
-                    m_scene.RootTerseUpdatePeriod = newValue;    
+                    m_scene.RootTerseUpdatePeriod = newValue;
             }
 
             if (options.ContainsKey("child-upd-per"))
@@ -258,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["child-upd-per"], out newValue))
-                    m_scene.ChildTerseUpdatePeriod = newValue;    
+                    m_scene.ChildTerseUpdatePeriod = newValue;
             }
 
             if (options.ContainsKey("pbackup"))
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index e4a3382..e22c6ea 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -45,7 +45,7 @@ using System.IO;
 namespace OpenSim.Region.OptionalModules.World.TreePopulator
 {
     /// <summary>
-    /// Version 2.02 - Still hacky 
+    /// Version 2.02 - Still hacky
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TreePopulatorModule")]
     public class TreePopulatorModule : INonSharedRegionModule, ICommandableModule, IVegetationModule
@@ -60,7 +60,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
             public string m_name;
             public Boolean m_frozen;
             public Tree m_tree_type;
-            public int m_tree_quantity; 
+            public int m_tree_quantity;
             public float m_treeline_low;
             public float m_treeline_high;
             public Vector3 m_seed_point;
@@ -78,7 +78,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
             {
             }
 
-            public Copse(string fileName, Boolean planted) 
+            public Copse(string fileName, Boolean planted)
             {
                 Copse cp = (Copse)DeserializeObject(fileName);
 
@@ -139,7 +139,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
             {
                 string frozen = (this.m_frozen ? "F" : "A");
 
-                return string.Format("{0}TPM: {1}; {2}; {3:0.0}; {4:0.0}; {5:0.0}; {6}; {7:0.0}; {8:0.0}; {9:0.0}; {10:0.00};", 
+                return string.Format("{0}TPM: {1}; {2}; {3:0.0}; {4:0.0}; {5:0.0}; {6}; {7:0.0}; {8:0.0}; {9:0.0}; {10:0.00};",
                     frozen,
                     this.m_name,
                     this.m_tree_quantity,
@@ -156,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
 
         private List<Copse> m_copse;
 
-        private double m_update_ms = 1000.0; // msec between updates 
+        private double m_update_ms = 1000.0; // msec between updates
         private bool m_active_trees = false;
 
         Timer CalculateTrees;
@@ -174,7 +174,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
 
         public void Initialise(IConfigSource config)
         {
-            
+
             // ini file settings
             try
             {
@@ -621,11 +621,11 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                 CalculateTrees.Elapsed += CalculateTrees_Elapsed;
                 CalculateTrees.Start();
             }
-            else 
+            else
             {
                  CalculateTrees.Stop();
             }
-        } 
+        }
 
         private void growTrees()
         {
@@ -670,7 +670,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                             if (copse.m_trees.Count < copse.m_tree_quantity)
                             {
                                 // Tree has grown enough to seed if it has grown by at least 25% of seeded to full grown height
-                                if (s_tree.Scale.Z > copse.m_initial_scale.Z + (copse.m_maximum_scale.Z - copse.m_initial_scale.Z) / 4.0) 
+                                if (s_tree.Scale.Z > copse.m_initial_scale.Z + (copse.m_maximum_scale.Z - copse.m_initial_scale.Z) / 4.0)
                                 {
                                     if (Util.RandomClass.NextDouble() > 0.75)
                                     {
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
index 3944047..67d9207 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
@@ -268,23 +268,23 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
             set { return; }
         }
 
-        public override Quaternion APIDTarget 
-        { 
+        public override Quaternion APIDTarget
+        {
             set { return; }
         }
-        
+
         public override bool APIDActive
-        { 
+        {
             set { return; }
         }
-        
+
         public override float APIDStrength
-        { 
+        {
             set { return; }
         }
-        
+
         public override float APIDDamping
-        { 
+        {
             set { return; }
         }
 
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
index d2cd028..58c2581 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
@@ -281,23 +281,23 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
             set { return; }
         }
 
-        public override Quaternion APIDTarget 
-        { 
+        public override Quaternion APIDTarget
+        {
             set { return; }
         }
-        
+
         public override bool APIDActive
-        { 
+        {
             set { return; }
         }
-        
+
         public override float APIDStrength
-        { 
+        {
             set { return; }
         }
-        
+
         public override float APIDDamping
-        { 
+        {
             set { return; }
         }
 
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
index c4a923c..42db7fe 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
@@ -155,8 +155,8 @@ public BSAPIUnman(string paramName, BSScene physScene)
 
 // Initialization and simulation
 public override BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms,
-                                                                                        int maxCollisions,  ref CollisionDesc[] collisionArray,
-                                                                                        int maxUpdates, ref EntityProperties[] updateArray
+                                            int maxCollisions,  ref CollisionDesc[] collisionArray,
+                                            int maxUpdates, ref EntityProperties[] updateArray
                                             )
 {
     // Pin down the memory that will be used to pass object collisions and updates back from unmanaged code
@@ -1472,8 +1472,8 @@ public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg
 // Initialization and simulation
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern IntPtr Initialize2(Vector3 maxPosition, IntPtr parms,
-                                                                                        int maxCollisions,  IntPtr collisionArray,
-                                                                                        int maxUpdates, IntPtr updateArray,
+                                            int maxCollisions,  IntPtr collisionArray,
+                                            int maxUpdates, IntPtr updateArray,
                                             DebugLogCallback logRoutine);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs
index 887311d..37017b0 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs
@@ -815,161 +815,161 @@ private sealed class BulletConstraintXNA : BulletConstraint
     public override bool SliderSetLimits(BulletConstraint pConstraint, int lowerUpper, int linAng, float val)
     {
         SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
-                switch (lowerUpper)
-                {
-                        case SLIDER_LOWER_LIMIT:
-                                switch (linAng)
-                                {
-                                        case SLIDER_LINEAR:
-                                                constraint.SetLowerLinLimit(val);
-                                                break;
-                                        case SLIDER_ANGULAR:
-                                                constraint.SetLowerAngLimit(val);
-                                                break;
-                                }
-                                break;
-                        case SLIDER_UPPER_LIMIT:
-                                switch (linAng)
-                                {
-                                        case SLIDER_LINEAR:
-                                                constraint.SetUpperLinLimit(val);
-                                                break;
-                                        case SLIDER_ANGULAR:
-                                                constraint.SetUpperAngLimit(val);
-                                                break;
-                                }
-                                break;
-                }
+        switch (lowerUpper)
+        {
+            case SLIDER_LOWER_LIMIT:
+                switch (linAng)
+                {
+                    case SLIDER_LINEAR:
+                        constraint.SetLowerLinLimit(val);
+                        break;
+                    case SLIDER_ANGULAR:
+                        constraint.SetLowerAngLimit(val);
+                        break;
+                }
+                break;
+            case SLIDER_UPPER_LIMIT:
+                switch (linAng)
+                {
+                    case SLIDER_LINEAR:
+                        constraint.SetUpperLinLimit(val);
+                        break;
+                    case SLIDER_ANGULAR:
+                        constraint.SetUpperAngLimit(val);
+                        break;
+                }
+                break;
+        }
         return true;
     }
     public override bool SliderSet(BulletConstraint pConstraint, int softRestDamp, int dirLimOrtho, int linAng, float val)
     {
         SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
-                switch (softRestDamp)
-                {
-                        case SLIDER_SET_SOFTNESS:
-                                switch (dirLimOrtho)
-                                {
-                                        case SLIDER_SET_DIRECTION:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetSoftnessDirLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetSoftnessDirAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_LIMIT:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetSoftnessLimLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetSoftnessLimAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_ORTHO:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetSoftnessOrthoLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetSoftnessOrthoAng(val); break;
-                                                }
-                                                break;
-                                }
-                                break;
-                        case SLIDER_SET_RESTITUTION:
-                                switch (dirLimOrtho)
-                                {
-                                        case SLIDER_SET_DIRECTION:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetRestitutionDirLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetRestitutionDirAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_LIMIT:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetRestitutionLimLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetRestitutionLimAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_ORTHO:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetRestitutionOrthoLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetRestitutionOrthoAng(val); break;
-                                                }
-                                                break;
-                                }
-                                break;
-                        case SLIDER_SET_DAMPING:
-                                switch (dirLimOrtho)
-                                {
-                                        case SLIDER_SET_DIRECTION:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetDampingDirLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetDampingDirAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_LIMIT:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetDampingLimLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetDampingLimAng(val); break;
-                                                }
-                                                break;
-                                        case SLIDER_SET_ORTHO:
-                                                switch (linAng)
-                                                {
-                                                        case SLIDER_LINEAR: constraint.SetDampingOrthoLin(val); break;
-                                                        case SLIDER_ANGULAR: constraint.SetDampingOrthoAng(val); break;
-                                                }
-                                                break;
-                                }
-                                break;
-                }
+        switch (softRestDamp)
+        {
+            case SLIDER_SET_SOFTNESS:
+                switch (dirLimOrtho)
+                {
+                    case SLIDER_SET_DIRECTION:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetSoftnessDirLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetSoftnessDirAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_LIMIT:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetSoftnessLimLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetSoftnessLimAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_ORTHO:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetSoftnessOrthoLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetSoftnessOrthoAng(val); break;
+                        }
+                        break;
+                }
+                break;
+            case SLIDER_SET_RESTITUTION:
+                switch (dirLimOrtho)
+                {
+                    case SLIDER_SET_DIRECTION:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetRestitutionDirLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetRestitutionDirAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_LIMIT:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetRestitutionLimLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetRestitutionLimAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_ORTHO:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetRestitutionOrthoLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetRestitutionOrthoAng(val); break;
+                        }
+                        break;
+                }
+                break;
+            case SLIDER_SET_DAMPING:
+                switch (dirLimOrtho)
+                {
+                    case SLIDER_SET_DIRECTION:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetDampingDirLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetDampingDirAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_LIMIT:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetDampingLimLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetDampingLimAng(val); break;
+                        }
+                        break;
+                    case SLIDER_SET_ORTHO:
+                        switch (linAng)
+                        {
+                            case SLIDER_LINEAR: constraint.SetDampingOrthoLin(val); break;
+                            case SLIDER_ANGULAR: constraint.SetDampingOrthoAng(val); break;
+                        }
+                        break;
+                }
+                break;
+        }
         return true;
     }
     public override bool SliderMotorEnable(BulletConstraint pConstraint, int linAng, float numericTrueFalse)
     {
         SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
-                switch (linAng)
-                {
-                        case SLIDER_LINEAR:
-                                constraint.SetPoweredLinMotor(numericTrueFalse == 0.0 ? false : true);
-                                break;
-                        case SLIDER_ANGULAR:
-                                constraint.SetPoweredAngMotor(numericTrueFalse == 0.0 ? false : true);
-                                break;
-                }
+        switch (linAng)
+        {
+            case SLIDER_LINEAR:
+                constraint.SetPoweredLinMotor(numericTrueFalse == 0.0 ? false : true);
+                break;
+            case SLIDER_ANGULAR:
+                constraint.SetPoweredAngMotor(numericTrueFalse == 0.0 ? false : true);
+                break;
+        }
         return true;
     }
     public override bool SliderMotor(BulletConstraint pConstraint, int forceVel, int linAng, float val)
     {
         SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
-                switch (forceVel)
-                {
-                        case SLIDER_MOTOR_VELOCITY:
-                                switch (linAng)
-                                {
-                                        case SLIDER_LINEAR:
-                                                constraint.SetTargetLinMotorVelocity(val);
-                                                break;
-                                        case SLIDER_ANGULAR:
-                                                constraint.SetTargetAngMotorVelocity(val);
-                                                break;
-                                }
-                                break;
-                        case SLIDER_MAX_MOTOR_FORCE:
-                                switch (linAng)
-                                {
-                                        case SLIDER_LINEAR:
-                                                constraint.SetMaxLinMotorForce(val);
-                                                break;
-                                        case SLIDER_ANGULAR:
-                                                constraint.SetMaxAngMotorForce(val);
-                                                break;
-                                }
-                                break;
-                }
+        switch (forceVel)
+        {
+            case SLIDER_MOTOR_VELOCITY:
+                switch (linAng)
+                {
+                    case SLIDER_LINEAR:
+                        constraint.SetTargetLinMotorVelocity(val);
+                        break;
+                    case SLIDER_ANGULAR:
+                        constraint.SetTargetAngMotorVelocity(val);
+                        break;
+                }
+                break;
+            case SLIDER_MAX_MOTOR_FORCE:
+                switch (linAng)
+                {
+                    case SLIDER_LINEAR:
+                        constraint.SetMaxLinMotorForce(val);
+                        break;
+                    case SLIDER_ANGULAR:
+                        constraint.SetMaxAngMotorForce(val);
+                        break;
+                }
+                break;
+        }
         return true;
     }
 
@@ -1197,20 +1197,20 @@ private sealed class BulletConstraintXNA : BulletConstraint
                                                          };
         /*
             m_mass = mass;
-                        m_motionState =motionState;
-                        m_collisionShape = collisionShape;
-                        m_localInertia = localInertia;
-                        m_linearDamping = 0f;
-                        m_angularDamping = 0f;
-                        m_friction = 0.5f;
-                        m_restitution = 0f;
-                        m_linearSleepingThreshold = 0.8f;
-                        m_angularSleepingThreshold = 1f;
-                        m_additionalDamping = false;
-                        m_additionalDampingFactor = 0.005f;
-                        m_additionalLinearDampingThresholdSqr = 0.01f;
-                        m_additionalAngularDampingThresholdSqr = 0.01f;
-                        m_additionalAngularDampingFactor = 0.01f;
+            m_motionState =motionState;
+            m_collisionShape = collisionShape;
+            m_localInertia = localInertia;
+            m_linearDamping = 0f;
+            m_angularDamping = 0f;
+            m_friction = 0.5f;
+            m_restitution = 0f;
+            m_linearSleepingThreshold = 0.8f;
+            m_angularSleepingThreshold = 1f;
+            m_additionalDamping = false;
+            m_additionalDampingFactor = 0.005f;
+            m_additionalLinearDampingThresholdSqr = 0.01f;
+            m_additionalAngularDampingThresholdSqr = 0.01f;
+            m_additionalAngularDampingFactor = 0.01f;
             m_startWorldTransform = IndexedMatrix.Identity;
         */
         body.SetUserPointer(pLocalID);
@@ -2172,7 +2172,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
 
     public override BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
-                                                                float scaleFactor, float collisionMargin)
+                                float scaleFactor, float collisionMargin)
     {
         const int upAxis = 2;
         HeightfieldTerrainShape terrainShape = new HeightfieldTerrainShape((int)size.X, (int)size.Y,
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs
index 87cf972..f2019ae 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs
@@ -205,7 +205,7 @@ public class BSActorMoveToTarget : BSActor
             addedForce = correctionVector / timeStep;
             // Remove the existing velocity (only the moveToTarget force counts)
             addedForce -= m_controllingPrim.RawVelocity;
-            // Overcome gravity. 
+            // Overcome gravity.
             addedForce -= m_controllingPrim.Gravity;
 
             // Add enough force to overcome the mass of the object
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs b/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs
index 7756b10..816189f 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs
@@ -36,16 +36,16 @@ namespace OpenSim.Region.PhysicsModule.BulletS {
     // Constraint type values as defined by Bullet
 public enum ConstraintType : int
 {
-        POINT2POINT_CONSTRAINT_TYPE = 3,
-        HINGE_CONSTRAINT_TYPE,
-        CONETWIST_CONSTRAINT_TYPE,
-        D6_CONSTRAINT_TYPE,
-        SLIDER_CONSTRAINT_TYPE,
-        CONTACT_CONSTRAINT_TYPE,
-        D6_SPRING_CONSTRAINT_TYPE,
-        GEAR_CONSTRAINT_TYPE,           // added in Bullet 2.82
-        FIXED_CONSTRAINT_TYPE,          // added in Bullet 2.82
-        MAX_CONSTRAINT_TYPE,            // last type defined by Bullet
+    POINT2POINT_CONSTRAINT_TYPE = 3,
+    HINGE_CONSTRAINT_TYPE,
+    CONETWIST_CONSTRAINT_TYPE,
+    D6_CONSTRAINT_TYPE,
+    SLIDER_CONSTRAINT_TYPE,
+    CONTACT_CONSTRAINT_TYPE,
+    D6_SPRING_CONSTRAINT_TYPE,
+    GEAR_CONSTRAINT_TYPE,           // added in Bullet 2.82
+    FIXED_CONSTRAINT_TYPE,          // added in Bullet 2.82
+    MAX_CONSTRAINT_TYPE,            // last type defined by Bullet
     //
     BS_FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
 }
@@ -54,25 +54,25 @@ public enum ConstraintType : int
 [StructLayout(LayoutKind.Sequential)]
 public struct ConvexHull
 {
-        Vector3 Offset;
-        int VertexCount;
-        Vector3[] Vertices;
+    Vector3 Offset;
+    int VertexCount;
+    Vector3[] Vertices;
 }
 public enum BSPhysicsShapeType
 {
-        SHAPE_UNKNOWN   = 0,
-        SHAPE_CAPSULE   = 1,
-        SHAPE_BOX       = 2,
-        SHAPE_CONE      = 3,
-        SHAPE_CYLINDER  = 4,
-        SHAPE_SPHERE    = 5,
-        SHAPE_MESH      = 6,
-        SHAPE_HULL      = 7,
+    SHAPE_UNKNOWN   = 0,
+    SHAPE_CAPSULE   = 1,
+    SHAPE_BOX       = 2,
+    SHAPE_CONE      = 3,
+    SHAPE_CYLINDER  = 4,
+    SHAPE_SPHERE    = 5,
+    SHAPE_MESH      = 6,
+    SHAPE_HULL      = 7,
     // following defined by BulletSim
-        SHAPE_GROUNDPLANE  = 20,
-        SHAPE_TERRAIN   = 21,
-        SHAPE_COMPOUND  = 22,
-        SHAPE_HEIGHTMAP = 23,
+    SHAPE_GROUNDPLANE  = 20,
+    SHAPE_TERRAIN   = 21,
+    SHAPE_COMPOUND  = 22,
+    SHAPE_HEIGHTMAP = 23,
     SHAPE_AVATAR    = 24,
     SHAPE_CONVEXHULL= 25,
     SHAPE_GIMPACT   = 26,
@@ -180,16 +180,16 @@ public struct ConfigurationParameters
     public float collisionMargin;
     public float gravity;
 
-        public float maxPersistantManifoldPoolSize;
-        public float maxCollisionAlgorithmPoolSize;
-        public float shouldDisableContactPoolDynamicAllocation;
-        public float shouldForceUpdateAllAabbs;
-        public float shouldRandomizeSolverOrder;
-        public float shouldSplitSimulationIslands;
-        public float shouldEnableFrictionCaching;
-        public float numberOfSolverIterations;
+    public float maxPersistantManifoldPoolSize;
+    public float maxCollisionAlgorithmPoolSize;
+    public float shouldDisableContactPoolDynamicAllocation;
+    public float shouldForceUpdateAllAabbs;
+    public float shouldRandomizeSolverOrder;
+    public float shouldSplitSimulationIslands;
+    public float shouldEnableFrictionCaching;
+    public float numberOfSolverIterations;
     public float useSingleSidedMeshes;
-        public float globalContactBreakingThreshold;
+    public float globalContactBreakingThreshold;
 
     public float physicsLoggingFrames;
 
@@ -202,30 +202,30 @@ public struct ConfigurationParameters
 public struct HACDParams
 {
                                             // usual default values
-        public float maxVerticesPerHull;                // 100
-        public float minClusters;                               // 2
-        public float compacityWeight;                   // 0.1
-        public float volumeWeight;                              // 0.0
-        public float concavity;                             // 100
-        public float addExtraDistPoints;                // false
-        public float addNeighboursDistPoints;   // false
-        public float addFacesPoints;                    // false
-        public float shouldAdjustCollisionMargin;       // false
+    public float maxVerticesPerHull;            // 100
+    public float minClusters;                           // 2
+    public float compacityWeight;                       // 0.1
+    public float volumeWeight;                          // 0.0
+    public float concavity;                                 // 100
+    public float addExtraDistPoints;            // false
+    public float addNeighboursDistPoints;       // false
+    public float addFacesPoints;                        // false
+    public float shouldAdjustCollisionMargin;   // false
     // VHACD
-        public float whichHACD;                             // zero if Bullet HACD, non-zero says VHACD
-        // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
-        public float vHACDresolution;                   // 100,000 max number of voxels generated during voxelization stage
-        public float vHACDdepth;                                // 20 max number of clipping stages
-        public float vHACDconcavity;                    // 0.0025 maximum concavity
-        public float vHACDplaneDownsampling;    // 4 granularity of search for best clipping plane
-        public float vHACDconvexHullDownsampling;       // 4 precision of hull gen process
-        public float vHACDalpha;                                // 0.05 bias toward clipping along symmetry planes
-        public float vHACDbeta;                             // 0.05 bias toward clipping along revolution axis
-        public float vHACDgamma;                                // 0.00125 max concavity when merging
-        public float vHACDpca;                                  // 0 on/off normalizing mesh before decomp
-        public float vHACDmode;                             // 0 0:voxel based, 1: tetrahedron based
-        public float vHACDmaxNumVerticesPerCH;  // 64 max triangles per convex hull
-        public float vHACDminVolumePerCH;               // 0.0001 sampling of generated convex hulls
+    public float whichHACD;                                 // zero if Bullet HACD, non-zero says VHACD
+    // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+    public float vHACDresolution;                       // 100,000 max number of voxels generated during voxelization stage
+    public float vHACDdepth;                            // 20 max number of clipping stages
+    public float vHACDconcavity;                        // 0.0025 maximum concavity
+    public float vHACDplaneDownsampling;        // 4 granularity of search for best clipping plane
+    public float vHACDconvexHullDownsampling;   // 4 precision of hull gen process
+    public float vHACDalpha;                            // 0.05 bias toward clipping along symmetry planes
+    public float vHACDbeta;                                 // 0.05 bias toward clipping along revolution axis
+    public float vHACDgamma;                            // 0.00125 max concavity when merging
+    public float vHACDpca;                                      // 0 on/off normalizing mesh before decomp
+    public float vHACDmode;                                 // 0 0:voxel based, 1: tetrahedron based
+    public float vHACDmaxNumVerticesPerCH;      // 64 max triangles per convex hull
+    public float vHACDminVolumePerCH;           // 0.0001 sampling of generated convex hulls
 }
 
 // The states a bullet collision object can have
@@ -322,8 +322,8 @@ public abstract string BulletEngineVersion { get; protected set;}
 
 // Initialization and simulation
 public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms,
-                                                                                        int maxCollisions,  ref CollisionDesc[] collisionArray,
-                                                                                        int maxUpdates, ref EntityProperties[] updateArray
+                                            int maxCollisions,  ref CollisionDesc[] collisionArray,
+                                            int maxUpdates, ref EntityProperties[] updateArray
                                             );
 
 public abstract int PhysicsStep(BulletWorld world, float timeStep, int maxSubSteps, float fixedTimeStep,
@@ -398,7 +398,7 @@ public abstract void DestroyObject(BulletWorld sim, BulletBody obj);
 public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin);
 
 public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
-                                                                float scaleFactor, float collisionMargin);
+                                float scaleFactor, float collisionMargin);
 
 // =====================================================================================
 // Constraint creation and helper routines
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
index 6322695..57f03fb 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
@@ -64,9 +64,9 @@ public sealed class BSCharacter : BSPhysObject
     private OMV.Vector3 _PIDTarget;
     private float _PIDTau;
 
-//        public override OMV.Vector3 RawVelocity 
-//        { get { return base.RawVelocity; } 
-//            set { 
+//        public override OMV.Vector3 RawVelocity
+//        { get { return base.RawVelocity; }
+//            set {
 //                if (value != base.RawVelocity)
 //                    Util.PrintCallStack();
 //                Console.WriteLine("Set rawvel to {0}", value);
@@ -82,7 +82,7 @@ public sealed class BSCharacter : BSPhysObject
             : base(parent_scene, localID, avName, "BSCharacter")
     {
         _physicsActorType = (int)ActorTypes.Agent;
-        RawPosition = pos;        
+        RawPosition = pos;
 
         _flying = isFlying;
         RawOrientation = OMV.Quaternion.Identity;
@@ -819,7 +819,7 @@ public sealed class BSCharacter : BSPhysObject
         //    0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many
         //    extra updates.
         //
-        // XXX: Contrary to the above comment, setting an update threshold here above 0.4 actually introduces jitter to 
+        // XXX: Contrary to the above comment, setting an update threshold here above 0.4 actually introduces jitter to
         // avatar movement rather than removes it.  The larger the threshold, the bigger the jitter.
         // This is most noticeable in level flight and can be seen with
         // the "show updates" option in a viewer.  With an update threshold, the RawVelocity cycles between a lower
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs
index 313c961..c4ccdbe 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs
@@ -125,8 +125,8 @@ namespace OpenSim.Region.PhysicsModule.BulletS
 
         // Just some recomputed constants:
 #pragma warning disable 414
-        static readonly float TwoPI = ((float)Math.PI) * 2f; 
-        static readonly float FourPI = ((float)Math.PI) * 4f; 
+        static readonly float TwoPI = ((float)Math.PI) * 2f;
+        static readonly float FourPI = ((float)Math.PI) * 4f;
         static readonly float PIOverFour = ((float)Math.PI) / 4f;
         static readonly float PIOverTwo = ((float)Math.PI) / 2f;
 #pragma warning restore 414
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS
         //     in that direction.
         // TODO: implement reference frame.
         public void ComputeAngularDeflection()
-        {   
+        {
 
             if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2)
             {
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs
index e73f0e8..13c1361 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs
@@ -319,7 +319,7 @@ public abstract class BSLinkset
     public virtual bool AllPartsComplete
     {
         get {
-            bool ret = true; 
+            bool ret = true;
             this.ForEachMember((member) =>
             {
                 if ((!member.IsInitialized) || member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting)
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs
index 28df2d9..352c03e 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs
@@ -90,8 +90,8 @@ public static class BSParam
     public static float DeactivationTime { get; private set; }
     public static float LinearSleepingThreshold { get; private set; }
     public static float AngularSleepingThreshold { get; private set; }
-        public static float CcdMotionThreshold { get; private set; }
-        public static float CcdSweptSphereRadius { get; private set; }
+    public static float CcdMotionThreshold { get; private set; }
+    public static float CcdSweptSphereRadius { get; private set; }
     public static float ContactProcessingThreshold { get; private set; }
 
     public static bool ShouldMeshSculptedPrim { get; private set; }   // cause scuplted prims to get meshed
@@ -119,14 +119,14 @@ public static class BSParam
     public static float Gravity { get; private set; }
 
     // Physics Engine operation
-        public static float MaxPersistantManifoldPoolSize { get; private set; }
-        public static float MaxCollisionAlgorithmPoolSize { get; private set; }
-        public static bool ShouldDisableContactPoolDynamicAllocation { get; private set; }
-        public static bool ShouldForceUpdateAllAabbs { get; private set; }
-        public static bool ShouldRandomizeSolverOrder { get; private set; }
-        public static bool ShouldSplitSimulationIslands { get; private set; }
-        public static bool ShouldEnableFrictionCaching { get; private set; }
-        public static float NumberOfSolverIterations { get; private set; }
+    public static float MaxPersistantManifoldPoolSize { get; private set; }
+    public static float MaxCollisionAlgorithmPoolSize { get; private set; }
+    public static bool ShouldDisableContactPoolDynamicAllocation { get; private set; }
+    public static bool ShouldForceUpdateAllAabbs { get; private set; }
+    public static bool ShouldRandomizeSolverOrder { get; private set; }
+    public static bool ShouldSplitSimulationIslands { get; private set; }
+    public static bool ShouldEnableFrictionCaching { get; private set; }
+    public static float NumberOfSolverIterations { get; private set; }
     public static bool UseSingleSidedMeshes { get; private set; }
     public static float GlobalContactBreakingThreshold { get; private set; }
     public static float PhysicsUnmanLoggingFrames { get; private set; }
@@ -149,19 +149,19 @@ public static class BSParam
     public static float AvatarFlyingGroundMargin { get; private set; }
     public static float AvatarFlyingGroundUpForce { get; private set; }
     public static float AvatarTerminalVelocity { get; private set; }
-        public static float AvatarContactProcessingThreshold { get; private set; }
+    public static float AvatarContactProcessingThreshold { get; private set; }
     public static float AvatarAddForcePushFactor { get; private set; }
     public static float AvatarStopZeroThreshold { get; private set; }
     public static float AvatarStopZeroThresholdSquared { get; private set; }
-        public static int AvatarJumpFrames { get; private set; }
-        public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
-        public static float AvatarStepHeight { get; private set; }
-        public static float AvatarStepAngle { get; private set; }
-        public static float AvatarStepGroundFudge { get; private set; }
-        public static float AvatarStepApproachFactor { get; private set; }
-        public static float AvatarStepForceFactor { get; private set; }
-        public static float AvatarStepUpCorrectionFactor { get; private set; }
-        public static int AvatarStepSmoothingSteps { get; private set; }
+    public static int AvatarJumpFrames { get; private set; }
+    public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
+    public static float AvatarStepHeight { get; private set; }
+    public static float AvatarStepAngle { get; private set; }
+    public static float AvatarStepGroundFudge { get; private set; }
+    public static float AvatarStepApproachFactor { get; private set; }
+    public static float AvatarStepForceFactor { get; private set; }
+    public static float AvatarStepUpCorrectionFactor { get; private set; }
+    public static int AvatarStepSmoothingSteps { get; private set; }
 
     // Vehicle parameters
     public static float VehicleMaxLinearVelocity { get; private set; }
@@ -193,31 +193,31 @@ public static class BSParam
     public static float CSHullVolumeConservationThresholdPercent { get; private set; }
     public static int CSHullMaxVertices { get; private set; }
     public static float CSHullMaxSkinWidth { get; private set; }
-        public static float BHullMaxVerticesPerHull { get; private set; }               // 100
-        public static float BHullMinClusters { get; private set; }                              // 2
-        public static float BHullCompacityWeight { get; private set; }                  // 0.1
-        public static float BHullVolumeWeight { get; private set; }                             // 0.0
-        public static float BHullConcavity { get; private set; }                                    // 100
-        public static bool BHullAddExtraDistPoints { get; private set; }                // false
-        public static bool BHullAddNeighboursDistPoints { get; private set; }   // false
-        public static bool BHullAddFacesPoints { get; private set; }                    // false
-        public static bool BHullShouldAdjustCollisionMargin { get; private set; }       // false
-        public static float WhichHACD { get; private set; }                                 // zero if Bullet HACD, non-zero says VHACD
+    public static float BHullMaxVerticesPerHull { get; private set; }           // 100
+    public static float BHullMinClusters { get; private set; }                          // 2
+    public static float BHullCompacityWeight { get; private set; }                      // 0.1
+    public static float BHullVolumeWeight { get; private set; }                         // 0.0
+    public static float BHullConcavity { get; private set; }                                // 100
+    public static bool BHullAddExtraDistPoints { get; private set; }            // false
+    public static bool BHullAddNeighboursDistPoints { get; private set; }       // false
+    public static bool BHullAddFacesPoints { get; private set; }                        // false
+    public static bool BHullShouldAdjustCollisionMargin { get; private set; }   // false
+    public static float WhichHACD { get; private set; }                             // zero if Bullet HACD, non-zero says VHACD
     // Parameters for VHACD 2.0: http://code.google.com/p/v-hacd
     // To enable, set both ShouldUseBulletHACD=true and WhichHACD=1
-        // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
-        public static float VHACDresolution { get; private set; }                       // 100,000 max number of voxels generated during voxelization stage
-        public static float VHACDdepth { get; private set; }                            // 20 max number of clipping stages
-        public static float VHACDconcavity { get; private set; }                        // 0.0025 maximum concavity
-        public static float VHACDplaneDownsampling { get; private set; }        // 4 granularity of search for best clipping plane
-        public static float VHACDconvexHullDownsampling { get; private set; }   // 4 precision of hull gen process
-        public static float VHACDalpha { get; private set; }                            // 0.05 bias toward clipping along symmetry planes
-        public static float VHACDbeta { get; private set; }                                 // 0.05 bias toward clipping along revolution axis
-        public static float VHACDgamma { get; private set; }                            // 0.00125 max concavity when merging
-        public static float VHACDpca { get; private set; }                                      // 0 on/off normalizing mesh before decomp
-        public static float VHACDmode { get; private set; }                                 // 0 0:voxel based, 1: tetrahedron based
-        public static float VHACDmaxNumVerticesPerCH { get; private set; }      // 64 max triangles per convex hull
-        public static float VHACDminVolumePerCH { get; private set; }           // 0.0001 sampling of generated convex hulls
+    // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+    public static float VHACDresolution { get; private set; }                   // 100,000 max number of voxels generated during voxelization stage
+    public static float VHACDdepth { get; private set; }                                // 20 max number of clipping stages
+    public static float VHACDconcavity { get; private set; }                    // 0.0025 maximum concavity
+    public static float VHACDplaneDownsampling { get; private set; }    // 4 granularity of search for best clipping plane
+    public static float VHACDconvexHullDownsampling { get; private set; }       // 4 precision of hull gen process
+    public static float VHACDalpha { get; private set; }                                // 0.05 bias toward clipping along symmetry planes
+    public static float VHACDbeta { get; private set; }                             // 0.05 bias toward clipping along revolution axis
+    public static float VHACDgamma { get; private set; }                                // 0.00125 max concavity when merging
+    public static float VHACDpca { get; private set; }                                  // 0 on/off normalizing mesh before decomp
+    public static float VHACDmode { get; private set; }                             // 0 0:voxel based, 1: tetrahedron based
+    public static float VHACDmaxNumVerticesPerCH { get; private set; }  // 64 max triangles per convex hull
+    public static float VHACDminVolumePerCH { get; private set; }               // 0.0001 sampling of generated convex hulls
 
     // Linkset implementation parameters
     public static float LinksetImplementation { get; private set; }
@@ -579,7 +579,7 @@ public static class BSParam
             (s,v) => { ContactProcessingThreshold = v;},
             (s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ),
 
-            new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
+        new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
             (float)BSTerrainPhys.TerrainImplementation.Heightmap ),
         new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" ,
             2 ),
@@ -631,31 +631,31 @@ public static class BSParam
             2.0f ),
         new ParameterDefn<float>("AvatarTerminalVelocity", "Terminal Velocity of falling avatar",
             -54.0f ),
-            new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
+        new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
-            new ParameterDefn<float>("AvatarAddForcePushFactor", "BSCharacter.AddForce is multiplied by this and mass to be like other physics engines",
+        new ParameterDefn<float>("AvatarAddForcePushFactor", "BSCharacter.AddForce is multiplied by this and mass to be like other physics engines",
             0.315f ),
-            new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",
+        new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",
             0.45f,
             (s) => { return (float)AvatarStopZeroThreshold; },
             (s,v) => { AvatarStopZeroThreshold = v; AvatarStopZeroThresholdSquared = v * v; } ),
-            new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
+        new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
             1.0f ),
-            new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.",
+        new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.",
             4 ),
-            new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
+        new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
             0.999f ) ,
-            new ParameterDefn<float>("AvatarStepAngle", "The angle (in radians) for a vertical surface to be considered a step",
+        new ParameterDefn<float>("AvatarStepAngle", "The angle (in radians) for a vertical surface to be considered a step",
             0.3f ) ,
-            new ParameterDefn<float>("AvatarStepGroundFudge", "Fudge factor subtracted from avatar base when comparing collision height",
+        new ParameterDefn<float>("AvatarStepGroundFudge", "Fudge factor subtracted from avatar base when comparing collision height",
             0.1f ) ,
-            new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
+        new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
             2f ),
-            new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
+        new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
             0f ),
-            new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
+        new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
             0.8f ),
-            new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
+        new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
             1 ),
 
         new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
@@ -699,131 +699,131 @@ public static class BSParam
         new ParameterDefn<bool>("VehicleEnableAngularBanking", "Turn on/off vehicle angular banking effect",
             true ),
 
-            new ParameterDefn<float>("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)",
+        new ParameterDefn<float>("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)",
             0f,
             (s) => { return MaxPersistantManifoldPoolSize; },
             (s,v) => { MaxPersistantManifoldPoolSize = v; s.UnmanagedParams[0].maxPersistantManifoldPoolSize = v; } ),
-            new ParameterDefn<float>("MaxCollisionAlgorithmPoolSize", "Number of collisions pooled (0 means default of 4096)",
+        new ParameterDefn<float>("MaxCollisionAlgorithmPoolSize", "Number of collisions pooled (0 means default of 4096)",
             0f,
             (s) => { return MaxCollisionAlgorithmPoolSize; },
             (s,v) => { MaxCollisionAlgorithmPoolSize = v; s.UnmanagedParams[0].maxCollisionAlgorithmPoolSize = v; } ),
-            new ParameterDefn<bool>("ShouldDisableContactPoolDynamicAllocation", "Enable to allow large changes in object count",
+        new ParameterDefn<bool>("ShouldDisableContactPoolDynamicAllocation", "Enable to allow large changes in object count",
             false,
             (s) => { return ShouldDisableContactPoolDynamicAllocation; },
             (s,v) => { ShouldDisableContactPoolDynamicAllocation = v;
                         s.UnmanagedParams[0].shouldDisableContactPoolDynamicAllocation = NumericBool(v); } ),
-            new ParameterDefn<bool>("ShouldForceUpdateAllAabbs", "Enable to recomputer AABBs every simulator step",
+        new ParameterDefn<bool>("ShouldForceUpdateAllAabbs", "Enable to recomputer AABBs every simulator step",
             false,
             (s) => { return ShouldForceUpdateAllAabbs; },
             (s,v) => { ShouldForceUpdateAllAabbs = v; s.UnmanagedParams[0].shouldForceUpdateAllAabbs = NumericBool(v); } ),
-            new ParameterDefn<bool>("ShouldRandomizeSolverOrder", "Enable for slightly better stacking interaction",
+        new ParameterDefn<bool>("ShouldRandomizeSolverOrder", "Enable for slightly better stacking interaction",
             true,
             (s) => { return ShouldRandomizeSolverOrder; },
             (s,v) => { ShouldRandomizeSolverOrder = v; s.UnmanagedParams[0].shouldRandomizeSolverOrder = NumericBool(v); } ),
-            new ParameterDefn<bool>("ShouldSplitSimulationIslands", "Enable splitting active object scanning islands",
+        new ParameterDefn<bool>("ShouldSplitSimulationIslands", "Enable splitting active object scanning islands",
             true,
             (s) => { return ShouldSplitSimulationIslands; },
             (s,v) => { ShouldSplitSimulationIslands = v; s.UnmanagedParams[0].shouldSplitSimulationIslands = NumericBool(v); } ),
-            new ParameterDefn<bool>("ShouldEnableFrictionCaching", "Enable friction computation caching",
+        new ParameterDefn<bool>("ShouldEnableFrictionCaching", "Enable friction computation caching",
             true,
             (s) => { return ShouldEnableFrictionCaching; },
             (s,v) => { ShouldEnableFrictionCaching = v; s.UnmanagedParams[0].shouldEnableFrictionCaching = NumericBool(v); } ),
-            new ParameterDefn<float>("NumberOfSolverIterations", "Number of internal iterations (0 means default)",
+        new ParameterDefn<float>("NumberOfSolverIterations", "Number of internal iterations (0 means default)",
             0f,     // zero says use Bullet default
             (s) => { return NumberOfSolverIterations; },
             (s,v) => { NumberOfSolverIterations = v; s.UnmanagedParams[0].numberOfSolverIterations = v; } ),
-            new ParameterDefn<bool>("UseSingleSidedMeshes", "Whether to compute collisions based on single sided meshes.",
+        new ParameterDefn<bool>("UseSingleSidedMeshes", "Whether to compute collisions based on single sided meshes.",
             true,
             (s) => { return UseSingleSidedMeshes; },
             (s,v) => { UseSingleSidedMeshes = v; s.UnmanagedParams[0].useSingleSidedMeshes = NumericBool(v); } ),
-            new ParameterDefn<float>("GlobalContactBreakingThreshold", "Amount of shape radius before breaking a collision contact (0 says Bullet default (0.2))",
+        new ParameterDefn<float>("GlobalContactBreakingThreshold", "Amount of shape radius before breaking a collision contact (0 says Bullet default (0.2))",
             0f,
             (s) => { return GlobalContactBreakingThreshold; },
             (s,v) => { GlobalContactBreakingThreshold = v; s.UnmanagedParams[0].globalContactBreakingThreshold = v; } ),
-            new ParameterDefn<float>("PhysicsUnmanLoggingFrames", "If non-zero, frames between output of detailed unmanaged physics statistics",
+        new ParameterDefn<float>("PhysicsUnmanLoggingFrames", "If non-zero, frames between output of detailed unmanaged physics statistics",
             0f,
             (s) => { return PhysicsUnmanLoggingFrames; },
             (s,v) => { PhysicsUnmanLoggingFrames = v; s.UnmanagedParams[0].physicsLoggingFrames = v; } ),
 
-            new ParameterDefn<int>("CSHullMaxDepthSplit", "CS impl: max depth to split for hull. 1-10 but > 7 is iffy",
+        new ParameterDefn<int>("CSHullMaxDepthSplit", "CS impl: max depth to split for hull. 1-10 but > 7 is iffy",
             7 ),
-            new ParameterDefn<int>("CSHullMaxDepthSplitForSimpleShapes", "CS impl: max depth setting for simple prim shapes",
+        new ParameterDefn<int>("CSHullMaxDepthSplitForSimpleShapes", "CS impl: max depth setting for simple prim shapes",
             2 ),
-            new ParameterDefn<float>("CSHullConcavityThresholdPercent", "CS impl: concavity threshold percent (0-20)",
+        new ParameterDefn<float>("CSHullConcavityThresholdPercent", "CS impl: concavity threshold percent (0-20)",
             5f ),
-            new ParameterDefn<float>("CSHullVolumeConservationThresholdPercent", "percent volume conservation to collapse hulls (0-30)",
+        new ParameterDefn<float>("CSHullVolumeConservationThresholdPercent", "percent volume conservation to collapse hulls (0-30)",
             5f ),
-            new ParameterDefn<int>("CSHullMaxVertices", "CS impl: maximum number of vertices in output hulls. Keep < 50.",
+        new ParameterDefn<int>("CSHullMaxVertices", "CS impl: maximum number of vertices in output hulls. Keep < 50.",
             32 ),
-            new ParameterDefn<float>("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
+        new ParameterDefn<float>("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
             0f ),
 
-            new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
+        new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
             200f ),
-            new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
+        new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
             10f ),
-            new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
+        new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
             20f ),
-            new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
+        new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
             0.1f ),
-            new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
+        new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
             10f ),
-            new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
+        new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
             true ),
-            new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
+        new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
             true ),
-            new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
+        new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
             true ),
-            new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
+        new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
             false ),
 
-            new ParameterDefn<float>("WhichHACD", "zero if Bullet HACD, non-zero says VHACD",
+        new ParameterDefn<float>("WhichHACD", "zero if Bullet HACD, non-zero says VHACD",
             0f ),
-            new ParameterDefn<float>("VHACDresolution", "max number of voxels generated during voxelization stage",
+        new ParameterDefn<float>("VHACDresolution", "max number of voxels generated during voxelization stage",
             100000f ),
-            new ParameterDefn<float>("VHACDdepth", "max number of clipping stages",
+        new ParameterDefn<float>("VHACDdepth", "max number of clipping stages",
             20f ),
-            new ParameterDefn<float>("VHACDconcavity", "maximum concavity",
+        new ParameterDefn<float>("VHACDconcavity", "maximum concavity",
             0.0025f ),
-            new ParameterDefn<float>("VHACDplaneDownsampling", "granularity of search for best clipping plane",
+        new ParameterDefn<float>("VHACDplaneDownsampling", "granularity of search for best clipping plane",
             4f ),
-            new ParameterDefn<float>("VHACDconvexHullDownsampling", "precision of hull gen process",
+        new ParameterDefn<float>("VHACDconvexHullDownsampling", "precision of hull gen process",
             4f ),
-            new ParameterDefn<float>("VHACDalpha", "bias toward clipping along symmetry planes",
+        new ParameterDefn<float>("VHACDalpha", "bias toward clipping along symmetry planes",
             0.05f ),
-            new ParameterDefn<float>("VHACDbeta", "bias toward clipping along revolution axis",
+        new ParameterDefn<float>("VHACDbeta", "bias toward clipping along revolution axis",
             0.05f ),
-            new ParameterDefn<float>("VHACDgamma", "max concavity when merging",
+        new ParameterDefn<float>("VHACDgamma", "max concavity when merging",
             0.00125f ),
-            new ParameterDefn<float>("VHACDpca", "on/off normalizing mesh before decomp",
+        new ParameterDefn<float>("VHACDpca", "on/off normalizing mesh before decomp",
             0f ),
-            new ParameterDefn<float>("VHACDmode", "0:voxel based, 1: tetrahedron based",
+        new ParameterDefn<float>("VHACDmode", "0:voxel based, 1: tetrahedron based",
             0f ),
-            new ParameterDefn<float>("VHACDmaxNumVerticesPerCH", "max triangles per convex hull",
+        new ParameterDefn<float>("VHACDmaxNumVerticesPerCH", "max triangles per convex hull",
             64f ),
-            new ParameterDefn<float>("VHACDminVolumePerCH",     "sampling of generated convex hulls",
+        new ParameterDefn<float>("VHACDminVolumePerCH", "sampling of generated convex hulls",
             0.0001f ),
 
-            new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
+        new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound ),
-            new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
+        new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
             true ),
-            new ParameterDefn<bool>("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
+        new ParameterDefn<bool>("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
             false ),
-            new ParameterDefn<bool>("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
+        new ParameterDefn<bool>("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
             true ),
-            new ParameterDefn<float>("LinkConstraintTransMotorMaxVel", "Maximum velocity to be applied by translational motor in linkset constraints",
+        new ParameterDefn<float>("LinkConstraintTransMotorMaxVel", "Maximum velocity to be applied by translational motor in linkset constraints",
             5.0f ),
-            new ParameterDefn<float>("LinkConstraintTransMotorMaxForce", "Maximum force to be applied by translational motor in linkset constraints",
+        new ParameterDefn<float>("LinkConstraintTransMotorMaxForce", "Maximum force to be applied by translational motor in linkset constraints",
             0.1f ),
-            new ParameterDefn<float>("LinkConstraintCFM", "Amount constraint can be violated. 0=no violation, 1=infinite. Default=0.1",
+        new ParameterDefn<float>("LinkConstraintCFM", "Amount constraint can be violated. 0=no violation, 1=infinite. Default=0.1",
             0.1f ),
-            new ParameterDefn<float>("LinkConstraintERP", "Amount constraint is corrected each tick. 0=none, 1=all. Default = 0.2",
+        new ParameterDefn<float>("LinkConstraintERP", "Amount constraint is corrected each tick. 0=none, 1=all. Default = 0.2",
             0.1f ),
-            new ParameterDefn<float>("LinkConstraintSolverIterations", "Number of solver iterations when computing constraint. (0 = Bullet default)",
+        new ParameterDefn<float>("LinkConstraintSolverIterations", "Number of solver iterations when computing constraint. (0 = Bullet default)",
             40 ),
 
-            new ParameterDefn<float>("DebugNumber", "A console setable number sometimes used for debugging",
+        new ParameterDefn<float>("DebugNumber", "A console setable number sometimes used for debugging",
             1.0f ),
 
         new ParameterDefn<int>("PhysicsMetricFrames", "Frames between outputting detailed phys metrics. (0 is off)",
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
index a846869..6aa24d5 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
@@ -317,10 +317,10 @@ public abstract class BSPhysObject : PhysicsActor
 
     public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
 
-    public override bool PIDActive 
+    public override bool PIDActive
     {
         get { return MoveToTargetActive; }
-        set { MoveToTargetActive = value; } 
+        set { MoveToTargetActive = value; }
     }
 
     public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
@@ -572,7 +572,7 @@ public abstract class BSPhysObject : PhysicsActor
             newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal);
             // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}",
             //         LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed);
-                    
+
             lock (PhysScene.CollisionLock)
             {
                 CollisionCollection.AddCollider(collideeLocalID, newContact);
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
index db2b9db..b153761 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
@@ -1144,14 +1144,14 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    public override bool PIDActive 
+    public override bool PIDActive
     {
         get
         {
             return MoveToTargetActive;
         }
 
-        set 
+        set
         {
             MoveToTargetActive = value;
 
@@ -1179,13 +1179,13 @@ public class BSPrim : BSPhysObject
                 // if the actor exists, tell it to refresh its values.
                 actor.Refresh();
             }
-            
+
         }
     }
     // Used for llSetHoverHeight and maybe vehicle height
     // Hover Height will override MoveTo target's Z
     public override bool PIDHoverActive {
-        get 
+        get
         {
         return base.HoverActive;
         }
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
index ee57f0c..7ff0a07 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
@@ -351,12 +351,12 @@ namespace OpenSim.Region.PhysicsModule.BulletS
             if (BSParam.UseSeparatePhysicsThread)
             {
                 // The physics simulation should happen independently of the heartbeat loop
-                m_physicsThread 
+                m_physicsThread
                     = WorkManager.StartThread(
-                        BulletSPluginPhysicsThread, 
-                        string.Format("{0} ({1})", BulletEngineName, RegionName), 
-                        ThreadPriority.Normal, 
-                        true, 
+                        BulletSPluginPhysicsThread,
+                        string.Format("{0} ({1})", BulletEngineName, RegionName),
+                        ThreadPriority.Normal,
+                        true,
                         true);
             }
         }
diff --git a/OpenSim/Region/PhysicsModules/BulletS/ExtendedPhysics.cs b/OpenSim/Region/PhysicsModules/BulletS/ExtendedPhysics.cs
index 2ba3c5a..ab5d4849 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/ExtendedPhysics.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/ExtendedPhysics.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS
 
                 return;
             }
- 
+
             // Register as LSL functions all the [ScriptInvocation] marked methods.
             Comms.RegisterScriptInvocations(this);
             Comms.RegisterConstants(this);
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs
index 6ed7af1..91ce468 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/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.Region.Physics.BulletSPlugin")]
@@ -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/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
index 109e19c..3e8c1cd 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
@@ -80,7 +80,7 @@ public static class BulletSimTestsUtil
         }
 
         Vector3 regionExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
-       
+
         RegionInfo info = new RegionInfo();
         info.RegionName = "BSTestRegion";
         info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize;
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
index c0cf19a..c2be568 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
@@ -146,7 +146,7 @@ public class HullCreation : OpenSimTestCase
         uint torusLocalID = 125;
         PhysicsScene.AddPrimShape("testTorus", pbs, pos, size, rot, isPhys, torusLocalID);
         BSPrim primTypeTorus = (BSPrim)PhysicsScene.PhysObjects[torusLocalID];
-        
+
         // The actual prim shape creation happens at taint time
         PhysicsScene.ProcessTaints();
 
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
index 3d81439..bd1f75e 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -246,13 +246,13 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
         }
 
         private static float DistToPt(float3 p, float4 plane)
-            {
-                    float x = p.x;
-                    float y = p.y;
-                    float z = p.z;
-                    float d = x*plane.x + y*plane.y + z*plane.z + plane.w;
-                    return d;
-            }
+        {
+            float x = p.x;
+            float y = p.y;
+            float z = p.z;
+            float d = x*plane.x + y*plane.y + z*plane.z + plane.w;
+            return d;
+        }
 
         private static void intersect(float3 p1, float3 p2, ref float3 split, float4 plane)
         {
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
index 6a98535..0d22d71 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
index 4480036..810e95d 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
index e6dc98a..a382f9d 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
index 09129ed..300fed3 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
index 7d342d1..73fb252 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
index 66457ac..6e73fd5 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
index 72f2d6d..cf7161a 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -763,7 +763,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                     }
                     else if ((vertflag[edge0.v].planetest | vertflag[edge1.v].planetest) == (0))
                     {
-                        // both endpoints coplanar 
+                        // both endpoints coplanar
                         // must check a 3rd point to see if UNDER
                         int e2 = e1 + 1;
                         if (e2 >= convex.edges.Count || convex.edges[e2].p != currentplane)
@@ -792,7 +792,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                     }
                     else if (vertflag[edge0.v].planetest == (1) && vertflag[edge1.v].planetest == (2))
                     {
-                        // first is under 2nd is over 
+                        // first is under 2nd is over
 
                         edgeflag[e0].undermap = (short)under_edge_count;
                         tmpunderedges[under_edge_count].v = vertflag[edge0.v].undermap;
@@ -815,7 +815,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                             vout = vertcountunder++;
                         }
                         under_edge_count++;
-                        /// hmmm something to think about: i might be able to output this edge regarless of 
+                        /// hmmm something to think about: i might be able to output this edge regarless of
                         // wheter or not we know v-in yet.  ok i;ll try this now:
                         tmpunderedges[under_edge_count].v = (byte)vout;
                         tmpunderedges[under_edge_count].p = (byte)underplanescount;
@@ -834,7 +834,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                     }
                     else if (vertflag[edge0.v].planetest == (0) && vertflag[edge1.v].planetest == (2))
                     {
-                        // first is coplanar 2nd is over 
+                        // first is coplanar 2nd is over
 
                         edgeflag[e0].undermap = -1;
                         vout = vertflag[edge0.v].undermap;
@@ -858,7 +858,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                     }
                     else if (vertflag[edge0.v].planetest == (2) && vertflag[edge1.v].planetest == (1))
                     {
-                        // first is over next is under 
+                        // first is over next is under
                         // new vertex!!!
                         Debug.Assert(vin == -1);
                         if (e0 < edge0.ea)
@@ -901,7 +901,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                     }
                     else if (vertflag[edge0.v].planetest == (2) && vertflag[edge1.v].planetest == (0))
                     {
-                        // first is over next is coplanar 
+                        // first is over next is coplanar
 
                         edgeflag[e0].undermap = -1;
                         vin = vertflag[edge1.v].undermap;
@@ -1543,7 +1543,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
         public static bool ComputeHull(List<float3> vertices, out List<int> indices)
         {
             List<HullTriangle> tris = new List<HullTriangle>();
-            
+
             bool ret = calchull(vertices, out indices, 0, tris);
             if (ret == false)
             {
@@ -1636,7 +1636,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                 addPoint(ref vcount, vertices, x2, y2, z2);
                 addPoint(ref vcount, vertices, x1, y2, z2);
 
-                return true; // return cube     
+                return true; // return cube
             }
             else
             {
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
index f58cad6..0f10e5f 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
index 8f08ddf..5915c29 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
index e9ff26e..9b418d6 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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("ConvexDecompositionDotNet")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,11 +25,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
index 2d72117..571677d 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -126,9 +126,9 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
         }
 
         public static Quaternion operator *(Quaternion a, float b)
-            {
-                    return new Quaternion(a.x *b, a.y *b, a.z *b, a.w *b);
-            }
+        {
+            return new Quaternion(a.x *b, a.y *b, a.z *b, a.w *b);
+        }
 
         public static Quaternion normalize(Quaternion a)
         {
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
index cc5f99c..d8c10c7 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
index da2255e..915bec6 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
index 2a58ec4..c2c8940 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
index 64a9ef8..1ea003b 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
index 266ed0b..4b6cd5d 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
index 058934d..1f2ab02 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
index 58f4f58..85a8cf1 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -127,88 +127,88 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
         }
 
         public static float4x4 Inverse(float4x4 m)
-            {
-                    float4x4 d = new float4x4();
-                    //float dst = d.x.x;
-                    float[] tmp = new float[12]; // temp array for pairs
-                    float[] src = new float[16]; // array of transpose source matrix
-                    float det; // determinant
-                    // transpose matrix
-                    for (int i = 0; i < 4; i++)
-                    {
-                            src[i] = m[i].x;
-                            src[i + 4] = m[i].y;
-                            src[i + 8] = m[i].z;
-                            src[i + 12] = m[i].w;
-                    }
-                    // calculate pairs for first 8 elements (cofactors)
-                    tmp[0] = src[10] * src[15];
-                    tmp[1] = src[11] * src[14];
-                    tmp[2] = src[9] * src[15];
-                    tmp[3] = src[11] * src[13];
-                    tmp[4] = src[9] * src[14];
-                    tmp[5] = src[10] * src[13];
-                    tmp[6] = src[8] * src[15];
-                    tmp[7] = src[11] * src[12];
-                    tmp[8] = src[8] * src[14];
-                    tmp[9] = src[10] * src[12];
-                    tmp[10] = src[8] * src[13];
-                    tmp[11] = src[9] * src[12];
-                    // calculate first 8 elements (cofactors)
-                    d.x.x = tmp[0]*src[5] + tmp[3]*src[6] + tmp[4]*src[7];
-                    d.x.x -= tmp[1]*src[5] + tmp[2]*src[6] + tmp[5]*src[7];
-                    d.x.y = tmp[1]*src[4] + tmp[6]*src[6] + tmp[9]*src[7];
-                    d.x.y -= tmp[0]*src[4] + tmp[7]*src[6] + tmp[8]*src[7];
-                    d.x.z = tmp[2]*src[4] + tmp[7]*src[5] + tmp[10]*src[7];
-                    d.x.z -= tmp[3]*src[4] + tmp[6]*src[5] + tmp[11]*src[7];
-                    d.x.w = tmp[5]*src[4] + tmp[8]*src[5] + tmp[11]*src[6];
-                    d.x.w -= tmp[4]*src[4] + tmp[9]*src[5] + tmp[10]*src[6];
-                    d.y.x = tmp[1]*src[1] + tmp[2]*src[2] + tmp[5]*src[3];
-                    d.y.x -= tmp[0]*src[1] + tmp[3]*src[2] + tmp[4]*src[3];
-                    d.y.y = tmp[0]*src[0] + tmp[7]*src[2] + tmp[8]*src[3];
-                    d.y.y -= tmp[1]*src[0] + tmp[6]*src[2] + tmp[9]*src[3];
-                    d.y.z = tmp[3]*src[0] + tmp[6]*src[1] + tmp[11]*src[3];
-                    d.y.z -= tmp[2]*src[0] + tmp[7]*src[1] + tmp[10]*src[3];
-                    d.y.w = tmp[4]*src[0] + tmp[9]*src[1] + tmp[10]*src[2];
-                    d.y.w -= tmp[5]*src[0] + tmp[8]*src[1] + tmp[11]*src[2];
-                    // calculate pairs for second 8 elements (cofactors)
-                    tmp[0] = src[2]*src[7];
-                    tmp[1] = src[3]*src[6];
-                    tmp[2] = src[1]*src[7];
-                    tmp[3] = src[3]*src[5];
-                    tmp[4] = src[1]*src[6];
-                    tmp[5] = src[2]*src[5];
-                    tmp[6] = src[0]*src[7];
-                    tmp[7] = src[3]*src[4];
-                    tmp[8] = src[0]*src[6];
-                    tmp[9] = src[2]*src[4];
-                    tmp[10] = src[0]*src[5];
-                    tmp[11] = src[1]*src[4];
-                    // calculate second 8 elements (cofactors)
-                    d.z.x = tmp[0]*src[13] + tmp[3]*src[14] + tmp[4]*src[15];
-                    d.z.x -= tmp[1]*src[13] + tmp[2]*src[14] + tmp[5]*src[15];
-                    d.z.y = tmp[1]*src[12] + tmp[6]*src[14] + tmp[9]*src[15];
-                    d.z.y -= tmp[0]*src[12] + tmp[7]*src[14] + tmp[8]*src[15];
-                    d.z.z = tmp[2]*src[12] + tmp[7]*src[13] + tmp[10]*src[15];
-                    d.z.z -= tmp[3]*src[12] + tmp[6]*src[13] + tmp[11]*src[15];
-                    d.z.w = tmp[5]*src[12] + tmp[8]*src[13] + tmp[11]*src[14];
-                    d.z.w-= tmp[4]*src[12] + tmp[9]*src[13] + tmp[10]*src[14];
-                    d.w.x = tmp[2]*src[10] + tmp[5]*src[11] + tmp[1]*src[9];
-                    d.w.x-= tmp[4]*src[11] + tmp[0]*src[9] + tmp[3]*src[10];
-                    d.w.y = tmp[8]*src[11] + tmp[0]*src[8] + tmp[7]*src[10];
-                    d.w.y-= tmp[6]*src[10] + tmp[9]*src[11] + tmp[1]*src[8];
-                    d.w.z = tmp[6]*src[9] + tmp[11]*src[11] + tmp[3]*src[8];
-                    d.w.z-= tmp[10]*src[11] + tmp[2]*src[8] + tmp[7]*src[9];
-                    d.w.w = tmp[10]*src[10] + tmp[4]*src[8] + tmp[9]*src[9];
-                    d.w.w-= tmp[8]*src[9] + tmp[11]*src[10] + tmp[5]*src[8];
-                    // calculate determinant
+        {
+            float4x4 d = new float4x4();
+            //float dst = d.x.x;
+            float[] tmp = new float[12]; // temp array for pairs
+            float[] src = new float[16]; // array of transpose source matrix
+            float det; // determinant
+            // transpose matrix
+            for (int i = 0; i < 4; i++)
+            {
+                src[i] = m[i].x;
+                src[i + 4] = m[i].y;
+                src[i + 8] = m[i].z;
+                src[i + 12] = m[i].w;
+            }
+            // calculate pairs for first 8 elements (cofactors)
+            tmp[0] = src[10] * src[15];
+            tmp[1] = src[11] * src[14];
+            tmp[2] = src[9] * src[15];
+            tmp[3] = src[11] * src[13];
+            tmp[4] = src[9] * src[14];
+            tmp[5] = src[10] * src[13];
+            tmp[6] = src[8] * src[15];
+            tmp[7] = src[11] * src[12];
+            tmp[8] = src[8] * src[14];
+            tmp[9] = src[10] * src[12];
+            tmp[10] = src[8] * src[13];
+            tmp[11] = src[9] * src[12];
+            // calculate first 8 elements (cofactors)
+            d.x.x = tmp[0]*src[5] + tmp[3]*src[6] + tmp[4]*src[7];
+            d.x.x -= tmp[1]*src[5] + tmp[2]*src[6] + tmp[5]*src[7];
+            d.x.y = tmp[1]*src[4] + tmp[6]*src[6] + tmp[9]*src[7];
+            d.x.y -= tmp[0]*src[4] + tmp[7]*src[6] + tmp[8]*src[7];
+            d.x.z = tmp[2]*src[4] + tmp[7]*src[5] + tmp[10]*src[7];
+            d.x.z -= tmp[3]*src[4] + tmp[6]*src[5] + tmp[11]*src[7];
+            d.x.w = tmp[5]*src[4] + tmp[8]*src[5] + tmp[11]*src[6];
+            d.x.w -= tmp[4]*src[4] + tmp[9]*src[5] + tmp[10]*src[6];
+            d.y.x = tmp[1]*src[1] + tmp[2]*src[2] + tmp[5]*src[3];
+            d.y.x -= tmp[0]*src[1] + tmp[3]*src[2] + tmp[4]*src[3];
+            d.y.y = tmp[0]*src[0] + tmp[7]*src[2] + tmp[8]*src[3];
+            d.y.y -= tmp[1]*src[0] + tmp[6]*src[2] + tmp[9]*src[3];
+            d.y.z = tmp[3]*src[0] + tmp[6]*src[1] + tmp[11]*src[3];
+            d.y.z -= tmp[2]*src[0] + tmp[7]*src[1] + tmp[10]*src[3];
+            d.y.w = tmp[4]*src[0] + tmp[9]*src[1] + tmp[10]*src[2];
+            d.y.w -= tmp[5]*src[0] + tmp[8]*src[1] + tmp[11]*src[2];
+            // calculate pairs for second 8 elements (cofactors)
+            tmp[0] = src[2]*src[7];
+            tmp[1] = src[3]*src[6];
+            tmp[2] = src[1]*src[7];
+            tmp[3] = src[3]*src[5];
+            tmp[4] = src[1]*src[6];
+            tmp[5] = src[2]*src[5];
+            tmp[6] = src[0]*src[7];
+            tmp[7] = src[3]*src[4];
+            tmp[8] = src[0]*src[6];
+            tmp[9] = src[2]*src[4];
+            tmp[10] = src[0]*src[5];
+            tmp[11] = src[1]*src[4];
+            // calculate second 8 elements (cofactors)
+            d.z.x = tmp[0]*src[13] + tmp[3]*src[14] + tmp[4]*src[15];
+            d.z.x -= tmp[1]*src[13] + tmp[2]*src[14] + tmp[5]*src[15];
+            d.z.y = tmp[1]*src[12] + tmp[6]*src[14] + tmp[9]*src[15];
+            d.z.y -= tmp[0]*src[12] + tmp[7]*src[14] + tmp[8]*src[15];
+            d.z.z = tmp[2]*src[12] + tmp[7]*src[13] + tmp[10]*src[15];
+            d.z.z -= tmp[3]*src[12] + tmp[6]*src[13] + tmp[11]*src[15];
+            d.z.w = tmp[5]*src[12] + tmp[8]*src[13] + tmp[11]*src[14];
+            d.z.w-= tmp[4]*src[12] + tmp[9]*src[13] + tmp[10]*src[14];
+            d.w.x = tmp[2]*src[10] + tmp[5]*src[11] + tmp[1]*src[9];
+            d.w.x-= tmp[4]*src[11] + tmp[0]*src[9] + tmp[3]*src[10];
+            d.w.y = tmp[8]*src[11] + tmp[0]*src[8] + tmp[7]*src[10];
+            d.w.y-= tmp[6]*src[10] + tmp[9]*src[11] + tmp[1]*src[8];
+            d.w.z = tmp[6]*src[9] + tmp[11]*src[11] + tmp[3]*src[8];
+            d.w.z-= tmp[10]*src[11] + tmp[2]*src[8] + tmp[7]*src[9];
+            d.w.w = tmp[10]*src[10] + tmp[4]*src[8] + tmp[9]*src[9];
+            d.w.w-= tmp[8]*src[9] + tmp[11]*src[10] + tmp[5]*src[8];
+            // calculate determinant
             det = src[0] * d.x.x + src[1] * d.x.y + src[2] * d.x.z + src[3] * d.x.w;
-                    // calculate matrix inverse
-                    det = 1/det;
+            // calculate matrix inverse
+            det = 1/det;
             for (int j = 0; j < 4; j++)
                 d[j] *= det;
-                    return d;
-            }
+            return d;
+        }
 
         public static float4x4 MatrixRigidInverse(float4x4 m)
         {
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
index b3d4ecb..e7bb6e7 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
index 41e0912..9950be2 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
@@ -1,21 +1,21 @@
 /* The MIT License
- * 
+ *
  * Copyright (c) 2010 Intel Corporation.
  * All rights reserved.
  *
- * Based on the convexdecomposition library from 
+ * Based on the convexdecomposition library from
  * <http://codesuppository.googlecode.com> by John W. Ratcliff and Stan Melax.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs
index e63ad01..42ba37e 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs
@@ -102,8 +102,8 @@ namespace OpenSim.Region.PhysicsModule.Meshing
             if ((triangle.v1.X == triangle.v2.X && triangle.v1.Y == triangle.v2.Y && triangle.v1.Z == triangle.v2.Z)
                 || (triangle.v1.X == triangle.v3.X && triangle.v1.Y == triangle.v3.Y && triangle.v1.Z == triangle.v3.Z)
                 || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == triangle.v3.Z)
-                )               
-            {               
+                )
+            {
                 return;
             }
 
@@ -259,7 +259,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         public void getVertexListAsPtrToFloatArray(out IntPtr vertices, out int vertexStride, out int vertexCount)
         {
             // A vertex is 3 floats
-            
+
             vertexStride = 3 * sizeof(float);
 
             // If there isn't an unmanaged array allocated yet, do it now
@@ -299,7 +299,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         {
             if (m_pinnedIndex.IsAllocated)
                 return (int[])(m_pinnedIndex.Target);
-        
+
             int[] result = getIndexListAsInt();
             m_pinnedIndex = GCHandle.Alloc(result, GCHandleType.Pinned);
             // Inform the garbage collector of this unmanaged allocation so it can schedule
@@ -357,7 +357,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         {
             if (m_pinnedIndex.IsAllocated || m_pinnedVertexes.IsAllocated || m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
                 throw new NotSupportedException("Attempt to Append to a pinned Mesh");
-        
+
             if (!(newMesh is Mesh))
                 return;
 
@@ -370,7 +370,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         {
             if (m_pinnedIndex.IsAllocated || m_pinnedVertexes.IsAllocated || m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
                 throw new NotSupportedException("Attempt to TransformLinear a pinned Mesh");
-        
+
             foreach (Vertex v in m_vertices.Keys)
             {
                 if (v == null)
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
index 0d22e96..4f95554 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
@@ -247,13 +247,13 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         private void AddSubMesh(OSDMap subMeshData, Vector3 size, List<Coord> coords, List<Face> faces)
         {
     //                                    Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap));
-    
+
             // As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some Mesh Level
             // of Detail Blocks (maps) contain just a NoGeometry key to signal there is no
             // geometry for this submesh.
             if (subMeshData.ContainsKey("NoGeometry") && ((OSDBoolean)subMeshData["NoGeometry"]))
                 return;
-    
+
             OpenMetaverse.Vector3 posMax = ((OSDMap)subMeshData["PositionDomain"])["Max"].AsVector3();
             OpenMetaverse.Vector3 posMin = ((OSDMap)subMeshData["PositionDomain"])["Min"].AsVector3();
             ushort faceIndexOffset = (ushort)coords.Count;
@@ -264,15 +264,15 @@ namespace OpenSim.Region.PhysicsModule.Meshing
                 ushort uX = Utils.BytesToUInt16(posBytes, i);
                 ushort uY = Utils.BytesToUInt16(posBytes, i + 2);
                 ushort uZ = Utils.BytesToUInt16(posBytes, i + 4);
-    
+
                 Coord c = new Coord(
                 Utils.UInt16ToFloat(uX, posMin.X, posMax.X) * size.X,
                 Utils.UInt16ToFloat(uY, posMin.Y, posMax.Y) * size.Y,
                 Utils.UInt16ToFloat(uZ, posMin.Z, posMax.Z) * size.Z);
-    
+
                 coords.Add(c);
             }
-    
+
             byte[] triangleBytes = subMeshData["TriangleList"].AsBinary();
             for (int i = 0; i < triangleBytes.Length; i += 6)
             {
@@ -436,9 +436,9 @@ namespace OpenSim.Region.PhysicsModule.Meshing
                             int convexSize = convexBlock["size"].AsInteger();
 
                             byte[] convexBytes = new byte[convexSize];
-                            
+
                             System.Buffer.BlockCopy(primShape.SculptData, convexOffset, convexBytes, 0, convexSize);
-                            
+
                             try
                             {
                                 convexBlockOsd = DecompressOsd(convexBytes);
@@ -449,7 +449,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
                                 //return false;
                             }
                         }
-                        
+
                         if (convexBlockOsd != null && convexBlockOsd is OSDMap)
                         {
                             convexBlock = convexBlockOsd as OSDMap;
@@ -762,7 +762,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
         {
             PrimMesh primMesh;
             coords = new List<Coord>();
-            faces = new List<Face>();            
+            faces = new List<Face>();
 
             float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
             float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
@@ -994,7 +994,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
                 if ((!isPhysical) && size.X < minSizeForComplexMesh && size.Y < minSizeForComplexMesh && size.Z < minSizeForComplexMesh)
                 {
 #if SPAM
-                m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + 
+                m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " +
                             minSizeForComplexMesh.ToString() + " - creating simple bounding box");
 #endif
                     mesh = CreateBoundingBoxMesh(mesh);
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/PrimMesher.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/PrimMesher.cs
index 4049ee1..fd2b1ea 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/PrimMesher.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/PrimMesher.cs
@@ -445,7 +445,7 @@ namespace PrimMesher
             new Angle(1.0f, 1.0f, 0.0f)
         };
 
-        private static Coord[] normals4 = 
+        private static Coord[] normals4 =
         {
             new Coord(0.5f, 0.5f, 0.0f).Normalize(),
             new Coord(-0.5f, 0.5f, 0.0f).Normalize(),
@@ -2066,7 +2066,7 @@ namespace PrimMesher
         /// DEPRICATED - use Extrude(PathType.Linear) instead
         /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.
         /// </summary>
-        /// 
+        ///
         public void ExtrudeLinear()
         {
             this.Extrude(PathType.Linear);
@@ -2077,7 +2077,7 @@ namespace PrimMesher
         /// DEPRICATED - use Extrude(PathType.Circular) instead
         /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.
         /// </summary>
-        /// 
+        ///
         public void ExtrudeCircular()
         {
             this.Extrude(PathType.Circular);
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/SculptMap.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/SculptMap.cs
index b3d9cb6..01d11f4 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/SculptMap.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/SculptMap.cs
@@ -163,11 +163,11 @@ namespace PrimMesher
         {
 
             Bitmap scaledImage = new Bitmap(destWidth, destHeight, PixelFormat.Format24bppRgb);
-            
+
             Color c;
             float xscale = srcImage.Width / destWidth;
             float yscale = srcImage.Height / destHeight;
-            
+
             float sy = 0.5f;
             for (int y = 0; y < destHeight; y++)
             {
@@ -191,7 +191,7 @@ namespace PrimMesher
             return scaledImage;
         }
 
-    }        
-    
+    }
+
     }
 #endif
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
index 8a842d4..5c257e6 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/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.Region.PhysicsModule.Meshing")]
@@ -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/Region/PhysicsModules/Ode/ODEApi.cs b/OpenSim/Region/PhysicsModules/Ode/ODEApi.cs
index 12086c8..c851b12 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEApi.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEApi.cs
@@ -34,8 +34,8 @@ 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.
- * 
- * changes by opensim team; 
+ *
+ * changes by opensim team;
  * changes by Aurora team http://www.aurora-sim.org/
  * changes by Ubit Umarov
  */
@@ -52,18 +52,18 @@ namespace OpenSim.Region.PhysicsModule.ODE
 // at least we save same memory and memory access time, FPU performance on intel usually is similar
 //      using dReal = System.Double;
 //#else
-        using dReal = System.Single;
+    using dReal = System.Single;
 //#endif
 
-        public static class d
-        {
-                public static dReal Infinity = dReal.MaxValue;
+    public static class d
+    {
+        public static dReal Infinity = dReal.MaxValue;
         public static int NTotalBodies = 0;
         public static int NTotalGeoms = 0;
 
         public const uint CONTACTS_UNIMPORTANT = 0x80000000;
 
-                #region Flags and Enumerations
+        #region Flags and Enumerations
 
         [Flags]
         public enum AllocateODEDataFlags : uint
@@ -79,101 +79,101 @@ namespace OpenSim.Region.PhysicsModule.ODE
             dInitFlagManualThreadCleanup = 0x00000001
         }
 
-                [Flags]
-                public enum ContactFlags : int
-                {
-                        Mu2 = 0x001,
-                        FDir1 = 0x002,
-                        Bounce = 0x004,
-                        SoftERP = 0x008,
-                        SoftCFM = 0x010,
-                        Motion1 = 0x020,
-                        Motion2 = 0x040,
+        [Flags]
+        public enum ContactFlags : int
+        {
+            Mu2 = 0x001,
+            FDir1 = 0x002,
+            Bounce = 0x004,
+            SoftERP = 0x008,
+            SoftCFM = 0x010,
+            Motion1 = 0x020,
+            Motion2 = 0x040,
             MotionN = 0x080,
-                        Slip1 = 0x100,
-                        Slip2 = 0x200,
-                        Approx0 = 0x0000,
-                        Approx1_1 = 0x1000,
-                        Approx1_2 = 0x2000,
-                        Approx1 = 0x3000
-                }
-
-                public enum GeomClassID : int
-                {
-                        SphereClass,
-                        BoxClass,
-                        CapsuleClass,
-                        CylinderClass,
-                        PlaneClass,
-                        RayClass,
-                        ConvexClass,
-                        GeomTransformClass,
-                        TriMeshClass,
+            Slip1 = 0x100,
+            Slip2 = 0x200,
+            Approx0 = 0x0000,
+            Approx1_1 = 0x1000,
+            Approx1_2 = 0x2000,
+            Approx1 = 0x3000
+        }
+
+        public enum GeomClassID : int
+        {
+            SphereClass,
+            BoxClass,
+            CapsuleClass,
+            CylinderClass,
+            PlaneClass,
+            RayClass,
+            ConvexClass,
+            GeomTransformClass,
+            TriMeshClass,
             HeightfieldClass,
-                        FirstSpaceClass,
-                        SimpleSpaceClass = FirstSpaceClass,
-                        HashSpaceClass,
-                        QuadTreeSpaceClass,
-                        LastSpaceClass = QuadTreeSpaceClass,
+            FirstSpaceClass,
+            SimpleSpaceClass = FirstSpaceClass,
+            HashSpaceClass,
+            QuadTreeSpaceClass,
+            LastSpaceClass = QuadTreeSpaceClass,
             ubtTerrainClass,
-                        FirstUserClass,
-                        LastUserClass = FirstUserClass + MaxUserClasses - 1,
-                        NumClasses,
-                        MaxUserClasses = 5
-                }
-
-                public enum JointType : int
-                {
-                        None,
-                        Ball,
-                        Hinge,
-                        Slider,
-                        Contact,
-                        Universal,
-                        Hinge2,
-                        Fixed,
-                        Null,
-                        AMotor,
-                        LMotor,
-                        Plane2D
-                }
-
-                public enum JointParam : int
-                {
-                        LoStop,
-                        HiStop,
-                        Vel,
-                        FMax,
-                        FudgeFactor,
-                        Bounce,
-                        CFM,
-                        StopERP,
-                        StopCFM,
-                        SuspensionERP,
-                        SuspensionCFM,
-                        LoStop2 = 256,
-                        HiStop2,
-                        Vel2,
-                        FMax2,
-                        FudgeFactor2,
-                        Bounce2,
-                        CFM2,
-                        StopERP2,
-                        StopCFM2,
-                        SuspensionERP2,
-                        SuspensionCFM2,
-                        LoStop3 = 512,
-                        HiStop3,
-                        Vel3,
-                        FMax3,
-                        FudgeFactor3,
-                        Bounce3,
-                        CFM3,
-                        StopERP3,
-                        StopCFM3,
-                        SuspensionERP3,
-                        SuspensionCFM3
-                }
+            FirstUserClass,
+            LastUserClass = FirstUserClass + MaxUserClasses - 1,
+            NumClasses,
+            MaxUserClasses = 5
+        }
+
+        public enum JointType : int
+        {
+            None,
+            Ball,
+            Hinge,
+            Slider,
+            Contact,
+            Universal,
+            Hinge2,
+            Fixed,
+            Null,
+            AMotor,
+            LMotor,
+            Plane2D
+        }
+
+        public enum JointParam : int
+        {
+            LoStop,
+            HiStop,
+            Vel,
+            FMax,
+            FudgeFactor,
+            Bounce,
+            CFM,
+            StopERP,
+            StopCFM,
+            SuspensionERP,
+            SuspensionCFM,
+            LoStop2 = 256,
+            HiStop2,
+            Vel2,
+            FMax2,
+            FudgeFactor2,
+            Bounce2,
+            CFM2,
+            StopERP2,
+            StopCFM2,
+            SuspensionERP2,
+            SuspensionCFM2,
+            LoStop3 = 512,
+            HiStop3,
+            Vel3,
+            FMax3,
+            FudgeFactor3,
+            Bounce3,
+            CFM3,
+            StopERP3,
+            StopCFM3,
+            SuspensionERP3,
+            SuspensionCFM3
+        }
 
         public enum dSweepAndPruneAxis : int
         {
@@ -185,24 +185,24 @@ namespace OpenSim.Region.PhysicsModule.ODE
             ZYX = ((2)|(1<<2)|(0<<4))
         }
 
-                #endregion
+        #endregion
 
-                #region Callbacks
+        #region Callbacks
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int AABBTestFn(IntPtr o1, IntPtr o2, ref AABB aabb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int AABBTestFn(IntPtr o1, IntPtr o2, ref AABB aabb);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int ColliderFn(IntPtr o1, IntPtr o2, int flags, out ContactGeom contact, int skip);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int ColliderFn(IntPtr o1, IntPtr o2, int flags, out ContactGeom contact, int skip);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void GetAABBFn(IntPtr geom, out AABB aabb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void GetAABBFn(IntPtr geom, out AABB aabb);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate ColliderFn GetColliderFnFn(int num);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate ColliderFn GetColliderFnFn(int num);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void GeomDtorFn(IntPtr o);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void GeomDtorFn(IntPtr o);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate dReal HeightfieldGetHeight(IntPtr p_user_data, int x, int z);
@@ -210,230 +210,230 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate dReal OSTerrainGetHeight(IntPtr p_user_data, int x, int z);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriRayCallback(IntPtr trimesh, IntPtr ray, int triangleIndex, dReal u, dReal v);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriRayCallback(IntPtr trimesh, IntPtr ray, int triangleIndex, dReal u, dReal v);
 
-                #endregion
+        #endregion
 
-                #region Structs
+        #region Structs
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct AABB
-                {
-                        public dReal MinX, MaxX;
-                        public dReal MinY, MaxY;
-                        public dReal MinZ, MaxZ;
-                }
+        [StructLayout(LayoutKind.Sequential)]
+        public struct AABB
+        {
+            public dReal MinX, MaxX;
+            public dReal MinY, MaxY;
+            public dReal MinZ, MaxZ;
+        }
 
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Contact
-                {
-                        public SurfaceParameters surface;
-                        public ContactGeom geom;
-                        public Vector3 fdir1;
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Contact
+        {
+            public SurfaceParameters surface;
+            public ContactGeom geom;
+            public Vector3 fdir1;
             public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(Contact));
-                }
+        }
 
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct ContactGeom
-                {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct ContactGeom
+        {
 
-                        public Vector3 pos;
-                        public Vector3 normal;
-                        public dReal depth;
-                        public IntPtr g1;
-                        public IntPtr g2;
-                        public int side1;
-                        public int side2;
+            public Vector3 pos;
+            public Vector3 normal;
+            public dReal depth;
+            public IntPtr g1;
+            public IntPtr g2;
+            public int side1;
+            public int side2;
             public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(ContactGeom));
         }
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct GeomClass
-                {
-                        public int bytes;
-                        public GetColliderFnFn collider;
-                        public GetAABBFn aabb;
-                        public AABBTestFn aabb_test;
-                        public GeomDtorFn dtor;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct JointFeedback 
-                {
-                        public Vector3 f1;
-                        public Vector3 t1;
-                        public Vector3 f2;
-                        public Vector3 t2;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Mass
-                {
-                        public dReal mass;
-                        public Vector4 c;
-                        public Matrix3 I;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Matrix3
-                {
-                        public Matrix3(dReal m00, dReal m10, dReal m20, dReal m01, dReal m11, dReal m21, dReal m02, dReal m12, dReal m22)
-                        {
-                                M00 = m00;  M10 = m10;  M20 = m20;  _m30 = 0.0f;
-                                M01 = m01;  M11 = m11;  M21 = m21;  _m31 = 0.0f;
-                                M02 = m02;  M12 = m12;  M22 = m22;  _m32 = 0.0f;
-                        }
-                        public dReal M00, M10, M20;
-                        private dReal _m30;
-                        public dReal M01, M11, M21;
-                        private dReal _m31;
-                        public dReal M02, M12, M22;
-                        private dReal _m32;
-                }
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Matrix4
-                {
-                        public Matrix4(dReal m00, dReal m10, dReal m20, dReal m30,
-                                dReal m01, dReal m11, dReal m21, dReal m31,
-                                dReal m02, dReal m12, dReal m22, dReal m32,
-                                dReal m03, dReal m13, dReal m23, dReal m33)
-                        {
-                                M00 = m00; M10 = m10; M20 = m20; M30 = m30;
-                                M01 = m01; M11 = m11; M21 = m21; M31 = m31;
-                                M02 = m02; M12 = m12; M22 = m22; M32 = m32;
-                                M03 = m03; M13 = m13; M23 = m23; M33 = m33;
-                        }
-                        public dReal M00, M10, M20, M30;
-                        public dReal M01, M11, M21, M31;
-                        public dReal M02, M12, M22, M32;
-                        public dReal M03, M13, M23, M33;
-                }
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Quaternion
-                {
-                        public dReal W, X, Y, Z;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct SurfaceParameters
-                {
-                        public ContactFlags mode;
-                        public dReal mu;
-                        public dReal mu2;
-                        public dReal bounce;
-                        public dReal bounce_vel;
-                        public dReal soft_erp;
-                        public dReal soft_cfm;
-                        public dReal motion1;
-                        public dReal motion2;
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GeomClass
+        {
+            public int bytes;
+            public GetColliderFnFn collider;
+            public GetAABBFn aabb;
+            public AABBTestFn aabb_test;
+            public GeomDtorFn dtor;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct JointFeedback
+        {
+            public Vector3 f1;
+            public Vector3 t1;
+            public Vector3 f2;
+            public Vector3 t2;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Mass
+        {
+            public dReal mass;
+            public Vector4 c;
+            public Matrix3 I;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Matrix3
+        {
+            public Matrix3(dReal m00, dReal m10, dReal m20, dReal m01, dReal m11, dReal m21, dReal m02, dReal m12, dReal m22)
+            {
+                M00 = m00;  M10 = m10;  M20 = m20;  _m30 = 0.0f;
+                M01 = m01;  M11 = m11;  M21 = m21;  _m31 = 0.0f;
+                M02 = m02;  M12 = m12;  M22 = m22;  _m32 = 0.0f;
+            }
+            public dReal M00, M10, M20;
+            private dReal _m30;
+            public dReal M01, M11, M21;
+            private dReal _m31;
+            public dReal M02, M12, M22;
+            private dReal _m32;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Matrix4
+        {
+            public Matrix4(dReal m00, dReal m10, dReal m20, dReal m30,
+                dReal m01, dReal m11, dReal m21, dReal m31,
+                dReal m02, dReal m12, dReal m22, dReal m32,
+                dReal m03, dReal m13, dReal m23, dReal m33)
+            {
+                M00 = m00; M10 = m10; M20 = m20; M30 = m30;
+                M01 = m01; M11 = m11; M21 = m21; M31 = m31;
+                M02 = m02; M12 = m12; M22 = m22; M32 = m32;
+                M03 = m03; M13 = m13; M23 = m23; M33 = m33;
+            }
+            public dReal M00, M10, M20, M30;
+            public dReal M01, M11, M21, M31;
+            public dReal M02, M12, M22, M32;
+            public dReal M03, M13, M23, M33;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Quaternion
+        {
+            public dReal W, X, Y, Z;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SurfaceParameters
+        {
+            public ContactFlags mode;
+            public dReal mu;
+            public dReal mu2;
+            public dReal bounce;
+            public dReal bounce_vel;
+            public dReal soft_erp;
+            public dReal soft_cfm;
+            public dReal motion1;
+            public dReal motion2;
             public dReal motionN;
-                        public dReal slip1;
-                        public dReal slip2;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Vector3
-                {
-                        public Vector3(dReal x, dReal y, dReal z)
-                        {
-                                X = x;  Y = y;  Z = z;  _w = 0.0f;
-                        }
-                        public dReal X, Y, Z;
-                        private dReal _w;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Vector4
-                {
-                        public Vector4(dReal x, dReal y, dReal z, dReal w)
-                        {
-                                X = x;  Y = y;  Z = z;  W = w;
-                        }
-                        public dReal X, Y, Z, W;
-                }
-
-                #endregion
+            public dReal slip1;
+            public dReal slip2;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Vector3
+        {
+            public Vector3(dReal x, dReal y, dReal z)
+            {
+                X = x;  Y = y;  Z = z;  _w = 0.0f;
+            }
+            public dReal X, Y, Z;
+            private dReal _w;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Vector4
+        {
+            public Vector4(dReal x, dReal y, dReal z, dReal w)
+            {
+                X = x;  Y = y;  Z = z;  W = w;
+            }
+            public dReal X, Y, Z, W;
+        }
+
+        #endregion
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAllocateODEDataForThread"), SuppressUnmanagedCodeSecurity]
         public static extern int AllocateODEDataForThread(uint ODEInitFlags);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnected"), SuppressUnmanagedCodeSecurity]
-                public static extern bool AreConnected(IntPtr b1, IntPtr b2);
+        public static extern bool AreConnected(IntPtr b1, IntPtr b2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnectedExcluding"), SuppressUnmanagedCodeSecurity]
-                public static extern bool AreConnectedExcluding(IntPtr b1, IntPtr b2, JointType joint_type);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnectedExcluding"), SuppressUnmanagedCodeSecurity]
+        public static extern bool AreConnectedExcluding(IntPtr b1, IntPtr b2, JointType joint_type);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForce(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtRelPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForce(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtRelPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyPosition(IntPtr body, out Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyPosition(IntPtr body, out Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyPosition(IntPtr body, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyPosition(IntPtr body, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyQuaternion(IntPtr body, out Quaternion quat);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyQuaternion(IntPtr body, out Quaternion quat);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyQuaternion(IntPtr body, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyQuaternion(IntPtr body, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyRotation(IntPtr body, out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyRotation(IntPtr body, out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyRotation(IntPtr body, out dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyRotation(IntPtr body, out dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyiCreate(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyiCreate(IntPtr world);
         public static IntPtr BodyCreate(IntPtr world)
         {
             NTotalBodies++;
             return BodyiCreate(world);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDestroy"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDestroy"), SuppressUnmanagedCodeSecurity]
         public static extern void BodyiDestroy(IntPtr body);
         public static void BodyDestroy(IntPtr body)
         {
@@ -441,114 +441,114 @@ namespace OpenSim.Region.PhysicsModule.ODE
             BodyiDestroy(body);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDisable"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyDisable(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDisable"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyDisable(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyEnable"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyEnable(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyEnable"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyEnable(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableAngularThreshold(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableAngularThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyGetAutoDisableFlag(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyGetAutoDisableFlag(IntPtr body);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
         public static extern void BodyGetAutoDisableDefaults(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableLinearThreshold(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableLinearThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetAutoDisableSteps(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetAutoDisableSteps(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableTime(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableTime(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularVel"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetAngularVelUnsafe(IntPtr body);
-                public static Vector3 BodyGetAngularVel(IntPtr body)
-                {
-                        unsafe { return *(BodyGetAngularVelUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularVel"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetAngularVelUnsafe(IntPtr body);
+        public static Vector3 BodyGetAngularVel(IntPtr body)
+        {
+            unsafe { return *(BodyGetAngularVelUnsafe(body)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyGetData(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetData(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetFiniteRotationMode(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetFiniteRotationMode(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetFiniteRotationAxis(IntPtr body, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetFiniteRotationAxis(IntPtr body, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetForce"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetForceUnsafe(IntPtr body);
-                public static Vector3 BodyGetForce(IntPtr body)
-                {
-                        unsafe { return *(BodyGetForceUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetForce"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetForceUnsafe(IntPtr body);
+        public static Vector3 BodyGetForce(IntPtr body)
+        {
+            unsafe { return *(BodyGetForceUnsafe(body)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGravityMode"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyGetGravityMode(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGravityMode"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyGetGravityMode(IntPtr body);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
         public static extern int BodyGetGyroscopicMode(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetJoint"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyGetJoint(IntPtr body, int index);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearVel"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetLinearVelUnsafe(IntPtr body);
-                public static Vector3 BodyGetLinearVel(IntPtr body)
-                {
-                        unsafe { return *(BodyGetLinearVelUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetMass"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetMass(IntPtr body, out Mass mass);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNumJoints"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetNumJoints(IntPtr body);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPointVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetPositionUnsafe(IntPtr body);
-                public static Vector3 BodyGetPosition(IntPtr body)
-                {
-                        unsafe { return *(BodyGetPositionUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosRelPoint"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetPosRelPoint(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Quaternion* BodyGetQuaternionUnsafe(IntPtr body);
-                public static Quaternion BodyGetQuaternion(IntPtr body)
-                {
-                        unsafe { return *(BodyGetQuaternionUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetRelPointPos(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetRelPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* BodyGetRotationUnsafe(IntPtr body);
-                public static Matrix3 BodyGetRotation(IntPtr body)
-                {
-                        unsafe { return *(BodyGetRotationUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetTorque"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetTorqueUnsafe(IntPtr body);
-                public static Vector3 BodyGetTorque(IntPtr body)
-                {
-                        unsafe { return *(BodyGetTorqueUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetJoint"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetJoint(IntPtr body, int index);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearVel"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetLinearVelUnsafe(IntPtr body);
+        public static Vector3 BodyGetLinearVel(IntPtr body)
+        {
+            unsafe { return *(BodyGetLinearVelUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetMass"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetMass(IntPtr body, out Mass mass);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNumJoints"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetNumJoints(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPointVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetPositionUnsafe(IntPtr body);
+        public static Vector3 BodyGetPosition(IntPtr body)
+        {
+            unsafe { return *(BodyGetPositionUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosRelPoint"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetPosRelPoint(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Quaternion* BodyGetQuaternionUnsafe(IntPtr body);
+        public static Quaternion BodyGetQuaternion(IntPtr body)
+        {
+            unsafe { return *(BodyGetQuaternionUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetRelPointPos(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetRelPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* BodyGetRotationUnsafe(IntPtr body);
+        public static Matrix3 BodyGetRotation(IntPtr body)
+        {
+            unsafe { return *(BodyGetRotationUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetTorque"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetTorqueUnsafe(IntPtr body);
+        public static Vector3 BodyGetTorque(IntPtr body)
+        {
+            unsafe { return *(BodyGetTorqueUnsafe(body)); }
+        }
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetWorld"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr BodyGetWorld(IntPtr body);
@@ -560,38 +560,38 @@ namespace OpenSim.Region.PhysicsModule.ODE
         public static extern IntPtr dBodyGetNextGeom(IntPtr Geom);
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyIsEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyIsEnabled(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyIsEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyIsEnabled(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAngularVel(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAngularVel(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableAngularThreshold(IntPtr body, dReal angular_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableAngularThreshold(IntPtr body, dReal angular_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableDefaults(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableDefaults(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableFlag(IntPtr body, bool do_auto_disable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableFlag(IntPtr body, bool do_auto_disable);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableLinearThreshold(IntPtr body, dReal linear_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableLinearThreshold(IntPtr body, dReal linear_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableSteps(IntPtr body, int steps);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableSteps(IntPtr body, int steps);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableTime(IntPtr body, dReal time);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableTime(IntPtr body, dReal time);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetData(IntPtr body, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetData(IntPtr body, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetFiniteRotationMode(IntPtr body, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetFiniteRotationMode(IntPtr body, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetFiniteRotationAxis(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetFiniteRotationAxis(IntPtr body, dReal x, dReal y, dReal z);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void BodySetLinearDamping(IntPtr body, dReal scale);
@@ -620,11 +620,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern dReal BodyGetAngularDampingThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetForce(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetForce(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGravityMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetGravityMode(IntPtr body, bool mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGravityMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetGravityMode(IntPtr body, bool mode);
 
         /// <summary>
         /// Sets the Gyroscopic term status on the body specified.
@@ -634,76 +634,76 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
         public static extern void dBodySetGyroscopicMode(IntPtr body, int enabled);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetLinearVel(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetLinearVel(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetMass"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetMass(IntPtr body, ref Mass mass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetMass"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetMass(IntPtr body, ref Mass mass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetPosition(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetPosition(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetQuaternion(IntPtr body, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetQuaternion(IntPtr body, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetQuaternion(IntPtr body, ref dReal w);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetQuaternion(IntPtr body, ref dReal w);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetRotation(IntPtr body, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetRotation(IntPtr body, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetRotation(IntPtr body, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetRotation(IntPtr body, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetTorque(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetTorque(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorFromWorld"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyVectorFromWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorFromWorld"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyVectorFromWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorToWorld"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyVectorToWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorToWorld"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyVectorToWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void BoxBox(ref Vector3 p1, ref Matrix3 R1,
-                        ref Vector3 side1, ref Vector3 p2,
-                        ref Matrix3 R2, ref Vector3 side2,
-                        ref Vector3 normal, out dReal depth, out int return_code,
-                        int maxc, out ContactGeom contact, int skip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void BoxBox(ref Vector3 p1, ref Matrix3 R1,
+            ref Vector3 side1, ref Vector3 p2,
+            ref Matrix3 R2, ref Vector3 side2,
+            ref Vector3 normal, out dReal depth, out int return_code,
+            int maxc, out ContactGeom contact, int skip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxTouchesBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void BoxTouchesBox(ref Vector3 _p1, ref Matrix3 R1,
-                        ref Vector3 side1, ref Vector3 _p2,
-                        ref Matrix3 R2, ref Vector3 side2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxTouchesBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void BoxTouchesBox(ref Vector3 _p1, ref Matrix3 R1,
+            ref Vector3 side1, ref Vector3 _p2,
+            ref Matrix3 R2, ref Vector3 side2);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCleanupODEAllDataForThread"), SuppressUnmanagedCodeSecurity]
-                public static extern void CleanupODEAllDataForThread();
-        
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dClosestLineSegmentPoints"), SuppressUnmanagedCodeSecurity]
-                public static extern void ClosestLineSegmentPoints(ref Vector3 a1, ref Vector3 a2, 
-                        ref Vector3 b1, ref Vector3 b2, 
-                        ref Vector3 cp1, ref Vector3 cp2);
+        public static extern void CleanupODEAllDataForThread();
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dClosestLineSegmentPoints"), SuppressUnmanagedCodeSecurity]
+        public static extern void ClosestLineSegmentPoints(ref Vector3 a1, ref Vector3 a2,
+            ref Vector3 b1, ref Vector3 b2,
+            ref Vector3 cp1, ref Vector3 cp2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCloseODE"), SuppressUnmanagedCodeSecurity]
-                public static extern void CloseODE();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCloseODE"), SuppressUnmanagedCodeSecurity]
+        public static extern void CloseODE();
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
         public static extern int Collide(IntPtr o1, IntPtr o2, int flags, [In, Out] ContactGeom[] contact, int skip);
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
         public static extern int CollidePtr(IntPtr o1, IntPtr o2, int flags, IntPtr contactgeomarray, int skip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dConnectingJoint"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr ConnectingJoint(IntPtr j1, IntPtr j2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dConnectingJoint"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr ConnectingJoint(IntPtr j1, IntPtr j2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateBox"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateBox"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiBox(IntPtr space, dReal lx, dReal ly, dReal lz);
-                public static IntPtr CreateBox(IntPtr space, dReal lx, dReal ly, dReal lz)
+        public static IntPtr CreateBox(IntPtr space, dReal lx, dReal ly, dReal lz)
         {
             NTotalGeoms++;
             return CreateiBox(space, lx, ly, lz);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCapsule"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCapsule"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiCapsule(IntPtr space, dReal radius, dReal length);
         public static IntPtr CreateCapsule(IntPtr space, dReal radius, dReal length)
         {
@@ -711,23 +711,23 @@ namespace OpenSim.Region.PhysicsModule.ODE
             return CreateiCapsule(space, radius, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateConvex"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateConvex"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
         public static IntPtr CreateConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons)
         {
             NTotalGeoms++;
             return CreateiConvex(space, planes, planeCount, points, pointCount, polygons);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCylinder"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiCylinder(IntPtr space, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCylinder"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiCylinder(IntPtr space, dReal radius, dReal length);
         public static IntPtr CreateCylinder(IntPtr space, dReal radius, dReal length)
         {
             NTotalGeoms++;
             return CreateiCylinder(space, radius, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateHeightfield"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateHeightfield"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiHeightfield(IntPtr space, IntPtr data, int bPlaceable);
         public static IntPtr CreateHeightfield(IntPtr space, IntPtr data, int bPlaceable)
         {
@@ -745,23 +745,23 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
 
 
-        
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiGeom(int classnum);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiGeom(int classnum);
         public static IntPtr CreateGeom(int classnum)
         {
             NTotalGeoms++;
             return CreateiGeom(classnum);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomClass"), SuppressUnmanagedCodeSecurity]
-                public static extern int CreateGeomClass(ref GeomClass classptr);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomClass"), SuppressUnmanagedCodeSecurity]
+        public static extern int CreateGeomClass(ref GeomClass classptr);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateGeomTransform(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateGeomTransform(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreatePlane"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreatePlane"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiPlane(IntPtr space, dReal a, dReal b, dReal c, dReal d);
         public static IntPtr CreatePlane(IntPtr space, dReal a, dReal b, dReal c, dReal d)
         {
@@ -769,25 +769,25 @@ namespace OpenSim.Region.PhysicsModule.ODE
             return CreateiPlane(space, a, b, c, d);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateRay"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiRay(IntPtr space, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateRay"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiRay(IntPtr space, dReal length);
         public static IntPtr CreateRay(IntPtr space, dReal length)
         {
             NTotalGeoms++;
             return CreateiRay(space, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateSphere"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiSphere(IntPtr space, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateSphere"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiSphere(IntPtr space, dReal radius);
         public static IntPtr CreateSphere(IntPtr space, dReal radius)
         {
             NTotalGeoms++;
             return CreateiSphere(space, radius);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateTriMesh"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiTriMesh(IntPtr space, IntPtr data, 
-                        TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateTriMesh"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiTriMesh(IntPtr space, IntPtr data,
+            TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback);
         public static IntPtr CreateTriMesh(IntPtr space, IntPtr data,
             TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback)
         {
@@ -795,79 +795,79 @@ namespace OpenSim.Region.PhysicsModule.ODE
             return CreateiTriMesh(space, data, callback, arrayCallback, rayCallback);
         }
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDot"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal Dot(ref dReal X0, ref dReal X1, int n);
+        public static extern dReal Dot(ref dReal X0, ref dReal X1, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDQfromW"), SuppressUnmanagedCodeSecurity]
-                public static extern void DQfromW(dReal[] dq, ref Vector3 w, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDQfromW"), SuppressUnmanagedCodeSecurity]
+        public static extern void DQfromW(dReal[] dq, ref Vector3 w, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorCholesky"), SuppressUnmanagedCodeSecurity]
-                public static extern int FactorCholesky(ref dReal A00, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorCholesky"), SuppressUnmanagedCodeSecurity]
+        public static extern int FactorCholesky(ref dReal A00, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorLDLT"), SuppressUnmanagedCodeSecurity]
-                public static extern void FactorLDLT(ref dReal A, out dReal d, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorLDLT"), SuppressUnmanagedCodeSecurity]
+        public static extern void FactorLDLT(ref dReal A, out dReal d, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxGetLengths(IntPtr geom, out Vector3 len);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxGetLengths(IntPtr geom, out Vector3 len);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxGetLengths(IntPtr geom, out dReal x);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxGetLengths(IntPtr geom, out dReal x);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxPointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomBoxPointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxPointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomBoxPointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxSetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxSetLengths(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxSetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxSetLengths(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCapsuleGetParams(IntPtr geom, out dReal radius, out dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCapsuleGetParams(IntPtr geom, out dReal radius, out dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsulePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomCapsulePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsulePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomCapsulePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCapsuleSetParams(IntPtr geom, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCapsuleSetParams(IntPtr geom, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomClearOffset"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomClearOffset(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomClearOffset"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomClearOffset(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref Quaternion Q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyPosition(IntPtr geom, out Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyPosition(IntPtr geom, out Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyPosition(IntPtr geom, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyPosition(IntPtr geom, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyRotation(IntPtr geom, out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyRotation(IntPtr geom, out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyRotation(IntPtr geom, out dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyRotation(IntPtr geom, out dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCylinderGetParams(IntPtr geom, out dReal radius, out dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCylinderGetParams(IntPtr geom, out dReal radius, out dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCylinderSetParams(IntPtr geom, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCylinderSetParams(IntPtr geom, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomiDestroy(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomiDestroy(IntPtr geom);
         public static void GeomDestroy(IntPtr geom)
         {
             NTotalGeoms--;
@@ -875,63 +875,63 @@ namespace OpenSim.Region.PhysicsModule.ODE
         }
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDisable"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomDisable(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDisable"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomDisable(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomEnable"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomEnable(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomEnable"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomEnable(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomGetAABB(IntPtr geom, out AABB aabb);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomGetAABB(IntPtr geom, out AABB aabb);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomGetAABB(IntPtr geom, out dReal minX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomGetAABB(IntPtr geom, out dReal minX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetBody(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetBody(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCategoryBits"), SuppressUnmanagedCodeSecurity]
-                public static extern uint GeomGetCategoryBits(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCategoryBits"), SuppressUnmanagedCodeSecurity]
+        public static extern uint GeomGetCategoryBits(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClassData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetClassData(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClassData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetClassData(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCollideBits"), SuppressUnmanagedCodeSecurity]
-                public static extern uint GeomGetCollideBits(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCollideBits"), SuppressUnmanagedCodeSecurity]
+        public static extern uint GeomGetCollideBits(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClass"), SuppressUnmanagedCodeSecurity]
-                public static extern GeomClassID GeomGetClass(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClass"), SuppressUnmanagedCodeSecurity]
+        public static extern GeomClassID GeomGetClass(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr GeomGetData(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom);
-                public static Vector3 GeomGetOffsetPosition(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetOffsetPositionUnsafe(geom)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* GeomGetOffsetRotationUnsafe(IntPtr geom);
-                public static Matrix3 GeomGetOffsetRotation(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetOffsetRotationUnsafe(geom)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* GeomGetPositionUnsafe(IntPtr geom);
-                public static Vector3 GeomGetPosition(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetPositionUnsafe(geom)); }
-                }
-                public static OMV.Vector3 GeomGetPositionOMV(IntPtr geom)
-                {
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom);
+        public static Vector3 GeomGetOffsetPosition(IntPtr geom)
+        {
+            unsafe { return *(GeomGetOffsetPositionUnsafe(geom)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* GeomGetOffsetRotationUnsafe(IntPtr geom);
+        public static Matrix3 GeomGetOffsetRotation(IntPtr geom)
+        {
+            unsafe { return *(GeomGetOffsetRotationUnsafe(geom)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* GeomGetPositionUnsafe(IntPtr geom);
+        public static Vector3 GeomGetPosition(IntPtr geom)
+        {
+            unsafe { return *(GeomGetPositionUnsafe(geom)); }
+        }
+        public static OMV.Vector3 GeomGetPositionOMV(IntPtr geom)
+        {
             Vector3 vtmp = GeomGetPosition(geom);
             return new OMV.Vector3(vtmp.X, vtmp.Y, vtmp.Z);
-                }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomCopyQuaternion(IntPtr geom, out Quaternion q);
         public static OMV.Quaternion GeomGetQuaternionOMV(IntPtr geom)
         {
@@ -940,85 +940,85 @@ namespace OpenSim.Region.PhysicsModule.ODE
             return new OMV.Quaternion(qtmp.X, qtmp.Y, qtmp.Z, qtmp.W);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyQuaternion(IntPtr geom, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyQuaternion(IntPtr geom, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* GeomGetRotationUnsafe(IntPtr geom);
-                public static Matrix3 GeomGetRotation(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetRotationUnsafe(geom)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* GeomGetRotationUnsafe(IntPtr geom);
+        public static Matrix3 GeomGetRotation(IntPtr geom)
+        {
+            unsafe { return *(GeomGetRotationUnsafe(geom)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetSpace"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetSpace(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetSpace"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetSpace(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, byte[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildByte(IntPtr d, byte[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness,     int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildByte(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness,     int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildCallback(IntPtr d, IntPtr pUserData, HeightfieldGetHeight pCallback,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildCallback(IntPtr d, IntPtr pUserData, HeightfieldGetHeight pCallback,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, ushort[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, ushort[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, short[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, short[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, float[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, float[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, double[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, double[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomHeightfieldDataCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomHeightfieldDataCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataDestroy(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataDestroy(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataSetBounds"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataSetBounds"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomHeightfieldGetHeightfieldData(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomHeightfieldGetHeightfieldData(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldSetHeightfieldData(IntPtr g, IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldSetHeightfieldData(IntPtr g, IntPtr d);
 
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
@@ -1047,279 +1047,279 @@ namespace OpenSim.Region.PhysicsModule.ODE
         public static extern void GeomOSTerrainSetHeightfieldData(IntPtr g, IntPtr d);
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsEnabled(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsEnabled(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsOffset"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsOffset(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsOffset"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsOffset(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsSpace"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsSpace(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsSpace"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsSpace(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneGetParams(IntPtr geom, ref Vector4 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneGetParams(IntPtr geom, ref Vector4 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneGetParams(IntPtr geom, ref dReal A);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneGetParams(IntPtr geom, ref dReal A);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlanePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomPlanePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlanePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomPlanePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneSetParams(IntPtr plane, dReal a, dReal b, dReal c, dReal d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneSetParams(IntPtr plane, dReal a, dReal b, dReal c, dReal d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRayGet(IntPtr ray, ref Vector3 start, ref Vector3 dir);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRayGet(IntPtr ray, ref Vector3 start, ref Vector3 dir);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRayGet(IntPtr ray, ref dReal startX, ref dReal dirX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRayGet(IntPtr ray, ref dReal startX, ref dReal dirX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetClosestHit"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomRayGetClosestHit(IntPtr ray);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetClosestHit"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomRayGetClosestHit(IntPtr ray);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetLength"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomRayGetLength(IntPtr ray);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetLength"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomRayGetLength(IntPtr ray);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomRayGetParams(IntPtr g, out int firstContact, out int backfaceCull);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomRayGetParams(IntPtr g, out int firstContact, out int backfaceCull);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySet(IntPtr ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySet(IntPtr ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetClosestHit"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetClosestHit(IntPtr ray, int closestHit);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetClosestHit"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetClosestHit(IntPtr ray, int closestHit);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetLength"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetLength(IntPtr ray, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetLength"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetLength(IntPtr ray, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetParams(IntPtr ray, int firstContact, int backfaceCull);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetParams(IntPtr ray, int firstContact, int backfaceCull);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetBody(IntPtr geom, IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetBody(IntPtr geom, IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCategoryBits"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetCategoryBits(IntPtr geom, uint bits);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCategoryBits"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetCategoryBits(IntPtr geom, uint bits);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCollideBits"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetCollideBits(IntPtr geom, uint bits);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCollideBits"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetCollideBits(IntPtr geom, uint bits);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetData"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomSetData(IntPtr geom, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref Quaternion Q);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref dReal X);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetRotation(IntPtr geom, ref Matrix3 R);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldPosition(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref Quaternion Q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetPosition(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetQuaternion(IntPtr geom, ref Quaternion quat);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetQuaternion(IntPtr geom, ref dReal w);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereGetRadius"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomSphereGetRadius(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetQuaternion(IntPtr geom, ref Quaternion quat);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSpherePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomSpherePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetQuaternion(IntPtr geom, ref dReal w);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereSetRadius"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSphereSetRadius(IntPtr geom, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomTransformGetCleanup(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTransformGetGeom(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereGetRadius"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomSphereGetRadius(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetInfo"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomTransformGetInfo(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSpherePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomSpherePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetCleanup(IntPtr geom, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereSetRadius"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSphereSetRadius(IntPtr geom, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetGeom(IntPtr geom, IntPtr obj);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomTransformGetCleanup(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetInfo"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetInfo(IntPtr geom, int info);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTransformGetGeom(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        double[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetInfo"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomTransformGetInfo(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetCleanup(IntPtr geom, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble1(IntPtr d,
-                        double[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        double[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetGeom(IntPtr geom, IntPtr obj);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetInfo"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetInfo(IntPtr geom, int info);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
-                        dReal[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            double[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
-                        dReal[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        dReal[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble1(IntPtr d,
+            double[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            double[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple(IntPtr d, 
-                        float[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+            dReal[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d, 
-                        float[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        float[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+            dReal[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            dReal[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshClearTCCache"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshClearTCCache(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
+            float[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshDataCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataDestroy(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
+            float[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            float[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataGet"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshDataGet(IntPtr d, int data_id);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataPreprocess"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataPreprocess(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshClearTCCache"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshClearTCCache(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataSet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataSet(IntPtr d, int data_id, IntPtr in_data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshDataCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataUpdate"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataUpdate(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataDestroy(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshEnableTC"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshEnableTC(IntPtr g, int geomClass, bool enable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataGet"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshDataGet(IntPtr d, int data_id);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetArrayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriArrayCallback GeomTriMeshGetArrayCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataPreprocess"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataPreprocess(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriCallback GeomTriMeshGetCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataSet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataSet(IntPtr d, int data_id, IntPtr in_data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshGetData(IntPtr g);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix4* GeomTriMeshGetLastTransformUnsafe(IntPtr geom);
-                public static Matrix4 GeomTriMeshGetLastTransform(IntPtr geom)
-                {
-                        unsafe { return *(GeomTriMeshGetLastTransformUnsafe(geom)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataUpdate"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataUpdate(IntPtr d);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshEnableTC"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshEnableTC(IntPtr g, int geomClass, bool enable);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetArrayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriArrayCallback GeomTriMeshGetArrayCallback(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriCallback GeomTriMeshGetCallback(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshGetData(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix4* GeomTriMeshGetLastTransformUnsafe(IntPtr geom);
+        public static Matrix4 GeomTriMeshGetLastTransform(IntPtr geom)
+        {
+            unsafe { return *(GeomTriMeshGetLastTransformUnsafe(geom)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetPoint"), SuppressUnmanagedCodeSecurity]
-                public extern static void GeomTriMeshGetPoint(IntPtr g, int index, dReal u, dReal v, ref Vector3 outVec);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetPoint"), SuppressUnmanagedCodeSecurity]
+        public extern static void GeomTriMeshGetPoint(IntPtr g, int index, dReal u, dReal v, ref Vector3 outVec);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetRayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriRayCallback GeomTriMeshGetRayCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetRayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriRayCallback GeomTriMeshGetRayCallback(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangle"), SuppressUnmanagedCodeSecurity]
-                public extern static void GeomTriMeshGetTriangle(IntPtr g, int index, ref Vector3 v0, ref Vector3 v1, ref Vector3 v2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangle"), SuppressUnmanagedCodeSecurity]
+        public extern static void GeomTriMeshGetTriangle(IntPtr g, int index, ref Vector3 v0, ref Vector3 v1, ref Vector3 v2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangleCount"), SuppressUnmanagedCodeSecurity]
-                public extern static int GeomTriMeshGetTriangleCount(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangleCount"), SuppressUnmanagedCodeSecurity]
+        public extern static int GeomTriMeshGetTriangleCount(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriMeshDataID"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshGetTriMeshDataID(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriMeshDataID"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshGetTriMeshDataID(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshIsTCEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomTriMeshIsTCEnabled(IntPtr g, int geomClass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshIsTCEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomTriMeshIsTCEnabled(IntPtr g, int geomClass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetArrayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetArrayCallback(IntPtr g, TriArrayCallback arrayCallback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetArrayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetArrayCallback(IntPtr g, TriArrayCallback arrayCallback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetCallback(IntPtr g, TriCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetCallback(IntPtr g, TriCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetData(IntPtr g, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetData(IntPtr g, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref Matrix4 last_trans);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref Matrix4 last_trans);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref dReal M00);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetRayCallback"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomTriMeshSetRayCallback(IntPtr g, TriRayCallback callback);
@@ -1334,416 +1334,416 @@ namespace OpenSim.Region.PhysicsModule.ODE
             return s;
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr HashSpaceCreate(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr HashSpaceCreate(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceGetLevels"), SuppressUnmanagedCodeSecurity]
-                public static extern void HashSpaceGetLevels(IntPtr space, out int minlevel, out int maxlevel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceGetLevels"), SuppressUnmanagedCodeSecurity]
+        public static extern void HashSpaceGetLevels(IntPtr space, out int minlevel, out int maxlevel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceSetLevels"), SuppressUnmanagedCodeSecurity]
-                public static extern void HashSpaceSetLevels(IntPtr space, int minlevel, int maxlevel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceSetLevels"), SuppressUnmanagedCodeSecurity]
+        public static extern void HashSpaceSetLevels(IntPtr space, int minlevel, int maxlevel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInfiniteAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void InfiniteAABB(IntPtr geom, out AABB aabb);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInfiniteAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void InfiniteAABB(IntPtr geom, out AABB aabb);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE"), SuppressUnmanagedCodeSecurity]
-                public static extern void InitODE();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE"), SuppressUnmanagedCodeSecurity]
+        public static extern void InitODE();
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE2"), SuppressUnmanagedCodeSecurity]
         public static extern int InitODE2(uint ODEInitFlags);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dIsPositiveDefinite"), SuppressUnmanagedCodeSecurity]
-                public static extern int IsPositiveDefinite(ref dReal A, int n);
+        public static extern int IsPositiveDefinite(ref dReal A, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInvertPDMatrix"), SuppressUnmanagedCodeSecurity]
-                public static extern int InvertPDMatrix(ref dReal A, out dReal Ainv, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInvertPDMatrix"), SuppressUnmanagedCodeSecurity]
+        public static extern int InvertPDMatrix(ref dReal A, out dReal Ainv, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddAMotorTorques"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddAMotorTorques(IntPtr joint, dReal torque1, dReal torque2, dReal torque3);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddAMotorTorques"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddAMotorTorques(IntPtr joint, dReal torque1, dReal torque2, dReal torque3);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHingeTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddHingeTorque(IntPtr joint, dReal torque);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHingeTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddHingeTorque(IntPtr joint, dReal torque);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHinge2Torque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddHinge2Torques(IntPtr joint, dReal torque1, dReal torque2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHinge2Torque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddHinge2Torques(IntPtr joint, dReal torque1, dReal torque2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddPRTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddPRTorque(IntPtr joint, dReal torque);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddPRTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddPRTorque(IntPtr joint, dReal torque);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddUniversalTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddUniversalTorques(IntPtr joint, dReal torque1, dReal torque2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddUniversalTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddUniversalTorques(IntPtr joint, dReal torque1, dReal torque2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddSliderForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddSliderForce(IntPtr joint, dReal force);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddSliderForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddSliderForce(IntPtr joint, dReal force);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAttach"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAttach(IntPtr joint, IntPtr body1, IntPtr body2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAttach"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAttach(IntPtr joint, IntPtr body1, IntPtr body2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateAMotor"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateAMotor(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateAMotor"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateAMotor(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateBall"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateBall(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateBall"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateBall(IntPtr world, IntPtr group);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr JointCreateContact(IntPtr world, IntPtr group, ref Contact contact);
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr JointCreateContactPtr(IntPtr world, IntPtr group, IntPtr contact);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateFixed"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateFixed(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateFixed"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateFixed(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateHinge(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateHinge(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge2"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateHinge2(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge2"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateHinge2(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateLMotor"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateLMotor(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateLMotor"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateLMotor(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateNull"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateNull(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateNull"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateNull(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePR"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreatePR(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePR"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreatePR(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePlane2D"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreatePlane2D(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePlane2D"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreatePlane2D(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateSlider"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateSlider(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateSlider"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateSlider(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateUniversal"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateUniversal(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateUniversal"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateUniversal(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointDestroy(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointDestroy(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorAngle(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorAngle(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngleRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorAngleRate(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngleRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorAngleRate(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetAMotorAxis(IntPtr j, int anum, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetAMotorAxis(IntPtr j, int anum, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxisRel"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorAxisRel(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxisRel"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorAxisRel(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorMode"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorMode(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorMode"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorMode(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorNumAxes(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorNumAxes(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetBallAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetBallAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetBallAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetBallAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGetBody(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGetBody(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGetData(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGetData(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetFeedback"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static JointFeedback* JointGetFeedbackUnsafe(IntPtr j);
-                public static JointFeedback JointGetFeedback(IntPtr j)
-                {
-                        unsafe { return *(JointGetFeedbackUnsafe(j)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetFeedback"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static JointFeedback* JointGetFeedbackUnsafe(IntPtr j);
+        public static JointFeedback JointGetFeedback(IntPtr j)
+        {
+            unsafe { return *(JointGetFeedbackUnsafe(j)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeAngle(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeAngle(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngleRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeAngleRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngleRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeAngleRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAxis(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAxis(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle1(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle1(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle1Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle1Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle2Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle2Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle2Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle2Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Anchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Anchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Anchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Anchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Axis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Axis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Axis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Axis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Param"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Param(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Param"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Param(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetLMotorAxis(IntPtr j, int anum, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetLMotorAxis(IntPtr j, int anum, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetLMotorNumAxes(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetLMotorNumAxes(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetLMotorParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetLMotorParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAxis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAxis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAxis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAxis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRPosition(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRPosition(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPositionRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRPositionRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPositionRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRPositionRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetSliderAxis(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetSliderAxis(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderPosition(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderPosition(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPositionRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderPositionRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPositionRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderPositionRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetType"), SuppressUnmanagedCodeSecurity]
-                public static extern JointType JointGetType(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetType"), SuppressUnmanagedCodeSecurity]
+        public static extern JointType JointGetType(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle1(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle1(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle1Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle1Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle2(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle2(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle2Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle2Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngles"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAngles(IntPtr j, out dReal angle1, out dReal angle2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngles"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAngles(IntPtr j, out dReal angle1, out dReal angle2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAxis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAxis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAxis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAxis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGroupCreate(int max_size);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGroupCreate(int max_size);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGroupDestroy(IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGroupDestroy(IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupEmpty"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGroupEmpty(IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupEmpty"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGroupEmpty(IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorAngle(IntPtr j, int anum, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorAngle(IntPtr j, int anum, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorMode(IntPtr j, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorMode(IntPtr j, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorNumAxes(IntPtr group, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorNumAxes(IntPtr group, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorParam(IntPtr group, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorParam(IntPtr group, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetBallAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetBallAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetBallAnchor2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetBallAnchor2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetData(IntPtr j, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetData(IntPtr j, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFeedback"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetFeedback(IntPtr j, out JointFeedback feedback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFeedback"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetFeedback(IntPtr j, out JointFeedback feedback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFixed"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetFixed(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFixed"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetFixed(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchorDelta"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAnchorDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchorDelta"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAnchorDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAxis(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAxis(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Anchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Anchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Axis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Axis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Axis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Axis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Param"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Param(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Param"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Param(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorNumAxes(IntPtr j, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorNumAxes(IntPtr j, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DAngleParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DAngleParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DAngleParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DAngleParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DXParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DXParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DXParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DXParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DYParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DYParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DYParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DYParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAxis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAxis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAxis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAxis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderAxis(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderAxis(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxisDelta"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderAxisDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxisDelta"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderAxisDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAxis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAxis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAxis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAxis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dLDLTAddTL"), SuppressUnmanagedCodeSecurity]
-                public static extern void LDLTAddTL(ref dReal L, ref dReal d, ref dReal a, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dLDLTAddTL"), SuppressUnmanagedCodeSecurity]
+        public static extern void LDLTAddTL(ref dReal L, ref dReal d, ref dReal a, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdd"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassAdd(ref Mass a, ref Mass b);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdd"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassAdd(ref Mass a, ref Mass b);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdjust"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassAdjust(ref Mass m, dReal newmass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdjust"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassAdjust(ref Mass m, dReal newmass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassCheck"), SuppressUnmanagedCodeSecurity]
-                public static extern bool MassCheck(ref Mass m);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassCheck"), SuppressUnmanagedCodeSecurity]
+        public static extern bool MassCheck(ref Mass m);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassRotate(ref Mass mass, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassRotate(ref Mass mass, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassRotate(ref Mass mass, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassRotate(ref Mass mass, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetBox(out Mass mass, dReal density, dReal lx, dReal ly, dReal lz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetBox(out Mass mass, dReal density, dReal lx, dReal ly, dReal lz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBoxTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetBoxTotal(out Mass mass, dReal total_mass, dReal lx, dReal ly, dReal lz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBoxTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetBoxTotal(out Mass mass, dReal total_mass, dReal lx, dReal ly, dReal lz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsule"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCapsule(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsule"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCapsule(out Mass mass, dReal density, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsuleTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCapsuleTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsuleTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCapsuleTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinder"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCylinder(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinder"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCylinder(out Mass mass, dReal density, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinderTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCylinderTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinderTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCylinderTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetParameters"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetParameters(out Mass mass, dReal themass,
-                         dReal cgx, dReal cgy, dReal cgz,
-                         dReal i11, dReal i22, dReal i33,
-                         dReal i12, dReal i13, dReal i23);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetParameters"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetParameters(out Mass mass, dReal themass,
+             dReal cgx, dReal cgy, dReal cgz,
+             dReal i11, dReal i22, dReal i33,
+             dReal i12, dReal i13, dReal i23);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphere"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetSphere(out Mass mass, dReal density, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphere"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetSphere(out Mass mass, dReal density, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphereTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void dMassSetSphereTotal(out Mass mass, dReal total_mass, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphereTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void dMassSetSphereTotal(out Mass mass, dReal total_mass, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetTrimesh"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetTrimesh(out Mass mass, dReal density, IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetTrimesh"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetTrimesh(out Mass mass, dReal density, IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetZero"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetZero(out Mass mass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetZero"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetZero(out Mass mass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassTranslate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassTranslate(ref Mass mass, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassTranslate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassTranslate(ref Mass mass, dReal x, dReal y, dReal z);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply0"), SuppressUnmanagedCodeSecurity]
         public static extern void Multiply0(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
@@ -1755,119 +1755,119 @@ namespace OpenSim.Region.PhysicsModule.ODE
             MultiplyiM3V3(out outvector, ref matrix, ref invector, 3, 3, 1);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply1"), SuppressUnmanagedCodeSecurity]
-                public static extern void Multiply1(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply1"), SuppressUnmanagedCodeSecurity]
+        public static extern void Multiply1(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply2"), SuppressUnmanagedCodeSecurity]
-                public static extern void Multiply2(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply2"), SuppressUnmanagedCodeSecurity]
+        public static extern void Multiply2(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void QFromAxisAndAngle(out Quaternion q, dReal ax, dReal ay, dReal az, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void QFromAxisAndAngle(out Quaternion q, dReal ax, dReal ay, dReal az, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQfromR"), SuppressUnmanagedCodeSecurity]
-                public static extern void QfromR(out Quaternion q, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQfromR"), SuppressUnmanagedCodeSecurity]
+        public static extern void QfromR(out Quaternion q, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply0"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply0(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply0"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply0(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply1"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply1(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply1"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply1(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply2"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply2(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply2"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply2(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply3"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply3(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply3"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply3(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQSetIdentity"), SuppressUnmanagedCodeSecurity]
-                public static extern void QSetIdentity(out Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQSetIdentity"), SuppressUnmanagedCodeSecurity]
+        public static extern void QSetIdentity(out Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref Vector3 center, ref Vector3 extents, int depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref Vector3 center, ref Vector3 extents, int depth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref dReal centerX, ref dReal extentsX, int depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref dReal centerX, ref dReal extentsX, int depth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRandReal"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal RandReal();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRandReal"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal RandReal();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFrom2Axes"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFrom2Axes(out Matrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFrom2Axes"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFrom2Axes(out Matrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromAxisAndAngle(out Matrix3 R, dReal x, dReal y, dReal z, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromAxisAndAngle(out Matrix3 R, dReal x, dReal y, dReal z, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromEulerAngles"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromEulerAngles(out Matrix3 R, dReal phi, dReal theta, dReal psi);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromEulerAngles"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromEulerAngles(out Matrix3 R, dReal phi, dReal theta, dReal psi);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRfromQ"), SuppressUnmanagedCodeSecurity]
-                public static extern void RfromQ(out Matrix3 R, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRfromQ"), SuppressUnmanagedCodeSecurity]
+        public static extern void RfromQ(out Matrix3 R, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromZAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromZAxis(out Matrix3 R, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromZAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromZAxis(out Matrix3 R, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRSetIdentity"), SuppressUnmanagedCodeSecurity]
-                public static extern void RSetIdentity(out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRSetIdentity"), SuppressUnmanagedCodeSecurity]
+        public static extern void RSetIdentity(out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetValue"), SuppressUnmanagedCodeSecurity]
-                public static extern void SetValue(out dReal a, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetValue"), SuppressUnmanagedCodeSecurity]
+        public static extern void SetValue(out dReal a, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetZero"), SuppressUnmanagedCodeSecurity]
-                public static extern void SetZero(out dReal a, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetZero"), SuppressUnmanagedCodeSecurity]
+        public static extern void SetZero(out dReal a, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSimpleSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr SimpleSpaceCreate(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSimpleSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr SimpleSpaceCreate(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveCholesky"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveCholesky(ref dReal L, out dReal b, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveCholesky"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveCholesky(ref dReal L, out dReal b, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveL1(ref dReal L, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveL1(ref dReal L, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1T"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveL1T(ref dReal L, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1T"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveL1T(ref dReal L, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveLDLT"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveLDLT(ref dReal L, ref dReal d, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveLDLT"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveLDLT(ref dReal L, ref dReal d, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceAdd"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceAdd(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceAdd"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceAdd(IntPtr space, IntPtr geom);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceLockQuery"), SuppressUnmanagedCodeSecurity]
         public static extern bool SpaceLockQuery(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceClean"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceClean(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceClean"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceClean(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceCollide(IntPtr space, IntPtr data, NearCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceCollide(IntPtr space, IntPtr data, NearCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide2"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceCollide2(IntPtr space1, IntPtr space2, IntPtr data, NearCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide2"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceCollide2(IntPtr space1, IntPtr space2, IntPtr data, NearCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceDestroy(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceDestroy(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern bool SpaceGetCleanup(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern bool SpaceGetCleanup(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetNumGeoms"), SuppressUnmanagedCodeSecurity]
-                public static extern int SpaceGetNumGeoms(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetNumGeoms"), SuppressUnmanagedCodeSecurity]
+        public static extern int SpaceGetNumGeoms(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr SpaceGetGeom(IntPtr space, int i);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr SpaceGetGeom(IntPtr space, int i);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetSublevel"), SuppressUnmanagedCodeSecurity]
         public static extern int SpaceGetSublevel(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceQuery"), SuppressUnmanagedCodeSecurity]
-                public static extern bool SpaceQuery(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceQuery"), SuppressUnmanagedCodeSecurity]
+        public static extern bool SpaceQuery(IntPtr space, IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceRemove"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceRemove(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceRemove"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceRemove(IntPtr space, IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceSetCleanup(IntPtr space, bool mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceSetCleanup(IntPtr space, bool mode);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetSublevel"), SuppressUnmanagedCodeSecurity]
         public static extern void SpaceSetSublevel(IntPtr space, int sublevel);
@@ -1875,53 +1875,53 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSweepAndPruneSpaceCreate"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr SweepAndPruneSpaceCreate(IntPtr space, int AxisOrder);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dVectorScale"), SuppressUnmanagedCodeSecurity]
-                public static extern void VectorScale(out dReal a, ref dReal d, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dVectorScale"), SuppressUnmanagedCodeSecurity]
+        public static extern void VectorScale(out dReal a, ref dReal d, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr WorldCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr WorldCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldDestroy(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldDestroy(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
         public static extern int WorldGetAutoDisableAverageSamplesCount(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableAngularThreshold(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableAngularThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern bool WorldGetAutoDisableFlag(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern bool WorldGetAutoDisableFlag(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableLinearThreshold(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableLinearThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetAutoDisableSteps(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetAutoDisableSteps(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableTime(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableTime(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetAutoEnableDepthSF1(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetAutoEnableDepthSF1(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetCFM"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetCFM(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetCFM"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetCFM(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetERP"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetERP(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetERP"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetERP(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldGetGravity(IntPtr world, out Vector3 gravity);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldGetGravity(IntPtr world, out Vector3 gravity);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldGetGravity(IntPtr world, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldGetGravity(IntPtr world, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetContactMaxCorrectingVel(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetContactMaxCorrectingVel(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetContactSurfaceLayer(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetContactSurfaceLayer(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAngularDamping"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetAngularDamping(IntPtr world);
@@ -1935,23 +1935,23 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetLinearDampingThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetQuickStepNumIterations(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetQuickStepNumIterations(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepW"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetQuickStepW(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepW"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetQuickStepW(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetMaxAngularSpeed(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out Vector3 force);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out Vector3 force);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out dReal forceX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out dReal forceX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldQuickStep"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldQuickStep(IntPtr world, dReal stepsize);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldQuickStep"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldQuickStep(IntPtr world, dReal stepsize);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAngularDamping(IntPtr world, dReal scale);
@@ -1959,67 +1959,67 @@ namespace OpenSim.Region.PhysicsModule.ODE
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAngularDampingThreshold(IntPtr world, dReal threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableAngularThreshold(IntPtr world, dReal angular_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableAngularThreshold(IntPtr world, dReal angular_threshold);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAutoDisableAverageSamplesCount(IntPtr world, int average_samples_count);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableFlag(IntPtr world, bool do_auto_disable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableFlag(IntPtr world, bool do_auto_disable);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableLinearThreshold(IntPtr world, dReal linear_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableLinearThreshold(IntPtr world, dReal linear_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableSteps(IntPtr world, int steps);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableSteps(IntPtr world, int steps);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableTime(IntPtr world, dReal time);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableTime(IntPtr world, dReal time);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoEnableDepthSF1(IntPtr world, int autoEnableDepth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoEnableDepthSF1(IntPtr world, int autoEnableDepth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetCFM"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetCFM(IntPtr world, dReal cfm);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetCFM"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetCFM(IntPtr world, dReal cfm);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetContactMaxCorrectingVel(IntPtr world, dReal vel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetContactMaxCorrectingVel(IntPtr world, dReal vel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetContactSurfaceLayer(IntPtr world, dReal depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetContactSurfaceLayer(IntPtr world, dReal depth);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetDamping(IntPtr world, dReal linear_scale, dReal angular_scale);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetERP"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetERP(IntPtr world, dReal erp);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetERP"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetERP(IntPtr world, dReal erp);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetGravity(IntPtr world, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetGravity(IntPtr world, dReal x, dReal y, dReal z);
-        
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetLinearDamping(IntPtr world, dReal scale);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetLinearDampingThreshold(IntPtr world, dReal threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetQuickStepNumIterations(IntPtr world, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetQuickStepNumIterations(IntPtr world, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepW"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetQuickStepW(IntPtr world, dReal over_relaxation);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepW"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetQuickStepW(IntPtr world, dReal over_relaxation);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetMaxAngularSpeed(IntPtr world, dReal max_speed);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStep"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldStep(IntPtr world, dReal stepsize);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStep"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldStep(IntPtr world, dReal stepsize);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStepFast1"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldStepFast1(IntPtr world, dReal stepsize, int maxiterations);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStepFast1"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldStepFast1(IntPtr world, dReal stepsize, int maxiterations);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldExportDIF"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldExportDIF(IntPtr world, string filename, bool append, string prefix);
-        }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldExportDIF"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldExportDIF(IntPtr world, string filename, bool append, string prefix);
+    }
 }
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
index aaf90f2..98bfd1c 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         /// Collision geometry
         /// </summary>
         internal IntPtr Shell { get; private set; }
-        
+
         private IntPtr Amotor = IntPtr.Zero;
         private d.Mass ShellMass;
 
@@ -237,7 +237,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             m_tainted_isPhysical = true; // new tainted status: need to create ODE information
 
             _parent_scene.AddPhysicsActorTaint(this);
-            
+
             Name = avName;
         }
 
@@ -461,7 +461,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                             value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
                         }
 
-                        m_taintPosition = value;                        
+                        m_taintPosition = value;
                         _parent_scene.AddPhysicsActorTaint(this);
                     }
                     else
@@ -796,7 +796,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         internal void Move(List<OdeCharacter> defects)
         {
             //  no lock; for now it's only called from within Simulate()
-            
+
             // If the PID Controller isn't active then we set our force
             // calculating base velocity to the current position
 
@@ -811,7 +811,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             d.Vector3 localpos = d.BodyGetPosition(Body);
             Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z);
-            
+
             if (!localPos.IsFinite())
             {
                 m_log.WarnFormat(
@@ -1248,10 +1248,10 @@ namespace OpenSim.Region.PhysicsModule.ODE
         }
 
         public override Vector3 PIDTarget { set { return; } }
-        public override bool PIDActive 
-        { 
+        public override bool PIDActive
+        {
             get { return false; }
-            set { return; } 
+            set { return; }
         }
         public override float PIDTau { set { return; } }
 
@@ -1259,7 +1259,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         public override bool PIDHoverActive {get {return false;} set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
-        
+
         public override Quaternion APIDTarget{ set { return; } }
 
         public override bool APIDActive{ set { return; } }
@@ -1369,7 +1369,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 //                    m_log.DebugFormat(
 //                        "[ODE CHARACTER]: Changing capsule size from {0} to {1} for {2}",
 //                        CAPSULE_LENGTH, m_tainted_CAPSULE_LENGTH, Name);
-                    
+
                     m_pidControllerActive = true;
 
                     // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate()
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
index ff19384..7e95d7f 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
@@ -914,7 +914,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             // Sum velocities
             m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection
-            
+
             if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0)
             {
                 m_lastAngularVelocity.X = 0;
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs b/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs
index d61ee61..22fc84d 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs
@@ -9,14 +9,14 @@ using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.PhysicsModule.ODE
 {
-        [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ODEPhysicsScene")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ODEPhysicsScene")]
     public class OdeModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
-                private IConfigSource m_config;
-                private OdeScene  m_scene;
+        private IConfigSource m_config;
+        private OdeScene  m_scene;
 
        #region INonSharedRegionModule
 
@@ -84,6 +84,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             m_scene.RegionLoaded();
         }
-        #endregion                      
+        #endregion
     }
 }
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
index 36546aa..8934330 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
@@ -33,7 +33,7 @@
  * ODEDynamics.cs contains methods dealing with Prim Physical motion
  * (dynamics) and the associated settings. Old Linear and angular
  * motors for dynamic motion have been replace with  MoveLinear()
- * and MoveAngular(); 'Physical' is used only to switch ODE dynamic 
+ * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
  * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
  * switch between 'VEHICLE' parameter use and general dynamics
  * settings use.
@@ -133,7 +133,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         private float m_targetHoverHeight;
         private float m_groundHeight;
         private float m_waterHeight;
-        private float m_buoyancy;                //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. 
+        private float m_buoyancy;                //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
 
         // private float m_tensor = 5f;
         private int body_autodisable_frames = 20;
@@ -170,7 +170,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
         private PrimitiveBaseShape _pbs;
         private OdeScene _parent_scene;
-        
+
         /// <summary>
         /// The physics space which contains prim geometries
         /// </summary>
@@ -443,7 +443,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
                 d.BodySetAutoDisableFlag(Body, true);
                 d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
-                
+
                 // disconnect from world gravity so we can apply buoyancy
                 d.BodySetGravityMode (Body, false);
 
@@ -474,8 +474,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             float returnMass = 0;
             float hollowAmount = (float)_pbs.ProfileHollow * 2.0e-5f;
-            float hollowVolume = hollowAmount * hollowAmount; 
-            
+            float hollowVolume = hollowAmount * hollowAmount;
+
             switch (_pbs.ProfileShape)
             {
                 case ProfileShape.Square:
@@ -511,16 +511,16 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
                     else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
                         {
-                        //a tube 
+                        //a tube
 
                         volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
                         tmp= 1.0f -2.0e-2f * (float)(200 - _pbs.PathScaleY);
                         volume -= volume*tmp*tmp;
-                        
+
                         if (hollowAmount > 0.0)
                             {
                             hollowVolume *= hollowAmount;
-                            
+
                             switch (_pbs.HollowShape)
                                 {
                                 case HollowShape.Square:
@@ -579,7 +579,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                         volume *= 0.61685027506808491367715568749226e-2f * (float)(200 - _pbs.PathScaleX);
                         tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
                         volume *= (1.0f - tmp * tmp);
-                        
+
                         if (hollowAmount > 0.0)
                             {
 
@@ -845,7 +845,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 else
                 {
                     _parent_scene.DeactivatePrim(this);
-                    
+
                     m_collisionCategories &= ~CollisionCategories.Body;
                     m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
 
@@ -916,7 +916,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 else
                 {
                     _triMeshData = d.GeomTriMeshDataCreate();
-    
+
                     d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);
                     d.GeomTriMeshDataPreprocess(_triMeshData);
                     m_MeshToTriMeshMap[mesh] = _triMeshData;
@@ -974,7 +974,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     rotate();
                 }
             }
-        
+
             if (m_taintPhysics != IsPhysical && !(m_taintparent != _parent))
                 changePhysicsStatus();
 
@@ -1074,7 +1074,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
             else if (_parent != null && m_taintparent == null)
             {
 //Console.WriteLine("  changelink B");
-            
+
                 if (_parent is OdePrim)
                 {
                     OdePrim obj = (OdePrim)_parent;
@@ -1082,16 +1082,16 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     childPrim = false;
                     //_parent = null;
                 }
-                
+
                 /*
                     if (Body != (IntPtr)0 && _linkJointGroup != (IntPtr)0)
                     d.JointGroupDestroy(_linkJointGroup);
-                        
+
                     _linkJointGroup = (IntPtr)0;
                     m_linkJoint = (IntPtr)0;
                 */
             }
- 
+
             _parent = m_taintparent;
             m_taintPhysics = IsPhysical;
         }
@@ -1345,7 +1345,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 // in between the disabling and the collision properties setting
                 // which would wake the physical body up from a soft disabling and potentially cause it to fall
                 // through the ground.
-                
+
                 // NOTE FOR JOINTS: this doesn't always work for jointed assemblies because if you select
                 // just one part of the assembly, the rest of the assembly is non-selected and still simulating,
                 // so that causes the selected part to wake up and continue moving.
@@ -1359,7 +1359,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 // e.g. we select 100 prims that are connected by joints. non-atomically, the first 50 are
                 // selected and disabled. then, due to a thread switch, the selection processing is
                 // interrupted and the physics engine continues to simulate, so the last 50 items, whose
-                // selection was not yet processed, continues to simulate. this wakes up ALL of the 
+                // selection was not yet processed, continues to simulate. this wakes up ALL of the
                 // first 50 again. then the last 50 are disabled. then the first 50, which were just woken
                 // up, start simulating again, which in turn wakes up the last 50.
 
@@ -1565,7 +1565,7 @@ Console.WriteLine("CreateGeom:");
         private void changeadd()
         {
 //            m_log.DebugFormat("[ODE PRIM]: Adding prim {0}", Name);
-            
+
             int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
             IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position);
 
@@ -1711,10 +1711,10 @@ Console.WriteLine(" JointCreateFixed");
 //                    fz = 0f;
                     //m_log.Info(m_collisionFlags.ToString());
 
-                    
+
                     //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
                     // would come from SceneObjectPart.cs, public void SetBuoyancy(float fvalue) , PhysActor.Buoyancy = fvalue; ??
-                    // m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up 
+                    // m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up
                     // gravityz multiplier = 1 - m_buoyancy
                     fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass;
 
@@ -1729,7 +1729,7 @@ Console.WriteLine(" JointCreateFixed");
                         fz = 0f;
 
                         //  no lock; for now it's only called from within Simulate()
-    
+
                         // If the PID Controller isn't active then we set our force
                         // calculating base velocity to the current position
 
@@ -1738,7 +1738,7 @@ Console.WriteLine(" JointCreateFixed");
                             //PID_G = PID_G / m_PIDTau;
                             m_PIDTau = 1;
                         }
-    
+
                         if ((PID_G - m_PIDTau) <= 0)
                         {
                             PID_G = m_PIDTau + 1;
@@ -1761,7 +1761,7 @@ Console.WriteLine(" JointCreateFixed");
                         if (_target_velocity.ApproxEquals(Vector3.Zero,0.1f))
                         {
                             //  keep track of where we stopped.  No more slippin' & slidin'
-    
+
                             // We only want to deactivate the PID Controller if we think we want to have our surrogate
                             // react to the physics scene by moving it's position.
                             // Avatar to Avatar collisions
@@ -1782,7 +1782,7 @@ Console.WriteLine(" JointCreateFixed");
                             // We're flying and colliding with something
                             fx = ((_target_velocity.X) - vel.X) * (PID_D);
                             fy = ((_target_velocity.Y) - vel.Y) * (PID_D);
-    
+
                             // vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
 
                             fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
@@ -1793,7 +1793,7 @@ Console.WriteLine(" JointCreateFixed");
                     if (m_useHoverPID && !PIDActive)
                     {
 //Console.WriteLine("Hover " +  Name);
-                    
+
                         // If we're using the PID controller, then we have no gravity
                         fz = (-1 * _parent_scene.gravityz) * m_mass;
 
@@ -1850,7 +1850,7 @@ Console.WriteLine(" JointCreateFixed");
                         if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
                         {
                             //  keep track of where we stopped.  No more slippin' & slidin'
-    
+
                             // We only want to deactivate the PID Controller if we think we want to have our surrogate
                             // react to the physics scene by moving it's position.
                             // Avatar to Avatar collisions
@@ -1888,7 +1888,7 @@ Console.WriteLine(" JointCreateFixed");
                         {
                             // A physical body at rest on a surface will auto-disable after a while,
                             // this appears to re-enable it incase the surface it is upon vanishes,
-                            // and the body should fall again. 
+                            // and the body should fall again.
                             d.BodySetLinearVel(Body, 0f, 0f, 0f);
                             d.BodySetForce(Body, 0, 0, 0);
                             enableBodySoft();
@@ -1897,7 +1897,7 @@ Console.WriteLine(" JointCreateFixed");
                         // 35x10 = 350n times the mass per second applied maximum.
                         float nmax = 35f * m_mass;
                         float nmin = -35f * m_mass;
-                    
+
                         if (fx > nmax)
                             fx = nmax;
                         if (fx < nmin)
@@ -1916,7 +1916,7 @@ Console.WriteLine(" JointCreateFixed");
               //  _zeroPosition = d.BodyGetPosition(Body);
                 return;
 //Console.WriteLine("Nothing " +  Name);
-               
+
             }
         }
 
@@ -1942,7 +1942,7 @@ Console.WriteLine(" JointCreateFixed");
                 // daughter prim, do Geom set
                 d.GeomSetQuaternion(prim_geom, ref myrot);
             }
-            
+
             resetCollisionAccounting();
             m_taintrot = _orientation;
         }
@@ -2080,7 +2080,7 @@ Console.WriteLine(" JointCreateFixed");
                     else
                         m_assetFailed = false;
                 }
-                    
+
             }
 
             CreateGeom(m_targetSpace, mesh);
@@ -2312,7 +2312,7 @@ Console.WriteLine(" JointCreateFixed");
                         }
                         d.BodyEnable(Body);
                         d.BodyAddTorque(Body, iforce.X, iforce.Y, iforce.Z);
-                        
+
                     }
                     m_angularforcelist.Clear();
                 }
@@ -2342,7 +2342,7 @@ Console.WriteLine(" JointCreateFixed");
                         d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
                     }
                 }
-                
+
                 //resetCollisionAccounting();
             }
 
@@ -2686,7 +2686,7 @@ Console.WriteLine(" JointCreateFixed");
 
             if(m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)
                 m_vehicle.Stop(); // this also updates vehicle last position from the body position
-            
+
             enableBodySoft();
 
             outofBounds = false;
@@ -2899,12 +2899,12 @@ Console.WriteLine(" JointCreateFixed");
                         _acceleration = ((_velocity - m_lastVelocity) / 0.1f);
                         _acceleration = new Vector3(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f);
                         //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString());
-                       
-                        // Note here that linearvelocity is affecting angular velocity...  so I'm guessing this is a vehicle specific thing... 
-                        // it does make sense to do this for tiny little instabilities with physical prim, however 0.5m/frame is fairly large. 
+
+                        // Note here that linearvelocity is affecting angular velocity...  so I'm guessing this is a vehicle specific thing...
+                        // it does make sense to do this for tiny little instabilities with physical prim, however 0.5m/frame is fairly large.
                         // reducing this to 0.02m/frame seems to help the angular rubberbanding quite a bit, however, to make sure it doesn't affect elevators and vehicles
                         // adding these logical exclusion situations to maintain this where I think it was intended to be.
-                        if (m_throttleUpdates || PIDActive || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero)) 
+                        if (m_throttleUpdates || PIDActive || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero))
                         {
                             m_minvelocity = 0.5f;
                         }
@@ -2973,8 +2973,8 @@ Console.WriteLine(" JointCreateFixed");
         {
         }
 
-        public override Vector3 PIDTarget 
-        { 
+        public override Vector3 PIDTarget
+        {
             set
             {
                 if (value.IsFinite())
@@ -2983,7 +2983,7 @@ Console.WriteLine(" JointCreateFixed");
                 }
                 else
                     m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);
-            } 
+            }
         }
 
         public override bool PIDActive { get; set; }
@@ -2993,7 +2993,7 @@ Console.WriteLine(" JointCreateFixed");
         public override bool PIDHoverActive { get { return m_useHoverPID;} set { m_useHoverPID = value; } }
         public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
         public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
-        
+
         public override Quaternion APIDTarget{ set { return; } }
 
         public override bool APIDActive{ set { return; } }
@@ -3189,7 +3189,7 @@ Console.WriteLine(" JointCreateFixed");
 //                m_assetFailed = false;
 
 //                m_log.DebugFormat(
-//                    "[ODE PRIM]: Received mesh/sculpt data asset {0} with {1} bytes for {2} at {3} in {4}", 
+//                    "[ODE PRIM]: Received mesh/sculpt data asset {0} with {1} bytes for {2} at {3} in {4}",
 //                    _pbs.SculptTexture, _pbs.SculptData.Length, Name, _position, _parent_scene.Name);
 
                 m_taintshape = true;
@@ -3201,6 +3201,6 @@ Console.WriteLine(" JointCreateFixed");
                     "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}",
                     _pbs.SculptTexture, Name, _position, _parent_scene.PhysicsSceneName);
             }
-        }          
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
index a21ec2b..78dd7de 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         {
             m_scene = pScene;
             nearCallback = near;
-            
+
         }
 
         /// <summary>
@@ -136,7 +136,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                     ODERayCastRequest[] reqs = m_PendingRequests.ToArray();
                     for (int i = 0; i < reqs.Length; i++)
                     {
-                        if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast 
+                        if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
                             RayCast(reqs[i]);               // if there isn't anyone to send results
                     }
 
@@ -151,7 +151,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                     ODERayRequest[] reqs = m_PendingRayRequests.ToArray();
                     for (int i = 0; i < reqs.Length; i++)
                     {
-                        if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast 
+                        if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
                             RayCast(reqs[i]);               // if there isn't anyone to send results
                     }
 
@@ -247,7 +247,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                     req.callbackMethod(m_contactResults);
             }
         }
-        
+
         // This is the standard Near.   Uses space AABBs to speed up detection.
         private void near(IntPtr space, IntPtr g1, IntPtr g2)
         {
@@ -262,7 +262,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             {
                 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
                     return;
-                
+
                 // Separating static prim geometry spaces.
                 // We'll be calling near recursivly if one
                 // of them is a space to find all of the
@@ -290,7 +290,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             int count = 0;
             try
             {
-                
+
                 if (g1 == g2)
                     return; // Can't collide with yourself
 
@@ -326,7 +326,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                     if (p1 is OdePrim)
                     {
                         ContactResult collisionresult = new ContactResult();
-                    
+
                         collisionresult.ConsumerID = p1.LocalID;
                         collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
                         collisionresult.Depth = contacts[i].depth;
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index ed2aad4..d15568e 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         /// </remarks>
         internal static Object UniversalColliderSyncObject = new Object();
         internal static Object SimulationLock = new Object();
-        
+
         /// <summary>
         /// Is stats collecting enabled for this ODE scene?
         /// </summary>
@@ -495,14 +495,14 @@ namespace OpenSim.Region.PhysicsModule.ODE
         int spaceGridMaxY;
 
         private ODERayCastRequestManager m_rayCastManager;
-        
-                public Scene m_frameWorkScene = null;
+
+        public Scene m_frameWorkScene = null;
 
         public OdeScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion)
-                {
-                        m_config = psourceconfig;
-                        m_frameWorkScene = pscene;
-                        
+        {
+            m_config = psourceconfig;
+            m_frameWorkScene = pscene;
+
             EngineType = pname;
             PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
             EngineName = pname + " " + pversion;
@@ -513,8 +513,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
             InitialiseFromConfig(m_config);
 
             // This may not be that good since terrain may not be avaiable at this point
-            base.Initialise(pscene.PhysicsRequestAsset, 
-                (pscene.Heightmap != null ? pscene.Heightmap.GetFloatsSerialised() : new float[(int)(extent.X * extent.Y)]), 
+            base.Initialise(pscene.PhysicsRequestAsset,
+                (pscene.Heightmap != null ? pscene.Heightmap.GetFloatsSerialised() : new float[(int)(extent.X * extent.Y)]),
                 (float)pscene.RegionInfo.RegionSettings.WaterHeight);
 
         }
@@ -524,8 +524,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
             mesher = m_frameWorkScene.RequestModuleInterface<IMesher>();
             if (mesher == null)
                 m_log.WarnFormat("[ODE SCENE]: No mesher in {0}. Things will not work well.", PhysicsSceneName);
-                                
-                        m_frameWorkScene.PhysicsEnabled = true;                         
+
+            m_frameWorkScene.PhysicsEnabled = true;
         }
 
         /// <summary>
@@ -535,11 +535,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
         /// </summary>
         private void Initialise(Vector3 regionExtent)
         {
-                        WorldExtents.X = regionExtent.X;
+            WorldExtents.X = regionExtent.X;
             m_regionWidth = (uint)regionExtent.X;
             WorldExtents.Y = regionExtent.Y;
             m_regionHeight = (uint)regionExtent.Y;
-                        
+
             nearCallback = near;
             m_rayCastManager = new ODERayCastRequestManager(this);
 
@@ -671,7 +671,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 spacesPerMeterY = spaceGridMaxY / WorldExtents.Y;
             }
 
-            staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY]; 
+            staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY];
 
             // make this index limits
             spaceGridMaxX--;
@@ -948,7 +948,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             {
                 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
                     return;
-                
+
                 // Separating static prim geometry spaces.
                 // We'll be calling near recursivly if one
                 // of them is a space to find all of the
@@ -1027,10 +1027,10 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             PhysicsActor p1;
             PhysicsActor p2;
-            
+
             p1ExpectedPoints = 0;
             p2ExpectedPoints = 0;
-            
+
             if (!actor_name_map.TryGetValue(g1, out p1))
             {
                 p1 = PANull;
@@ -1067,7 +1067,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 IntPtr joint;
                 // If we're colliding with terrain, use 'TerrainContact' instead of contact.
                 // allows us to have different settings
-                
+
                 // We only need to test p2 for 'jump crouch purposes'
                 if (p2 is OdeCharacter && p1.PhysicsActorType == (int)ActorTypes.Prim)
                 {
@@ -1081,7 +1081,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 {
                     p2.IsColliding = true;
                 }
-                
+
                 //if ((framecount % m_returncollisions) == 0)
 
                 switch (p1.PhysicsActorType)
@@ -1160,7 +1160,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
                 // Logic for collision handling
                 // Note, that if *all* contacts are skipped (VolumeDetect)
-                // The prim still detects (and forwards) collision events but 
+                // The prim still detects (and forwards) collision events but
                 // appears to be phantom for the world
                 Boolean skipThisContact = false;
 
@@ -1235,10 +1235,10 @@ namespace OpenSim.Region.PhysicsModule.ODE
                                         material = ((OdePrim) p2).m_material;
                                         p2ExpectedPoints = ((OdePrim)p2).ExpectedCollisionContacts;
                                     }
-                                   
+
                                     // Unnessesary because p1 is defined above
                                     //if (p1 is OdePrim)
-                                    // { 
+                                    // {
                                     //     p1ExpectedPoints = ((OdePrim)p1).ExpectedCollisionContacts;
                                     // }
                                     //m_log.DebugFormat("Material: {0}", material);
@@ -1350,7 +1350,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                                 material = ((OdePrim)p2).m_material;
                                 p2ExpectedPoints = ((OdePrim)p2).ExpectedCollisionContacts;
                             }
-                            
+
                             //m_log.DebugFormat("Material: {0}", material);
                             m_materialContacts[material, 0].geom = curContact;
 
@@ -1370,7 +1370,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 }
 
                 collision_accounting_events(p1, p2, maxDepthContact);
-                
+
                 if (count > ((p1ExpectedPoints + p2ExpectedPoints) * 0.25) + (geomContactPointsStartthrottle))
                 {
                     // If there are more then 3 contact points, it's likely
@@ -1410,7 +1410,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                              break;
                         }
                     }
-                } 
+                }
                 else if (at == ActorTypes.Prim)
                 {
                     if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)))
@@ -1544,11 +1544,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 // since we don't know if we're colliding yet
                 if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
                     continue;
-                
+
                 chr.IsColliding = false;
                 chr.CollidingGround = false;
                 chr.CollidingObj = false;
-                
+
                 // Test the avatar's geometry for collision with the space
                 // This will return near and the space that they are the closest to
                 // And we'll run this again against the avatar and the space segment
@@ -1562,7 +1562,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 {
                     m_log.ErrorFormat("[ODE SCENE]: Unable to space collide {0}", PhysicsSceneName);
                 }
-                
+
                 //float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
                 //if (chr.Position.Z + (chr.Velocity.Z * timeStep) < terrainheight + 10)
                 //{
@@ -1655,7 +1655,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                             //m_log.DebugFormat("x{0} y{1} = {2}", x, y, (float)TerrainHeightFieldHeights[heightFieldGeom][index]);
                             return (float)TerrainHeightFieldHeights[heightFieldGeom][index];
                         }
-                            
+
                         else
                             return 0f;
                     }
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             {
                 return 0f;
             }
-        } 
+        }
 // End recovered. Kitto Flora
 
         /// <summary>
@@ -1685,7 +1685,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
         internal void AddCollisionEventReporting(PhysicsActor obj)
         {
 //            m_log.DebugFormat("[PHYSICS]: Adding {0} {1} to collision event reporting", obj.SOPName, obj.LocalID);
-            
+
             lock (m_collisionEventActorsChanges)
                 m_collisionEventActorsChanges[obj.LocalID] = obj;
         }
@@ -2071,7 +2071,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             lock (externalJointRequestsLock)
             {
-                if (!requestedJointsToBeCreated.Contains(joint)) // forbid same creation request from entering twice 
+                if (!requestedJointsToBeCreated.Contains(joint)) // forbid same creation request from entering twice
                 {
                     requestedJointsToBeCreated.Add(joint);
                 }
@@ -2417,7 +2417,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 //            waitForSpaceUnlock(space);
             d.SpaceSetSublevel(space, 1);
             d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]);
-            
+
             return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY];
         }
 
@@ -2514,7 +2514,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 iPropertiesNotSupportedDefault++;
 
             if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
-                iPropertiesNotSupportedDefault++; 
+                iPropertiesNotSupportedDefault++;
 
             if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
                 iPropertiesNotSupportedDefault++;
@@ -2587,7 +2587,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 #if SPAM
             m_log.Debug("Mesh");
 #endif
-            return true; 
+            return true;
         }
 
         /// <summary>
@@ -2652,7 +2652,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                         }
                         _taintedPrims.Clear();
                     }
-                   
+
                     int time = Util.EnvironmentTickCountSubtract(tstart);
                     m_log.InfoFormat("[Ode] finished {0} operations in {1}ms", donechanges, time);
                 }
@@ -2716,7 +2716,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
             }
 
-            
+
             lock (OdeLock)
             {
                 d.AllocateODEDataForThread(~0U);
@@ -3109,7 +3109,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                                         // as the axis for the hinge.
 
                                         // Therefore, we must get the joint's coordinate frame based on the
-                                        // joint.Rotation field, which originates from the orientation of the 
+                                        // joint.Rotation field, which originates from the orientation of the
                                         // joint's proxy object in the scene.
 
                                         // The joint's coordinate frame is defined as the transformation matrix
@@ -3237,7 +3237,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             int startTime = Util.EnvironmentTickCount();
             m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0} with offset {1}", PhysicsSceneName, pOffset);
 
-            
+
             float[] _heightmap;
 
             // ok im lasy this are just a aliases
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
index 28d2b53..341530e 100644
--- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
+++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
@@ -273,10 +273,10 @@ namespace OpenSim.Region.PhysicsModule.POS
             set { return; }
         }
 
-        public override bool PIDActive 
-        { 
+        public override bool PIDActive
+        {
             get { return false; }
-            set { return; } 
+            set { return; }
         }
 
         public override float PIDTau
@@ -304,7 +304,7 @@ namespace OpenSim.Region.PhysicsModule.POS
         {
             set { return; }
         }
-        
+
         public override Quaternion APIDTarget
         {
             set { return; }
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
index 88169bb..1a8409e 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
     // Values for level of detail to be passed to the mesher.
     // Values origionally chosen for the LOD of sculpties (the sqrt(width*heigth) of sculpt texture)
     // Lower level of detail reduces the number of vertices used to represent the meshed shape.
-    public enum LevelOfDetail 
+    public enum LevelOfDetail
     {
         High = 32,
         Medium = 16,
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
index 432708c..8079e79 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
     class NullPhysicsScene : PhysicsScene
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static int m_workIndicator;
 
         public override PhysicsActor AddAvatar(
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
index 250b155..33f0337 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
@@ -134,8 +134,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
                 m_objCollisionList.Add(localID, contact);
             }
             else
-            {   
-                float lastVel = m_objCollisionList[localID].RelativeSpeed;        
+            {
+                float lastVel = m_objCollisionList[localID].RelativeSpeed;
                 if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth)
                 {
                     if(Math.Abs(lastVel) > Math.Abs(contact.RelativeSpeed))
@@ -201,7 +201,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         {
             get { return new NullPhysicsActor(); }
         }
-   
+
         public virtual bool Building { get; set; }
 
         public virtual void getContactData(ref ContactData cdata)
@@ -263,7 +263,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public abstract void delink();
 
         public abstract void LockAngularMotion(byte axislocks);
- 
+
         public virtual void RequestPhysicsterseUpdate()
         {
             // Make a temporary copy of the event to avoid possibility of
@@ -326,7 +326,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public abstract void VehicleFlags(int param, bool remove);
 
         // This is an overridable version of SetVehicle() that works for all physics engines.
-        // This is VERY inefficient. It behoves any physics engine to override this and 
+        // This is VERY inefficient. It behoves any physics engine to override this and
         //     implement a more efficient setting of all the vehicle parameters.
         public virtual void SetVehicle(object pvdata)
         {
@@ -453,7 +453,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public abstract bool APIDActive { set;}
         public abstract float APIDStrength { set;}
         public abstract float APIDDamping { set;}
-        
+
         public abstract void AddForce(Vector3 force, bool pushforce);
         public abstract void AddAngularForce(Vector3 force, bool pushforce);
         public abstract void SetMomentum(Vector3 momentum);
@@ -465,7 +465,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
 
         // Warning in a parent part it returns itself, not null
         public virtual PhysicsActor ParentActor { get { return this; } }
-        
+
 
         // Extendable interface for new, physics engine specific operations
         public virtual object Extension(string pFunct, params object[] pParams)
@@ -629,7 +629,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public override int PhysicsActorType
         {
             get { return (int)m_actorType; }
-            set {               
+            set {
                 ActorTypes type = (ActorTypes)value;
                 switch (type)
                 {
@@ -664,10 +664,10 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
 
         public override Vector3 PIDTarget { set { return; } }
 
-        public override bool PIDActive 
+        public override bool PIDActive
         {
             get { return false; }
-            set { return; } 
+            set { return; }
         }
 
         public override float PIDTau { set { return; } }
@@ -676,12 +676,12 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public override bool PIDHoverActive {get {return false;} set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
-        
+
         public override Quaternion APIDTarget { set { return; } }
         public override bool APIDActive { set { return; } }
         public override float APIDStrength { set { return; } }
         public override float APIDDamping { set { return; } }
-        
+
         public override void SetMomentum(Vector3 momentum) { }
 
         public override void SubscribeEvents(int ms) { }
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
index aa51c4e..e8d6334 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public virtual PhysicsActor AddAvatar(
             uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
         {
-            PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying);             
+            PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying);
             return ret;
         }
 
@@ -217,7 +217,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
             return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
         }
 
-                           
+
         public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid)
         {
@@ -335,16 +335,16 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         /// <summary>
         /// Queue a raycast against the physics scene.
         /// The provided callback method will be called when the raycast is complete
-        /// 
-        /// Many physics engines don't support collision testing at the same time as 
-        /// manipulating the physics scene, so we queue the request up and callback 
+        ///
+        /// Many physics engines don't support collision testing at the same time as
+        /// manipulating the physics scene, so we queue the request up and callback
         /// a custom method when the raycast is complete.
         /// This allows physics engines that give an immediate result to callback immediately
         /// and ones that don't, to callback when it gets a result back.
-        /// 
+        ///
         /// ODE for example will not allow you to change the scene while collision testing or
         /// it asserts, 'opteration not valid for locked space'.  This includes adding a ray to the scene.
-        /// 
+        ///
         /// This is named RayCastWorld to not conflict with modrex's Raycast method.
         /// </summary>
         /// <param name="position">Origin of the ray</param>
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
index 76a82fa..5aae42f 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         public Vector3(Vector3 pv) : this(pv.X, pv.Y, pv.Z)
         {
         }
-        
+
         public void setValues(float x, float y, float z)
         {
             X = x;
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
index e850b11..0b4c8c6 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
         TYPE_NONE = 0,
 
         /// <summary>
-        /// No Angular motor, High Left right friction, No Hover, Linear Deflection 1, no angular deflection 
+        /// No Angular motor, High Left right friction, No Hover, Linear Deflection 1, no angular deflection
         /// no vertical attractor, No banking, Identity rotation frame
         /// </summary>
         TYPE_SLED = 1,
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
index daf3af1..35adf11 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
@@ -34,8 +34,8 @@ 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.
- * 
- * changes by opensim team; 
+ *
+ * changes by opensim team;
  * changes by Aurora team http://www.aurora-sim.org/
  * changes by Ubit Umarov
  */
@@ -51,18 +51,18 @@ namespace OdeAPI
 // at least we save same memory and memory access time, FPU performance on intel usually is similar
 //      using dReal = System.Double;
 //#else
-        using dReal = System.Single;
+    using dReal = System.Single;
 //#endif
 
-        public static class d
-        {
-                public static dReal Infinity = dReal.MaxValue;
+    public static class d
+    {
+        public static dReal Infinity = dReal.MaxValue;
         public static int NTotalBodies = 0;
         public static int NTotalGeoms = 0;
 
         public const uint CONTACTS_UNIMPORTANT = 0x80000000;
 
-                #region Flags and Enumerations
+        #region Flags and Enumerations
 
         [Flags]
         public enum AllocateODEDataFlags : uint
@@ -78,101 +78,101 @@ namespace OdeAPI
             dInitFlagManualThreadCleanup = 0x00000001
         }
 
-                [Flags]
-                public enum ContactFlags : int
-                {
-                        Mu2 = 0x001,
-                        FDir1 = 0x002,
-                        Bounce = 0x004,
-                        SoftERP = 0x008,
-                        SoftCFM = 0x010,
-                        Motion1 = 0x020,
-                        Motion2 = 0x040,
+        [Flags]
+        public enum ContactFlags : int
+        {
+            Mu2 = 0x001,
+            FDir1 = 0x002,
+            Bounce = 0x004,
+            SoftERP = 0x008,
+            SoftCFM = 0x010,
+            Motion1 = 0x020,
+            Motion2 = 0x040,
             MotionN = 0x080,
-                        Slip1 = 0x100,
-                        Slip2 = 0x200,
-                        Approx0 = 0x0000,
-                        Approx1_1 = 0x1000,
-                        Approx1_2 = 0x2000,
-                        Approx1 = 0x3000
-                }
-
-                public enum GeomClassID : int
-                {
-                        SphereClass,
-                        BoxClass,
-                        CapsuleClass,
-                        CylinderClass,
-                        PlaneClass,
-                        RayClass,
-                        ConvexClass,
-                        GeomTransformClass,
-                        TriMeshClass,
+            Slip1 = 0x100,
+            Slip2 = 0x200,
+            Approx0 = 0x0000,
+            Approx1_1 = 0x1000,
+            Approx1_2 = 0x2000,
+            Approx1 = 0x3000
+        }
+
+        public enum GeomClassID : int
+        {
+            SphereClass,
+            BoxClass,
+            CapsuleClass,
+            CylinderClass,
+            PlaneClass,
+            RayClass,
+            ConvexClass,
+            GeomTransformClass,
+            TriMeshClass,
             HeightfieldClass,
-                        FirstSpaceClass,
-                        SimpleSpaceClass = FirstSpaceClass,
-                        HashSpaceClass,
-                        QuadTreeSpaceClass,
-                        LastSpaceClass = QuadTreeSpaceClass,
+            FirstSpaceClass,
+            SimpleSpaceClass = FirstSpaceClass,
+            HashSpaceClass,
+            QuadTreeSpaceClass,
+            LastSpaceClass = QuadTreeSpaceClass,
             ubtTerrainClass,
-                        FirstUserClass,
-                        LastUserClass = FirstUserClass + MaxUserClasses - 1,
-                        NumClasses,
-                        MaxUserClasses = 5
-                }
-
-                public enum JointType : int
-                {
-                        None,
-                        Ball,
-                        Hinge,
-                        Slider,
-                        Contact,
-                        Universal,
-                        Hinge2,
-                        Fixed,
-                        Null,
-                        AMotor,
-                        LMotor,
-                        Plane2D
-                }
-
-                public enum JointParam : int
-                {
-                        LoStop,
-                        HiStop,
-                        Vel,
-                        FMax,
-                        FudgeFactor,
-                        Bounce,
-                        CFM,
-                        StopERP,
-                        StopCFM,
-                        SuspensionERP,
-                        SuspensionCFM,
-                        LoStop2 = 256,
-                        HiStop2,
-                        Vel2,
-                        FMax2,
-                        FudgeFactor2,
-                        Bounce2,
-                        CFM2,
-                        StopERP2,
-                        StopCFM2,
-                        SuspensionERP2,
-                        SuspensionCFM2,
-                        LoStop3 = 512,
-                        HiStop3,
-                        Vel3,
-                        FMax3,
-                        FudgeFactor3,
-                        Bounce3,
-                        CFM3,
-                        StopERP3,
-                        StopCFM3,
-                        SuspensionERP3,
-                        SuspensionCFM3
-                }
+            FirstUserClass,
+            LastUserClass = FirstUserClass + MaxUserClasses - 1,
+            NumClasses,
+            MaxUserClasses = 5
+        }
+
+        public enum JointType : int
+        {
+            None,
+            Ball,
+            Hinge,
+            Slider,
+            Contact,
+            Universal,
+            Hinge2,
+            Fixed,
+            Null,
+            AMotor,
+            LMotor,
+            Plane2D
+        }
+
+        public enum JointParam : int
+        {
+            LoStop,
+            HiStop,
+            Vel,
+            FMax,
+            FudgeFactor,
+            Bounce,
+            CFM,
+            StopERP,
+            StopCFM,
+            SuspensionERP,
+            SuspensionCFM,
+            LoStop2 = 256,
+            HiStop2,
+            Vel2,
+            FMax2,
+            FudgeFactor2,
+            Bounce2,
+            CFM2,
+            StopERP2,
+            StopCFM2,
+            SuspensionERP2,
+            SuspensionCFM2,
+            LoStop3 = 512,
+            HiStop3,
+            Vel3,
+            FMax3,
+            FudgeFactor3,
+            Bounce3,
+            CFM3,
+            StopERP3,
+            StopCFM3,
+            SuspensionERP3,
+            SuspensionCFM3
+        }
 
         public enum dSweepAndPruneAxis : int
         {
@@ -184,24 +184,24 @@ namespace OdeAPI
             ZYX = ((2)|(1<<2)|(0<<4))
         }
 
-                #endregion
+        #endregion
 
-                #region Callbacks
+        #region Callbacks
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int AABBTestFn(IntPtr o1, IntPtr o2, ref AABB aabb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int AABBTestFn(IntPtr o1, IntPtr o2, ref AABB aabb);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int ColliderFn(IntPtr o1, IntPtr o2, int flags, out ContactGeom contact, int skip);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int ColliderFn(IntPtr o1, IntPtr o2, int flags, out ContactGeom contact, int skip);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void GetAABBFn(IntPtr geom, out AABB aabb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void GetAABBFn(IntPtr geom, out AABB aabb);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate ColliderFn GetColliderFnFn(int num);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate ColliderFn GetColliderFnFn(int num);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void GeomDtorFn(IntPtr o);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void GeomDtorFn(IntPtr o);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate dReal HeightfieldGetHeight(IntPtr p_user_data, int x, int z);
@@ -209,230 +209,230 @@ namespace OdeAPI
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate dReal OSTerrainGetHeight(IntPtr p_user_data, int x, int z);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount);
 
-                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-                public delegate int TriRayCallback(IntPtr trimesh, IntPtr ray, int triangleIndex, dReal u, dReal v);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate int TriRayCallback(IntPtr trimesh, IntPtr ray, int triangleIndex, dReal u, dReal v);
 
-                #endregion
+        #endregion
 
-                #region Structs
+        #region Structs
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct AABB
-                {
-                        public dReal MinX, MaxX;
-                        public dReal MinY, MaxY;
-                        public dReal MinZ, MaxZ;
-                }
+        [StructLayout(LayoutKind.Sequential)]
+        public struct AABB
+        {
+            public dReal MinX, MaxX;
+            public dReal MinY, MaxY;
+            public dReal MinZ, MaxZ;
+        }
 
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Contact
-                {
-                        public SurfaceParameters surface;
-                        public ContactGeom geom;
-                        public Vector3 fdir1;
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Contact
+        {
+            public SurfaceParameters surface;
+            public ContactGeom geom;
+            public Vector3 fdir1;
             public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(Contact));
-                }
+        }
 
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct ContactGeom
-                {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct ContactGeom
+        {
 
-                        public Vector3 pos;
-                        public Vector3 normal;
-                        public dReal depth;
-                        public IntPtr g1;
-                        public IntPtr g2;
-                        public int side1;
-                        public int side2;
+            public Vector3 pos;
+            public Vector3 normal;
+            public dReal depth;
+            public IntPtr g1;
+            public IntPtr g2;
+            public int side1;
+            public int side2;
             public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(ContactGeom));
         }
 
-                [StructLayout(LayoutKind.Sequential)]
-                public struct GeomClass
-                {
-                        public int bytes;
-                        public GetColliderFnFn collider;
-                        public GetAABBFn aabb;
-                        public AABBTestFn aabb_test;
-                        public GeomDtorFn dtor;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct JointFeedback 
-                {
-                        public Vector3 f1;
-                        public Vector3 t1;
-                        public Vector3 f2;
-                        public Vector3 t2;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Mass
-                {
-                        public dReal mass;
-                        public Vector4 c;
-                        public Matrix3 I;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Matrix3
-                {
-                        public Matrix3(dReal m00, dReal m10, dReal m20, dReal m01, dReal m11, dReal m21, dReal m02, dReal m12, dReal m22)
-                        {
-                                M00 = m00;  M10 = m10;  M20 = m20;  _m30 = 0.0f;
-                                M01 = m01;  M11 = m11;  M21 = m21;  _m31 = 0.0f;
-                                M02 = m02;  M12 = m12;  M22 = m22;  _m32 = 0.0f;
-                        }
-                        public dReal M00, M10, M20;
-                        private dReal _m30;
-                        public dReal M01, M11, M21;
-                        private dReal _m31;
-                        public dReal M02, M12, M22;
-                        private dReal _m32;
-                }
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Matrix4
-                {
-                        public Matrix4(dReal m00, dReal m10, dReal m20, dReal m30,
-                                dReal m01, dReal m11, dReal m21, dReal m31,
-                                dReal m02, dReal m12, dReal m22, dReal m32,
-                                dReal m03, dReal m13, dReal m23, dReal m33)
-                        {
-                                M00 = m00; M10 = m10; M20 = m20; M30 = m30;
-                                M01 = m01; M11 = m11; M21 = m21; M31 = m31;
-                                M02 = m02; M12 = m12; M22 = m22; M32 = m32;
-                                M03 = m03; M13 = m13; M23 = m23; M33 = m33;
-                        }
-                        public dReal M00, M10, M20, M30;
-                        public dReal M01, M11, M21, M31;
-                        public dReal M02, M12, M22, M32;
-                        public dReal M03, M13, M23, M33;
-                }
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Quaternion
-                {
-                        public dReal W, X, Y, Z;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct SurfaceParameters
-                {
-                        public ContactFlags mode;
-                        public dReal mu;
-                        public dReal mu2;
-                        public dReal bounce;
-                        public dReal bounce_vel;
-                        public dReal soft_erp;
-                        public dReal soft_cfm;
-                        public dReal motion1;
-                        public dReal motion2;
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GeomClass
+        {
+            public int bytes;
+            public GetColliderFnFn collider;
+            public GetAABBFn aabb;
+            public AABBTestFn aabb_test;
+            public GeomDtorFn dtor;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct JointFeedback
+        {
+            public Vector3 f1;
+            public Vector3 t1;
+            public Vector3 f2;
+            public Vector3 t2;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Mass
+        {
+            public dReal mass;
+            public Vector4 c;
+            public Matrix3 I;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Matrix3
+        {
+            public Matrix3(dReal m00, dReal m10, dReal m20, dReal m01, dReal m11, dReal m21, dReal m02, dReal m12, dReal m22)
+            {
+                M00 = m00;  M10 = m10;  M20 = m20;  _m30 = 0.0f;
+                M01 = m01;  M11 = m11;  M21 = m21;  _m31 = 0.0f;
+                M02 = m02;  M12 = m12;  M22 = m22;  _m32 = 0.0f;
+            }
+            public dReal M00, M10, M20;
+            private dReal _m30;
+            public dReal M01, M11, M21;
+            private dReal _m31;
+            public dReal M02, M12, M22;
+            private dReal _m32;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Matrix4
+        {
+            public Matrix4(dReal m00, dReal m10, dReal m20, dReal m30,
+                dReal m01, dReal m11, dReal m21, dReal m31,
+                dReal m02, dReal m12, dReal m22, dReal m32,
+                dReal m03, dReal m13, dReal m23, dReal m33)
+            {
+                M00 = m00; M10 = m10; M20 = m20; M30 = m30;
+                M01 = m01; M11 = m11; M21 = m21; M31 = m31;
+                M02 = m02; M12 = m12; M22 = m22; M32 = m32;
+                M03 = m03; M13 = m13; M23 = m23; M33 = m33;
+            }
+            public dReal M00, M10, M20, M30;
+            public dReal M01, M11, M21, M31;
+            public dReal M02, M12, M22, M32;
+            public dReal M03, M13, M23, M33;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Quaternion
+        {
+            public dReal W, X, Y, Z;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SurfaceParameters
+        {
+            public ContactFlags mode;
+            public dReal mu;
+            public dReal mu2;
+            public dReal bounce;
+            public dReal bounce_vel;
+            public dReal soft_erp;
+            public dReal soft_cfm;
+            public dReal motion1;
+            public dReal motion2;
             public dReal motionN;
-                        public dReal slip1;
-                        public dReal slip2;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Vector3
-                {
-                        public Vector3(dReal x, dReal y, dReal z)
-                        {
-                                X = x;  Y = y;  Z = z;  _w = 0.0f;
-                        }
-                        public dReal X, Y, Z;
-                        private dReal _w;
-                }
-
-
-                [StructLayout(LayoutKind.Sequential)]
-                public struct Vector4
-                {
-                        public Vector4(dReal x, dReal y, dReal z, dReal w)
-                        {
-                                X = x;  Y = y;  Z = z;  W = w;
-                        }
-                        public dReal X, Y, Z, W;
-                }
-
-                #endregion
+            public dReal slip1;
+            public dReal slip2;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Vector3
+        {
+            public Vector3(dReal x, dReal y, dReal z)
+            {
+                X = x;  Y = y;  Z = z;  _w = 0.0f;
+            }
+            public dReal X, Y, Z;
+            private dReal _w;
+        }
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Vector4
+        {
+            public Vector4(dReal x, dReal y, dReal z, dReal w)
+            {
+                X = x;  Y = y;  Z = z;  W = w;
+            }
+            public dReal X, Y, Z, W;
+        }
+
+        #endregion
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAllocateODEDataForThread"), SuppressUnmanagedCodeSecurity]
         public static extern int AllocateODEDataForThread(uint ODEInitFlags);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnected"), SuppressUnmanagedCodeSecurity]
-                public static extern bool AreConnected(IntPtr b1, IntPtr b2);
+        public static extern bool AreConnected(IntPtr b1, IntPtr b2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnectedExcluding"), SuppressUnmanagedCodeSecurity]
-                public static extern bool AreConnectedExcluding(IntPtr b1, IntPtr b2, JointType joint_type);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnectedExcluding"), SuppressUnmanagedCodeSecurity]
+        public static extern bool AreConnectedExcluding(IntPtr b1, IntPtr b2, JointType joint_type);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForce(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtRelPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForce(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtRelPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddRelTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddRelTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyAddTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyAddTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyPosition(IntPtr body, out Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyPosition(IntPtr body, out Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyPosition(IntPtr body, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyPosition(IntPtr body, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyQuaternion(IntPtr body, out Quaternion quat);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyQuaternion(IntPtr body, out Quaternion quat);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyQuaternion(IntPtr body, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyQuaternion(IntPtr body, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyRotation(IntPtr body, out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyRotation(IntPtr body, out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyCopyRotation(IntPtr body, out dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyCopyRotation(IntPtr body, out dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyiCreate(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyiCreate(IntPtr world);
         public static IntPtr BodyCreate(IntPtr world)
         {
             NTotalBodies++;
             return BodyiCreate(world);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDestroy"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDestroy"), SuppressUnmanagedCodeSecurity]
         public static extern void BodyiDestroy(IntPtr body);
         public static void BodyDestroy(IntPtr body)
         {
@@ -440,114 +440,114 @@ namespace OdeAPI
             BodyiDestroy(body);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDisable"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyDisable(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDisable"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyDisable(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyEnable"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyEnable(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyEnable"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyEnable(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableAngularThreshold(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableAngularThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyGetAutoDisableFlag(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyGetAutoDisableFlag(IntPtr body);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
         public static extern void BodyGetAutoDisableDefaults(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableLinearThreshold(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableLinearThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetAutoDisableSteps(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetAutoDisableSteps(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal BodyGetAutoDisableTime(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAutoDisableTime(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularVel"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetAngularVelUnsafe(IntPtr body);
-                public static Vector3 BodyGetAngularVel(IntPtr body)
-                {
-                        unsafe { return *(BodyGetAngularVelUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularVel"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetAngularVelUnsafe(IntPtr body);
+        public static Vector3 BodyGetAngularVel(IntPtr body)
+        {
+            unsafe { return *(BodyGetAngularVelUnsafe(body)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyGetData(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetData(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetFiniteRotationMode(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetFiniteRotationMode(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetFiniteRotationAxis(IntPtr body, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetFiniteRotationAxis(IntPtr body, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetForce"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetForceUnsafe(IntPtr body);
-                public static Vector3 BodyGetForce(IntPtr body)
-                {
-                        unsafe { return *(BodyGetForceUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetForce"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetForceUnsafe(IntPtr body);
+        public static Vector3 BodyGetForce(IntPtr body)
+        {
+            unsafe { return *(BodyGetForceUnsafe(body)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGravityMode"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyGetGravityMode(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGravityMode"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyGetGravityMode(IntPtr body);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
         public static extern int BodyGetGyroscopicMode(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetJoint"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr BodyGetJoint(IntPtr body, int index);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearVel"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetLinearVelUnsafe(IntPtr body);
-                public static Vector3 BodyGetLinearVel(IntPtr body)
-                {
-                        unsafe { return *(BodyGetLinearVelUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetMass"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetMass(IntPtr body, out Mass mass);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNumJoints"), SuppressUnmanagedCodeSecurity]
-                public static extern int BodyGetNumJoints(IntPtr body);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPointVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetPositionUnsafe(IntPtr body);
-                public static Vector3 BodyGetPosition(IntPtr body)
-                {
-                        unsafe { return *(BodyGetPositionUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosRelPoint"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetPosRelPoint(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Quaternion* BodyGetQuaternionUnsafe(IntPtr body);
-                public static Quaternion BodyGetQuaternion(IntPtr body)
-                {
-                        unsafe { return *(BodyGetQuaternionUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointPos"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetRelPointPos(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyGetRelPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* BodyGetRotationUnsafe(IntPtr body);
-                public static Matrix3 BodyGetRotation(IntPtr body)
-                {
-                        unsafe { return *(BodyGetRotationUnsafe(body)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetTorque"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* BodyGetTorqueUnsafe(IntPtr body);
-                public static Vector3 BodyGetTorque(IntPtr body)
-                {
-                        unsafe { return *(BodyGetTorqueUnsafe(body)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetJoint"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetJoint(IntPtr body, int index);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearVel"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetLinearVelUnsafe(IntPtr body);
+        public static Vector3 BodyGetLinearVel(IntPtr body)
+        {
+            unsafe { return *(BodyGetLinearVelUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetMass"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetMass(IntPtr body, out Mass mass);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNumJoints"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetNumJoints(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPointVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetPositionUnsafe(IntPtr body);
+        public static Vector3 BodyGetPosition(IntPtr body)
+        {
+            unsafe { return *(BodyGetPositionUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosRelPoint"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetPosRelPoint(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Quaternion* BodyGetQuaternionUnsafe(IntPtr body);
+        public static Quaternion BodyGetQuaternion(IntPtr body)
+        {
+            unsafe { return *(BodyGetQuaternionUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointPos"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetRelPointPos(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetRelPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* BodyGetRotationUnsafe(IntPtr body);
+        public static Matrix3 BodyGetRotation(IntPtr body)
+        {
+            unsafe { return *(BodyGetRotationUnsafe(body)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetTorque"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* BodyGetTorqueUnsafe(IntPtr body);
+        public static Vector3 BodyGetTorque(IntPtr body)
+        {
+            unsafe { return *(BodyGetTorqueUnsafe(body)); }
+        }
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetWorld"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr BodyGetWorld(IntPtr body);
@@ -559,38 +559,38 @@ namespace OdeAPI
         public static extern IntPtr dBodyGetNextGeom(IntPtr Geom);
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyIsEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool BodyIsEnabled(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyIsEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool BodyIsEnabled(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAngularVel(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAngularVel(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableAngularThreshold(IntPtr body, dReal angular_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableAngularThreshold(IntPtr body, dReal angular_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableDefaults(IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableDefaults(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableFlag(IntPtr body, bool do_auto_disable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableFlag(IntPtr body, bool do_auto_disable);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableLinearThreshold(IntPtr body, dReal linear_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableLinearThreshold(IntPtr body, dReal linear_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableSteps(IntPtr body, int steps);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableSteps(IntPtr body, int steps);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetAutoDisableTime(IntPtr body, dReal time);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAutoDisableTime(IntPtr body, dReal time);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetData(IntPtr body, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetData(IntPtr body, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetFiniteRotationMode(IntPtr body, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetFiniteRotationMode(IntPtr body, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetFiniteRotationAxis(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetFiniteRotationAxis(IntPtr body, dReal x, dReal y, dReal z);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void BodySetLinearDamping(IntPtr body, dReal scale);
@@ -619,11 +619,11 @@ namespace OdeAPI
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern dReal BodyGetAngularDampingThreshold(IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetForce(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetForce(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGravityMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetGravityMode(IntPtr body, bool mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGravityMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetGravityMode(IntPtr body, bool mode);
 
         /// <summary>
         /// Sets the Gyroscopic term status on the body specified.
@@ -633,76 +633,76 @@ namespace OdeAPI
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
         public static extern void dBodySetGyroscopicMode(IntPtr body, int enabled);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetLinearVel(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetLinearVel(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetMass"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetMass(IntPtr body, ref Mass mass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetMass"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetMass(IntPtr body, ref Mass mass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetPosition(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetPosition(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetQuaternion(IntPtr body, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetQuaternion(IntPtr body, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetQuaternion(IntPtr body, ref dReal w);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetQuaternion(IntPtr body, ref dReal w);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetRotation(IntPtr body, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetRotation(IntPtr body, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetRotation(IntPtr body, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetRotation(IntPtr body, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodySetTorque(IntPtr body, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetTorque(IntPtr body, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorFromWorld"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyVectorFromWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorFromWorld"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyVectorFromWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorToWorld"), SuppressUnmanagedCodeSecurity]
-                public static extern void BodyVectorToWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorToWorld"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyVectorToWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void BoxBox(ref Vector3 p1, ref Matrix3 R1,
-                        ref Vector3 side1, ref Vector3 p2,
-                        ref Matrix3 R2, ref Vector3 side2,
-                        ref Vector3 normal, out dReal depth, out int return_code,
-                        int maxc, out ContactGeom contact, int skip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void BoxBox(ref Vector3 p1, ref Matrix3 R1,
+            ref Vector3 side1, ref Vector3 p2,
+            ref Matrix3 R2, ref Vector3 side2,
+            ref Vector3 normal, out dReal depth, out int return_code,
+            int maxc, out ContactGeom contact, int skip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxTouchesBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void BoxTouchesBox(ref Vector3 _p1, ref Matrix3 R1,
-                        ref Vector3 side1, ref Vector3 _p2,
-                        ref Matrix3 R2, ref Vector3 side2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxTouchesBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void BoxTouchesBox(ref Vector3 _p1, ref Matrix3 R1,
+            ref Vector3 side1, ref Vector3 _p2,
+            ref Matrix3 R2, ref Vector3 side2);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCleanupODEAllDataForThread"), SuppressUnmanagedCodeSecurity]
-                public static extern void CleanupODEAllDataForThread();
-        
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dClosestLineSegmentPoints"), SuppressUnmanagedCodeSecurity]
-                public static extern void ClosestLineSegmentPoints(ref Vector3 a1, ref Vector3 a2, 
-                        ref Vector3 b1, ref Vector3 b2, 
-                        ref Vector3 cp1, ref Vector3 cp2);
+        public static extern void CleanupODEAllDataForThread();
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dClosestLineSegmentPoints"), SuppressUnmanagedCodeSecurity]
+        public static extern void ClosestLineSegmentPoints(ref Vector3 a1, ref Vector3 a2,
+            ref Vector3 b1, ref Vector3 b2,
+            ref Vector3 cp1, ref Vector3 cp2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCloseODE"), SuppressUnmanagedCodeSecurity]
-                public static extern void CloseODE();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCloseODE"), SuppressUnmanagedCodeSecurity]
+        public static extern void CloseODE();
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
         public static extern int Collide(IntPtr o1, IntPtr o2, int flags, [In, Out] ContactGeom[] contact, int skip);
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
         public static extern int CollidePtr(IntPtr o1, IntPtr o2, int flags, IntPtr contactgeomarray, int skip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dConnectingJoint"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr ConnectingJoint(IntPtr j1, IntPtr j2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dConnectingJoint"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr ConnectingJoint(IntPtr j1, IntPtr j2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateBox"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateBox"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiBox(IntPtr space, dReal lx, dReal ly, dReal lz);
-                public static IntPtr CreateBox(IntPtr space, dReal lx, dReal ly, dReal lz)
+        public static IntPtr CreateBox(IntPtr space, dReal lx, dReal ly, dReal lz)
         {
             NTotalGeoms++;
             return CreateiBox(space, lx, ly, lz);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCapsule"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCapsule"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiCapsule(IntPtr space, dReal radius, dReal length);
         public static IntPtr CreateCapsule(IntPtr space, dReal radius, dReal length)
         {
@@ -710,23 +710,23 @@ namespace OdeAPI
             return CreateiCapsule(space, radius, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateConvex"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateConvex"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
         public static IntPtr CreateConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons)
         {
             NTotalGeoms++;
             return CreateiConvex(space, planes, planeCount, points, pointCount, polygons);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCylinder"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiCylinder(IntPtr space, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCylinder"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiCylinder(IntPtr space, dReal radius, dReal length);
         public static IntPtr CreateCylinder(IntPtr space, dReal radius, dReal length)
         {
             NTotalGeoms++;
             return CreateiCylinder(space, radius, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateHeightfield"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateHeightfield"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiHeightfield(IntPtr space, IntPtr data, int bPlaceable);
         public static IntPtr CreateHeightfield(IntPtr space, IntPtr data, int bPlaceable)
         {
@@ -744,23 +744,23 @@ namespace OdeAPI
 
 
 
-        
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiGeom(int classnum);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiGeom(int classnum);
         public static IntPtr CreateGeom(int classnum)
         {
             NTotalGeoms++;
             return CreateiGeom(classnum);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomClass"), SuppressUnmanagedCodeSecurity]
-                public static extern int CreateGeomClass(ref GeomClass classptr);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomClass"), SuppressUnmanagedCodeSecurity]
+        public static extern int CreateGeomClass(ref GeomClass classptr);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateGeomTransform(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateGeomTransform(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreatePlane"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreatePlane"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr CreateiPlane(IntPtr space, dReal a, dReal b, dReal c, dReal d);
         public static IntPtr CreatePlane(IntPtr space, dReal a, dReal b, dReal c, dReal d)
         {
@@ -768,25 +768,25 @@ namespace OdeAPI
             return CreateiPlane(space, a, b, c, d);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateRay"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiRay(IntPtr space, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateRay"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiRay(IntPtr space, dReal length);
         public static IntPtr CreateRay(IntPtr space, dReal length)
         {
             NTotalGeoms++;
             return CreateiRay(space, length);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateSphere"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiSphere(IntPtr space, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateSphere"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiSphere(IntPtr space, dReal radius);
         public static IntPtr CreateSphere(IntPtr space, dReal radius)
         {
             NTotalGeoms++;
             return CreateiSphere(space, radius);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateTriMesh"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr CreateiTriMesh(IntPtr space, IntPtr data, 
-                        TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateTriMesh"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiTriMesh(IntPtr space, IntPtr data,
+            TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback);
         public static IntPtr CreateTriMesh(IntPtr space, IntPtr data,
             TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback)
         {
@@ -794,79 +794,79 @@ namespace OdeAPI
             return CreateiTriMesh(space, data, callback, arrayCallback, rayCallback);
         }
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDot"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal Dot(ref dReal X0, ref dReal X1, int n);
+        public static extern dReal Dot(ref dReal X0, ref dReal X1, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDQfromW"), SuppressUnmanagedCodeSecurity]
-                public static extern void DQfromW(dReal[] dq, ref Vector3 w, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDQfromW"), SuppressUnmanagedCodeSecurity]
+        public static extern void DQfromW(dReal[] dq, ref Vector3 w, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorCholesky"), SuppressUnmanagedCodeSecurity]
-                public static extern int FactorCholesky(ref dReal A00, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorCholesky"), SuppressUnmanagedCodeSecurity]
+        public static extern int FactorCholesky(ref dReal A00, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorLDLT"), SuppressUnmanagedCodeSecurity]
-                public static extern void FactorLDLT(ref dReal A, out dReal d, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorLDLT"), SuppressUnmanagedCodeSecurity]
+        public static extern void FactorLDLT(ref dReal A, out dReal d, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxGetLengths(IntPtr geom, out Vector3 len);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxGetLengths(IntPtr geom, out Vector3 len);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxGetLengths(IntPtr geom, out dReal x);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxGetLengths(IntPtr geom, out dReal x);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxPointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomBoxPointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxPointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomBoxPointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxSetLengths"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomBoxSetLengths(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxSetLengths"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomBoxSetLengths(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCapsuleGetParams(IntPtr geom, out dReal radius, out dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCapsuleGetParams(IntPtr geom, out dReal radius, out dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsulePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomCapsulePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsulePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomCapsulePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCapsuleSetParams(IntPtr geom, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCapsuleSetParams(IntPtr geom, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomClearOffset"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomClearOffset(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomClearOffset"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomClearOffset(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref Quaternion Q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyPosition(IntPtr geom, out Vector3 pos);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyPosition(IntPtr geom, out Vector3 pos);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyPosition(IntPtr geom, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyPosition(IntPtr geom, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyRotation(IntPtr geom, out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyRotation(IntPtr geom, out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyRotation(IntPtr geom, out dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyRotation(IntPtr geom, out dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCylinderGetParams(IntPtr geom, out dReal radius, out dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCylinderGetParams(IntPtr geom, out dReal radius, out dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCylinderSetParams(IntPtr geom, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCylinderSetParams(IntPtr geom, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomiDestroy(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomiDestroy(IntPtr geom);
         public static void GeomDestroy(IntPtr geom)
         {
             NTotalGeoms--;
@@ -874,63 +874,63 @@ namespace OdeAPI
         }
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDisable"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomDisable(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDisable"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomDisable(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomEnable"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomEnable(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomEnable"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomEnable(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomGetAABB(IntPtr geom, out AABB aabb);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomGetAABB(IntPtr geom, out AABB aabb);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomGetAABB(IntPtr geom, out dReal minX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomGetAABB(IntPtr geom, out dReal minX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetBody(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetBody(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCategoryBits"), SuppressUnmanagedCodeSecurity]
-                public static extern uint GeomGetCategoryBits(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCategoryBits"), SuppressUnmanagedCodeSecurity]
+        public static extern uint GeomGetCategoryBits(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClassData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetClassData(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClassData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetClassData(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCollideBits"), SuppressUnmanagedCodeSecurity]
-                public static extern uint GeomGetCollideBits(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCollideBits"), SuppressUnmanagedCodeSecurity]
+        public static extern uint GeomGetCollideBits(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClass"), SuppressUnmanagedCodeSecurity]
-                public static extern GeomClassID GeomGetClass(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClass"), SuppressUnmanagedCodeSecurity]
+        public static extern GeomClassID GeomGetClass(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr GeomGetData(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom);
-                public static Vector3 GeomGetOffsetPosition(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetOffsetPositionUnsafe(geom)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* GeomGetOffsetRotationUnsafe(IntPtr geom);
-                public static Matrix3 GeomGetOffsetRotation(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetOffsetRotationUnsafe(geom)); }
-                }
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetPosition"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Vector3* GeomGetPositionUnsafe(IntPtr geom);
-                public static Vector3 GeomGetPosition(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetPositionUnsafe(geom)); }
-                }
-                public static OMV.Vector3 GeomGetPositionOMV(IntPtr geom)
-                {
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom);
+        public static Vector3 GeomGetOffsetPosition(IntPtr geom)
+        {
+            unsafe { return *(GeomGetOffsetPositionUnsafe(geom)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* GeomGetOffsetRotationUnsafe(IntPtr geom);
+        public static Matrix3 GeomGetOffsetRotation(IntPtr geom)
+        {
+            unsafe { return *(GeomGetOffsetRotationUnsafe(geom)); }
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetPosition"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Vector3* GeomGetPositionUnsafe(IntPtr geom);
+        public static Vector3 GeomGetPosition(IntPtr geom)
+        {
+            unsafe { return *(GeomGetPositionUnsafe(geom)); }
+        }
+        public static OMV.Vector3 GeomGetPositionOMV(IntPtr geom)
+        {
             Vector3 vtmp = GeomGetPosition(geom);
             return new OMV.Vector3(vtmp.X, vtmp.Y, vtmp.Z);
-                }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomCopyQuaternion(IntPtr geom, out Quaternion q);
         public static OMV.Quaternion GeomGetQuaternionOMV(IntPtr geom)
         {
@@ -939,85 +939,85 @@ namespace OdeAPI
             return new OMV.Quaternion(qtmp.X, qtmp.Y, qtmp.Z, qtmp.W);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomCopyQuaternion(IntPtr geom, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyQuaternion(IntPtr geom, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetRotation"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix3* GeomGetRotationUnsafe(IntPtr geom);
-                public static Matrix3 GeomGetRotation(IntPtr geom)
-                {
-                        unsafe { return *(GeomGetRotationUnsafe(geom)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetRotation"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix3* GeomGetRotationUnsafe(IntPtr geom);
+        public static Matrix3 GeomGetRotation(IntPtr geom)
+        {
+            unsafe { return *(GeomGetRotationUnsafe(geom)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetSpace"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomGetSpace(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetSpace"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetSpace(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, byte[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildByte(IntPtr d, byte[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness,     int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildByte(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness,     int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildCallback(IntPtr d, IntPtr pUserData, HeightfieldGetHeight pCallback,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildCallback(IntPtr d, IntPtr pUserData, HeightfieldGetHeight pCallback,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, ushort[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, ushort[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, short[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, short[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildShort(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, float[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, float[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, double[] pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, double[] pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
-                                dReal width, dReal depth, int widthSamples, int depthSamples,
-                                dReal scale, dReal offset, dReal thickness, int bWrap);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal width, dReal depth, int widthSamples, int depthSamples,
+                dReal scale, dReal offset, dReal thickness, int bWrap);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomHeightfieldDataCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomHeightfieldDataCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataDestroy(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataDestroy(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataSetBounds"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataSetBounds"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomHeightfieldGetHeightfieldData(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomHeightfieldGetHeightfieldData(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomHeightfieldSetHeightfieldData(IntPtr g, IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomHeightfieldSetHeightfieldData(IntPtr g, IntPtr d);
 
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
@@ -1046,279 +1046,279 @@ namespace OdeAPI
         public static extern void GeomOSTerrainSetHeightfieldData(IntPtr g, IntPtr d);
 
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsEnabled(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsEnabled(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsOffset"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsOffset(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsOffset"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsOffset(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsSpace"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomIsSpace(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsSpace"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomIsSpace(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneGetParams(IntPtr geom, ref Vector4 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneGetParams(IntPtr geom, ref Vector4 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneGetParams(IntPtr geom, ref dReal A);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneGetParams(IntPtr geom, ref dReal A);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlanePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomPlanePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlanePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomPlanePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneSetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomPlaneSetParams(IntPtr plane, dReal a, dReal b, dReal c, dReal d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneSetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomPlaneSetParams(IntPtr plane, dReal a, dReal b, dReal c, dReal d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRayGet(IntPtr ray, ref Vector3 start, ref Vector3 dir);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRayGet(IntPtr ray, ref Vector3 start, ref Vector3 dir);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRayGet(IntPtr ray, ref dReal startX, ref dReal dirX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRayGet(IntPtr ray, ref dReal startX, ref dReal dirX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetClosestHit"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomRayGetClosestHit(IntPtr ray);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetClosestHit"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomRayGetClosestHit(IntPtr ray);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetLength"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomRayGetLength(IntPtr ray);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetLength"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomRayGetLength(IntPtr ray);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomRayGetParams(IntPtr g, out int firstContact, out int backfaceCull);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomRayGetParams(IntPtr g, out int firstContact, out int backfaceCull);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySet(IntPtr ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySet(IntPtr ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetClosestHit"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetClosestHit(IntPtr ray, int closestHit);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetClosestHit"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetClosestHit(IntPtr ray, int closestHit);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetLength"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetLength(IntPtr ray, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetLength"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetLength(IntPtr ray, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetParams"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomRaySetParams(IntPtr ray, int firstContact, int backfaceCull);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetParams"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomRaySetParams(IntPtr ray, int firstContact, int backfaceCull);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetBody(IntPtr geom, IntPtr body);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetBody(IntPtr geom, IntPtr body);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCategoryBits"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetCategoryBits(IntPtr geom, uint bits);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCategoryBits"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetCategoryBits(IntPtr geom, uint bits);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCollideBits"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetCollideBits(IntPtr geom, uint bits);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCollideBits"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetCollideBits(IntPtr geom, uint bits);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetData"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomSetData(IntPtr geom, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref Quaternion Q);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref dReal X);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetRotation(IntPtr geom, ref Matrix3 R);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldPosition(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref Quaternion Q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetPosition(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref Quaternion Q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetQuaternion(IntPtr geom, ref Quaternion quat);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetQuaternion(IntPtr geom, ref dReal w);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetRotation(IntPtr geom, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSetRotation(IntPtr geom, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetPosition(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereGetRadius"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomSphereGetRadius(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetQuaternion(IntPtr geom, ref Quaternion quat);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSpherePointDepth"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal GeomSpherePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetQuaternion(IntPtr geom, ref dReal w);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereSetRadius"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomSphereSetRadius(IntPtr geom, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetRotation(IntPtr geom, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomTransformGetCleanup(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetRotation(IntPtr geom, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTransformGetGeom(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereGetRadius"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomSphereGetRadius(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetInfo"), SuppressUnmanagedCodeSecurity]
-                public static extern int GeomTransformGetInfo(IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSpherePointDepth"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal GeomSpherePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetCleanup(IntPtr geom, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereSetRadius"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSphereSetRadius(IntPtr geom, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetGeom(IntPtr geom, IntPtr obj);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomTransformGetCleanup(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetInfo"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTransformSetInfo(IntPtr geom, int info);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTransformGetGeom(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        double[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetInfo"), SuppressUnmanagedCodeSecurity]
+        public static extern int GeomTransformGetInfo(IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetCleanup(IntPtr geom, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble1(IntPtr d,
-                        double[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        double[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetGeom(IntPtr geom, IntPtr obj);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetInfo"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTransformSetInfo(IntPtr geom, int info);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
-                        dReal[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            double[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
-                        dReal[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        dReal[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble1(IntPtr d,
+            double[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            double[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple(IntPtr d, 
-                        float[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+            dReal[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d, 
-                        float[] vertices, int vertexStride, int vertexCount,
-                        int[] indices, int indexCount, int triStride,
-                        float[] normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+            dReal[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            dReal[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
-                        IntPtr vertices, int vertexStride, int vertexCount,
-                        IntPtr indices, int indexCount, int triStride,
-                        IntPtr normals);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshClearTCCache"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshClearTCCache(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
+            float[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshDataCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataDestroy(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
+            float[] vertices, int vertexStride, int vertexCount,
+            int[] indices, int indexCount, int triStride,
+            float[] normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataGet"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshDataGet(IntPtr d, int data_id);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
+            IntPtr vertices, int vertexStride, int vertexCount,
+            IntPtr indices, int indexCount, int triStride,
+            IntPtr normals);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataPreprocess"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataPreprocess(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshClearTCCache"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshClearTCCache(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataSet"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataSet(IntPtr d, int data_id, IntPtr in_data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshDataCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataUpdate"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshDataUpdate(IntPtr d);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataDestroy(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshEnableTC"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshEnableTC(IntPtr g, int geomClass, bool enable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataGet"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshDataGet(IntPtr d, int data_id);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetArrayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriArrayCallback GeomTriMeshGetArrayCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataPreprocess"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataPreprocess(IntPtr d);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriCallback GeomTriMeshGetCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataSet"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataSet(IntPtr d, int data_id, IntPtr in_data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshGetData(IntPtr g);
-
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static Matrix4* GeomTriMeshGetLastTransformUnsafe(IntPtr geom);
-                public static Matrix4 GeomTriMeshGetLastTransform(IntPtr geom)
-                {
-                        unsafe { return *(GeomTriMeshGetLastTransformUnsafe(geom)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataUpdate"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshDataUpdate(IntPtr d);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshEnableTC"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshEnableTC(IntPtr g, int geomClass, bool enable);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetArrayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriArrayCallback GeomTriMeshGetArrayCallback(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriCallback GeomTriMeshGetCallback(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshGetData(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static Matrix4* GeomTriMeshGetLastTransformUnsafe(IntPtr geom);
+        public static Matrix4 GeomTriMeshGetLastTransform(IntPtr geom)
+        {
+            unsafe { return *(GeomTriMeshGetLastTransformUnsafe(geom)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetPoint"), SuppressUnmanagedCodeSecurity]
-                public extern static void GeomTriMeshGetPoint(IntPtr g, int index, dReal u, dReal v, ref Vector3 outVec);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetPoint"), SuppressUnmanagedCodeSecurity]
+        public extern static void GeomTriMeshGetPoint(IntPtr g, int index, dReal u, dReal v, ref Vector3 outVec);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetRayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern TriRayCallback GeomTriMeshGetRayCallback(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetRayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern TriRayCallback GeomTriMeshGetRayCallback(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangle"), SuppressUnmanagedCodeSecurity]
-                public extern static void GeomTriMeshGetTriangle(IntPtr g, int index, ref Vector3 v0, ref Vector3 v1, ref Vector3 v2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangle"), SuppressUnmanagedCodeSecurity]
+        public extern static void GeomTriMeshGetTriangle(IntPtr g, int index, ref Vector3 v0, ref Vector3 v1, ref Vector3 v2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangleCount"), SuppressUnmanagedCodeSecurity]
-                public extern static int GeomTriMeshGetTriangleCount(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangleCount"), SuppressUnmanagedCodeSecurity]
+        public extern static int GeomTriMeshGetTriangleCount(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriMeshDataID"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr GeomTriMeshGetTriMeshDataID(IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriMeshDataID"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomTriMeshGetTriMeshDataID(IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshIsTCEnabled"), SuppressUnmanagedCodeSecurity]
-                public static extern bool GeomTriMeshIsTCEnabled(IntPtr g, int geomClass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshIsTCEnabled"), SuppressUnmanagedCodeSecurity]
+        public static extern bool GeomTriMeshIsTCEnabled(IntPtr g, int geomClass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetArrayCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetArrayCallback(IntPtr g, TriArrayCallback arrayCallback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetArrayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetArrayCallback(IntPtr g, TriArrayCallback arrayCallback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetCallback"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetCallback(IntPtr g, TriCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetCallback(IntPtr g, TriCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetData(IntPtr g, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetData(IntPtr g, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref Matrix4 last_trans);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref Matrix4 last_trans);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
-                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref dReal M00);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetRayCallback"), SuppressUnmanagedCodeSecurity]
         public static extern void GeomTriMeshSetRayCallback(IntPtr g, TriRayCallback callback);
@@ -1333,416 +1333,416 @@ namespace OdeAPI
             return s;
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr HashSpaceCreate(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr HashSpaceCreate(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceGetLevels"), SuppressUnmanagedCodeSecurity]
-                public static extern void HashSpaceGetLevels(IntPtr space, out int minlevel, out int maxlevel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceGetLevels"), SuppressUnmanagedCodeSecurity]
+        public static extern void HashSpaceGetLevels(IntPtr space, out int minlevel, out int maxlevel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceSetLevels"), SuppressUnmanagedCodeSecurity]
-                public static extern void HashSpaceSetLevels(IntPtr space, int minlevel, int maxlevel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceSetLevels"), SuppressUnmanagedCodeSecurity]
+        public static extern void HashSpaceSetLevels(IntPtr space, int minlevel, int maxlevel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInfiniteAABB"), SuppressUnmanagedCodeSecurity]
-                public static extern void InfiniteAABB(IntPtr geom, out AABB aabb);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInfiniteAABB"), SuppressUnmanagedCodeSecurity]
+        public static extern void InfiniteAABB(IntPtr geom, out AABB aabb);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE"), SuppressUnmanagedCodeSecurity]
-                public static extern void InitODE();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE"), SuppressUnmanagedCodeSecurity]
+        public static extern void InitODE();
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE2"), SuppressUnmanagedCodeSecurity]
         public static extern int InitODE2(uint ODEInitFlags);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dIsPositiveDefinite"), SuppressUnmanagedCodeSecurity]
-                public static extern int IsPositiveDefinite(ref dReal A, int n);
+        public static extern int IsPositiveDefinite(ref dReal A, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInvertPDMatrix"), SuppressUnmanagedCodeSecurity]
-                public static extern int InvertPDMatrix(ref dReal A, out dReal Ainv, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInvertPDMatrix"), SuppressUnmanagedCodeSecurity]
+        public static extern int InvertPDMatrix(ref dReal A, out dReal Ainv, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddAMotorTorques"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddAMotorTorques(IntPtr joint, dReal torque1, dReal torque2, dReal torque3);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddAMotorTorques"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddAMotorTorques(IntPtr joint, dReal torque1, dReal torque2, dReal torque3);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHingeTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddHingeTorque(IntPtr joint, dReal torque);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHingeTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddHingeTorque(IntPtr joint, dReal torque);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHinge2Torque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddHinge2Torques(IntPtr joint, dReal torque1, dReal torque2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHinge2Torque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddHinge2Torques(IntPtr joint, dReal torque1, dReal torque2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddPRTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddPRTorque(IntPtr joint, dReal torque);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddPRTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddPRTorque(IntPtr joint, dReal torque);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddUniversalTorque"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddUniversalTorques(IntPtr joint, dReal torque1, dReal torque2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddUniversalTorque"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddUniversalTorques(IntPtr joint, dReal torque1, dReal torque2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddSliderForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAddSliderForce(IntPtr joint, dReal force);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddSliderForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAddSliderForce(IntPtr joint, dReal force);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAttach"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointAttach(IntPtr joint, IntPtr body1, IntPtr body2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAttach"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointAttach(IntPtr joint, IntPtr body1, IntPtr body2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateAMotor"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateAMotor(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateAMotor"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateAMotor(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateBall"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateBall(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateBall"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateBall(IntPtr world, IntPtr group);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr JointCreateContact(IntPtr world, IntPtr group, ref Contact contact);
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr JointCreateContactPtr(IntPtr world, IntPtr group, IntPtr contact);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateFixed"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateFixed(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateFixed"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateFixed(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateHinge(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateHinge(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge2"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateHinge2(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge2"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateHinge2(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateLMotor"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateLMotor(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateLMotor"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateLMotor(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateNull"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateNull(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateNull"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateNull(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePR"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreatePR(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePR"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreatePR(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePlane2D"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreatePlane2D(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePlane2D"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreatePlane2D(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateSlider"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateSlider(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateSlider"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateSlider(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateUniversal"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointCreateUniversal(IntPtr world, IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateUniversal"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateUniversal(IntPtr world, IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointDestroy(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointDestroy(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorAngle(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorAngle(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngleRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorAngleRate(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngleRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorAngleRate(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetAMotorAxis(IntPtr j, int anum, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetAMotorAxis(IntPtr j, int anum, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxisRel"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorAxisRel(IntPtr j, int anum);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxisRel"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorAxisRel(IntPtr j, int anum);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorMode"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorMode(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorMode"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorMode(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetAMotorNumAxes(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetAMotorNumAxes(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetAMotorParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetAMotorParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetBallAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetBallAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetBallAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetBallAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBody"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGetBody(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBody"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGetBody(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetData"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGetData(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGetData(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetFeedback"), SuppressUnmanagedCodeSecurity]
-                public extern unsafe static JointFeedback* JointGetFeedbackUnsafe(IntPtr j);
-                public static JointFeedback JointGetFeedback(IntPtr j)
-                {
-                        unsafe { return *(JointGetFeedbackUnsafe(j)); }
-                }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetFeedback"), SuppressUnmanagedCodeSecurity]
+        public extern unsafe static JointFeedback* JointGetFeedbackUnsafe(IntPtr j);
+        public static JointFeedback JointGetFeedback(IntPtr j)
+        {
+            unsafe { return *(JointGetFeedbackUnsafe(j)); }
+        }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeAngle(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeAngle(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngleRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeAngleRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngleRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeAngleRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAxis(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAxis(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHingeParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHingeParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle1(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle1(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle1Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle1Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle2Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Angle2Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle2Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Angle2Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHingeAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHingeAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Anchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Anchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Anchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Anchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Axis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Axis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetHinge2Axis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetHinge2Axis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Param"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetHinge2Param(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Param"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetHinge2Param(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetLMotorAxis(IntPtr j, int anum, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetLMotorAxis(IntPtr j, int anum, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern int JointGetLMotorNumAxes(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern int JointGetLMotorNumAxes(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetLMotorParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetLMotorParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAxis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAxis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetPRAxis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetPRAxis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRPosition(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRPosition(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPositionRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetPRPositionRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPositionRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetPRPositionRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetSliderAxis(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetSliderAxis(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPosition"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderPosition(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPosition"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderPosition(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPositionRate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetSliderPositionRate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPositionRate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetSliderPositionRate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetType"), SuppressUnmanagedCodeSecurity]
-                public static extern JointType JointGetType(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetType"), SuppressUnmanagedCodeSecurity]
+        public static extern JointType JointGetType(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAnchor(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAnchor(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAnchor2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAnchor2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle1(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle1(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle1Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle1Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle2(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle2(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2Rate"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalAngle2Rate(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2Rate"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalAngle2Rate(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngles"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAngles(IntPtr j, out dReal angle1, out dReal angle2);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngles"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAngles(IntPtr j, out dReal angle1, out dReal angle2);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAxis1(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAxis1(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGetUniversalAxis2(IntPtr j, out Vector3 result);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGetUniversalAxis2(IntPtr j, out Vector3 result);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalParam"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal JointGetUniversalParam(IntPtr j, int parameter);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalParam"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal JointGetUniversalParam(IntPtr j, int parameter);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr JointGroupCreate(int max_size);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointGroupCreate(int max_size);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGroupDestroy(IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGroupDestroy(IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupEmpty"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointGroupEmpty(IntPtr group);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupEmpty"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointGroupEmpty(IntPtr group);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorAngle(IntPtr j, int anum, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorAngle(IntPtr j, int anum, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorMode"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorMode(IntPtr j, int mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorMode(IntPtr j, int mode);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorNumAxes(IntPtr group, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorNumAxes(IntPtr group, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetAMotorParam(IntPtr group, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetAMotorParam(IntPtr group, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetBallAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetBallAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetBallAnchor2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetBallAnchor2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetData"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetData(IntPtr j, IntPtr data);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetData(IntPtr j, IntPtr data);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFeedback"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetFeedback(IntPtr j, out JointFeedback feedback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFeedback"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetFeedback(IntPtr j, out JointFeedback feedback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFixed"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetFixed(IntPtr j);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFixed"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetFixed(IntPtr j);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchorDelta"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAnchorDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchorDelta"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAnchorDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeAxis(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeAxis(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHingeParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHingeParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Anchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Anchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Axis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Axis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Axis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Axis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Param"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetHinge2Param(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Param"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetHinge2Param(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorNumAxes(IntPtr j, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorNumAxes(IntPtr j, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetLMotorParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetLMotorParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DAngleParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DAngleParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DAngleParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DAngleParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DXParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DXParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DXParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DXParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DYParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPlane2DYParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DYParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPlane2DYParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAxis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAxis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRAxis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRAxis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetPRParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetPRParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderAxis(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderAxis(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxisDelta"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderAxisDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxisDelta"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderAxisDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetSliderParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetSliderParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAnchor(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAnchor(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAxis1(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAxis1(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalAxis2(IntPtr j, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalAxis2(IntPtr j, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalParam"), SuppressUnmanagedCodeSecurity]
-                public static extern void JointSetUniversalParam(IntPtr j, int parameter, dReal value);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalParam"), SuppressUnmanagedCodeSecurity]
+        public static extern void JointSetUniversalParam(IntPtr j, int parameter, dReal value);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dLDLTAddTL"), SuppressUnmanagedCodeSecurity]
-                public static extern void LDLTAddTL(ref dReal L, ref dReal d, ref dReal a, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dLDLTAddTL"), SuppressUnmanagedCodeSecurity]
+        public static extern void LDLTAddTL(ref dReal L, ref dReal d, ref dReal a, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdd"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassAdd(ref Mass a, ref Mass b);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdd"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassAdd(ref Mass a, ref Mass b);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdjust"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassAdjust(ref Mass m, dReal newmass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdjust"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassAdjust(ref Mass m, dReal newmass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassCheck"), SuppressUnmanagedCodeSecurity]
-                public static extern bool MassCheck(ref Mass m);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassCheck"), SuppressUnmanagedCodeSecurity]
+        public static extern bool MassCheck(ref Mass m);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassRotate(ref Mass mass, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassRotate(ref Mass mass, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassRotate(ref Mass mass, ref dReal M00);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassRotate(ref Mass mass, ref dReal M00);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBox"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetBox(out Mass mass, dReal density, dReal lx, dReal ly, dReal lz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBox"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetBox(out Mass mass, dReal density, dReal lx, dReal ly, dReal lz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBoxTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetBoxTotal(out Mass mass, dReal total_mass, dReal lx, dReal ly, dReal lz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBoxTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetBoxTotal(out Mass mass, dReal total_mass, dReal lx, dReal ly, dReal lz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsule"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCapsule(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsule"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCapsule(out Mass mass, dReal density, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsuleTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCapsuleTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsuleTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCapsuleTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinder"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCylinder(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinder"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCylinder(out Mass mass, dReal density, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinderTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetCylinderTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinderTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetCylinderTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetParameters"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetParameters(out Mass mass, dReal themass,
-                         dReal cgx, dReal cgy, dReal cgz,
-                         dReal i11, dReal i22, dReal i33,
-                         dReal i12, dReal i13, dReal i23);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetParameters"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetParameters(out Mass mass, dReal themass,
+             dReal cgx, dReal cgy, dReal cgz,
+             dReal i11, dReal i22, dReal i33,
+             dReal i12, dReal i13, dReal i23);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphere"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetSphere(out Mass mass, dReal density, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphere"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetSphere(out Mass mass, dReal density, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphereTotal"), SuppressUnmanagedCodeSecurity]
-                public static extern void dMassSetSphereTotal(out Mass mass, dReal total_mass, dReal radius);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphereTotal"), SuppressUnmanagedCodeSecurity]
+        public static extern void dMassSetSphereTotal(out Mass mass, dReal total_mass, dReal radius);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetTrimesh"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetTrimesh(out Mass mass, dReal density, IntPtr g);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetTrimesh"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetTrimesh(out Mass mass, dReal density, IntPtr g);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetZero"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassSetZero(out Mass mass);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetZero"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassSetZero(out Mass mass);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassTranslate"), SuppressUnmanagedCodeSecurity]
-                public static extern void MassTranslate(ref Mass mass, dReal x, dReal y, dReal z);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassTranslate"), SuppressUnmanagedCodeSecurity]
+        public static extern void MassTranslate(ref Mass mass, dReal x, dReal y, dReal z);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply0"), SuppressUnmanagedCodeSecurity]
         public static extern void Multiply0(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
@@ -1754,119 +1754,119 @@ namespace OdeAPI
             MultiplyiM3V3(out outvector, ref matrix, ref invector, 3, 3, 1);
         }
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply1"), SuppressUnmanagedCodeSecurity]
-                public static extern void Multiply1(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply1"), SuppressUnmanagedCodeSecurity]
+        public static extern void Multiply1(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply2"), SuppressUnmanagedCodeSecurity]
-                public static extern void Multiply2(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply2"), SuppressUnmanagedCodeSecurity]
+        public static extern void Multiply2(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void QFromAxisAndAngle(out Quaternion q, dReal ax, dReal ay, dReal az, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void QFromAxisAndAngle(out Quaternion q, dReal ax, dReal ay, dReal az, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQfromR"), SuppressUnmanagedCodeSecurity]
-                public static extern void QfromR(out Quaternion q, ref Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQfromR"), SuppressUnmanagedCodeSecurity]
+        public static extern void QfromR(out Quaternion q, ref Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply0"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply0(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply0"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply0(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply1"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply1(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply1"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply1(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply2"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply2(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply2"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply2(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply3"), SuppressUnmanagedCodeSecurity]
-                public static extern void QMultiply3(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply3"), SuppressUnmanagedCodeSecurity]
+        public static extern void QMultiply3(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQSetIdentity"), SuppressUnmanagedCodeSecurity]
-                public static extern void QSetIdentity(out Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQSetIdentity"), SuppressUnmanagedCodeSecurity]
+        public static extern void QSetIdentity(out Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref Vector3 center, ref Vector3 extents, int depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref Vector3 center, ref Vector3 extents, int depth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref dReal centerX, ref dReal extentsX, int depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref dReal centerX, ref dReal extentsX, int depth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRandReal"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal RandReal();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRandReal"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal RandReal();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFrom2Axes"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFrom2Axes(out Matrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFrom2Axes"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFrom2Axes(out Matrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromAxisAndAngle(out Matrix3 R, dReal x, dReal y, dReal z, dReal angle);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromAxisAndAngle(out Matrix3 R, dReal x, dReal y, dReal z, dReal angle);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromEulerAngles"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromEulerAngles(out Matrix3 R, dReal phi, dReal theta, dReal psi);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromEulerAngles"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromEulerAngles(out Matrix3 R, dReal phi, dReal theta, dReal psi);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRfromQ"), SuppressUnmanagedCodeSecurity]
-                public static extern void RfromQ(out Matrix3 R, ref Quaternion q);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRfromQ"), SuppressUnmanagedCodeSecurity]
+        public static extern void RfromQ(out Matrix3 R, ref Quaternion q);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromZAxis"), SuppressUnmanagedCodeSecurity]
-                public static extern void RFromZAxis(out Matrix3 R, dReal ax, dReal ay, dReal az);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromZAxis"), SuppressUnmanagedCodeSecurity]
+        public static extern void RFromZAxis(out Matrix3 R, dReal ax, dReal ay, dReal az);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRSetIdentity"), SuppressUnmanagedCodeSecurity]
-                public static extern void RSetIdentity(out Matrix3 R);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRSetIdentity"), SuppressUnmanagedCodeSecurity]
+        public static extern void RSetIdentity(out Matrix3 R);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetValue"), SuppressUnmanagedCodeSecurity]
-                public static extern void SetValue(out dReal a, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetValue"), SuppressUnmanagedCodeSecurity]
+        public static extern void SetValue(out dReal a, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetZero"), SuppressUnmanagedCodeSecurity]
-                public static extern void SetZero(out dReal a, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetZero"), SuppressUnmanagedCodeSecurity]
+        public static extern void SetZero(out dReal a, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSimpleSpaceCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr SimpleSpaceCreate(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSimpleSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr SimpleSpaceCreate(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveCholesky"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveCholesky(ref dReal L, out dReal b, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveCholesky"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveCholesky(ref dReal L, out dReal b, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveL1(ref dReal L, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveL1(ref dReal L, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1T"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveL1T(ref dReal L, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1T"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveL1T(ref dReal L, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveLDLT"), SuppressUnmanagedCodeSecurity]
-                public static extern void SolveLDLT(ref dReal L, ref dReal d, out dReal b, int n, int nskip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveLDLT"), SuppressUnmanagedCodeSecurity]
+        public static extern void SolveLDLT(ref dReal L, ref dReal d, out dReal b, int n, int nskip);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceAdd"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceAdd(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceAdd"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceAdd(IntPtr space, IntPtr geom);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceLockQuery"), SuppressUnmanagedCodeSecurity]
         public static extern bool SpaceLockQuery(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceClean"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceClean(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceClean"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceClean(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceCollide(IntPtr space, IntPtr data, NearCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceCollide(IntPtr space, IntPtr data, NearCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide2"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceCollide2(IntPtr space1, IntPtr space2, IntPtr data, NearCallback callback);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide2"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceCollide2(IntPtr space1, IntPtr space2, IntPtr data, NearCallback callback);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceDestroy(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceDestroy(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern bool SpaceGetCleanup(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern bool SpaceGetCleanup(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetNumGeoms"), SuppressUnmanagedCodeSecurity]
-                public static extern int SpaceGetNumGeoms(IntPtr space);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetNumGeoms"), SuppressUnmanagedCodeSecurity]
+        public static extern int SpaceGetNumGeoms(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetGeom"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr SpaceGetGeom(IntPtr space, int i);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr SpaceGetGeom(IntPtr space, int i);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetSublevel"), SuppressUnmanagedCodeSecurity]
         public static extern int SpaceGetSublevel(IntPtr space);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceQuery"), SuppressUnmanagedCodeSecurity]
-                public static extern bool SpaceQuery(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceQuery"), SuppressUnmanagedCodeSecurity]
+        public static extern bool SpaceQuery(IntPtr space, IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceRemove"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceRemove(IntPtr space, IntPtr geom);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceRemove"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceRemove(IntPtr space, IntPtr geom);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetCleanup"), SuppressUnmanagedCodeSecurity]
-                public static extern void SpaceSetCleanup(IntPtr space, bool mode);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetCleanup"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceSetCleanup(IntPtr space, bool mode);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetSublevel"), SuppressUnmanagedCodeSecurity]
         public static extern void SpaceSetSublevel(IntPtr space, int sublevel);
@@ -1874,53 +1874,53 @@ namespace OdeAPI
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSweepAndPruneSpaceCreate"), SuppressUnmanagedCodeSecurity]
         public static extern IntPtr SweepAndPruneSpaceCreate(IntPtr space, int AxisOrder);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dVectorScale"), SuppressUnmanagedCodeSecurity]
-                public static extern void VectorScale(out dReal a, ref dReal d, int n);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dVectorScale"), SuppressUnmanagedCodeSecurity]
+        public static extern void VectorScale(out dReal a, ref dReal d, int n);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldCreate"), SuppressUnmanagedCodeSecurity]
-                public static extern IntPtr WorldCreate();
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr WorldCreate();
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldDestroy"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldDestroy(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldDestroy(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
         public static extern int WorldGetAutoDisableAverageSamplesCount(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableAngularThreshold(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableAngularThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern bool WorldGetAutoDisableFlag(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern bool WorldGetAutoDisableFlag(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableLinearThreshold(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableLinearThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetAutoDisableSteps(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetAutoDisableSteps(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetAutoDisableTime(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAutoDisableTime(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetAutoEnableDepthSF1(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetAutoEnableDepthSF1(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetCFM"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetCFM(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetCFM"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetCFM(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetERP"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetERP(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetERP"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetERP(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldGetGravity(IntPtr world, out Vector3 gravity);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldGetGravity(IntPtr world, out Vector3 gravity);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldGetGravity(IntPtr world, out dReal X);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldGetGravity(IntPtr world, out dReal X);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetContactMaxCorrectingVel(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetContactMaxCorrectingVel(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetContactSurfaceLayer(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetContactSurfaceLayer(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAngularDamping"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetAngularDamping(IntPtr world);
@@ -1934,23 +1934,23 @@ namespace OdeAPI
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetLinearDampingThreshold(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
-                public static extern int WorldGetQuickStepNumIterations(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetQuickStepNumIterations(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepW"), SuppressUnmanagedCodeSecurity]
-                public static extern dReal WorldGetQuickStepW(IntPtr world);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepW"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetQuickStepW(IntPtr world);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
         public static extern dReal WorldGetMaxAngularSpeed(IntPtr world);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out Vector3 force);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out Vector3 force);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out dReal forceX);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out dReal forceX);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldQuickStep"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldQuickStep(IntPtr world, dReal stepsize);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldQuickStep"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldQuickStep(IntPtr world, dReal stepsize);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAngularDamping(IntPtr world, dReal scale);
@@ -1958,67 +1958,67 @@ namespace OdeAPI
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAngularDampingThreshold(IntPtr world, dReal threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableAngularThreshold(IntPtr world, dReal angular_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableAngularThreshold(IntPtr world, dReal angular_threshold);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetAutoDisableAverageSamplesCount(IntPtr world, int average_samples_count);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableFlag(IntPtr world, bool do_auto_disable);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableFlag(IntPtr world, bool do_auto_disable);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableLinearThreshold(IntPtr world, dReal linear_threshold);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableLinearThreshold(IntPtr world, dReal linear_threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableSteps(IntPtr world, int steps);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableSteps(IntPtr world, int steps);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoDisableTime(IntPtr world, dReal time);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableTime(IntPtr world, dReal time);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetAutoEnableDepthSF1(IntPtr world, int autoEnableDepth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoEnableDepthSF1(IntPtr world, int autoEnableDepth);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetCFM"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetCFM(IntPtr world, dReal cfm);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetCFM"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetCFM(IntPtr world, dReal cfm);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetContactMaxCorrectingVel(IntPtr world, dReal vel);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetContactMaxCorrectingVel(IntPtr world, dReal vel);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetContactSurfaceLayer(IntPtr world, dReal depth);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetContactSurfaceLayer(IntPtr world, dReal depth);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetDamping(IntPtr world, dReal linear_scale, dReal angular_scale);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetERP"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetERP(IntPtr world, dReal erp);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetERP"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetERP(IntPtr world, dReal erp);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetGravity"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetGravity(IntPtr world, dReal x, dReal y, dReal z);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetGravity"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetGravity(IntPtr world, dReal x, dReal y, dReal z);
-        
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDamping"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetLinearDamping(IntPtr world, dReal scale);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetLinearDampingThreshold(IntPtr world, dReal threshold);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetQuickStepNumIterations(IntPtr world, int num);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetQuickStepNumIterations(IntPtr world, int num);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepW"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldSetQuickStepW(IntPtr world, dReal over_relaxation);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepW"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetQuickStepW(IntPtr world, dReal over_relaxation);
 
         [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
         public static extern void WorldSetMaxAngularSpeed(IntPtr world, dReal max_speed);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStep"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldStep(IntPtr world, dReal stepsize);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStep"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldStep(IntPtr world, dReal stepsize);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStepFast1"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldStepFast1(IntPtr world, dReal stepsize, int maxiterations);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStepFast1"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldStepFast1(IntPtr world, dReal stepsize, int maxiterations);
 
-                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldExportDIF"), SuppressUnmanagedCodeSecurity]
-                public static extern void WorldExportDIF(IntPtr world, string filename, bool append, string prefix);
-        }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldExportDIF"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldExportDIF(IntPtr world, string filename, bool append, string prefix);
+    }
 }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index f7e1044..9cef3d5 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         StopERP3 = 7 + 512,
         StopCFM3 = 8 + 512
     }
- 
+
     public class OdeCharacter : PhysicsActor
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -121,7 +121,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         private float m_buoyancy = 0f;
 
         private bool m_freemove = false;
- 
+
 //        private string m_name = String.Empty;
         // other filter control
         int m_colliderfilter = 0;
@@ -155,7 +155,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         public UUID m_uuid;
         public bool bad = false;
 
-        float mu;       
+        float mu;
 
         // HoverHeight control
         private float m_PIDHoverHeight;
@@ -218,7 +218,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             walkDivisor = walk_divisor;
             runDivisor = rundivisor;
 
-            m_mass = m_density * m_size.X * m_size.Y * m_size.Z; ; // sure we have a default           
+            m_mass = m_density * m_size.X * m_size.Y * m_size.Z; ; // sure we have a default
 
             PID_D = basePID_D * m_mass * invtimeStep;
             PID_P = basePID_P * m_mass * invtimeStep;
@@ -256,7 +256,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
         public override uint LocalID
         {
-            get { return m_localID; }     
+            get { return m_localID; }
             set { m_localID = value; }
         }
 
@@ -508,7 +508,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             {
                 m_log.Warn("[PHYSICS]: Got a NaN AvatarSize from Scene on a Character");
             }
-            
+
         }
         /// <summary>
         /// This creates the Avatar's physical Surrogate at the position supplied
@@ -636,7 +636,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         {
             get
             {
-                return m_targetVelocity; 
+                return m_targetVelocity;
             }
             set
             {
@@ -774,7 +774,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
             PID_D = basePID_D * m_mass / _parent_scene.ODE_STEPSIZE;
             PID_P = basePID_P * m_mass / _parent_scene.ODE_STEPSIZE;
-            
+
             Body = d.BodyCreate(_parent_scene.world);
 
             _zeroFlag = false;
@@ -900,7 +900,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             x = tx * cos - y * sin;
             y = tx * sin + y * cos;
         }
-      
+
         public bool Collide(IntPtr me, IntPtr other, bool reverse, ref d.ContactGeom contact,
                 ref d.ContactGeom altContact , ref bool useAltcontact, ref bool feetcollision)
         {
@@ -944,7 +944,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         }
                     }
                     return true;
-                }               
+                }
 /*
                 d.AABB aabb;
                 d.GeomGetAABB(other,out aabb);
@@ -1141,7 +1141,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                             n.Y = 0f;
                             n.Z = 1.0f;
                          }
-                    }               
+                    }
                 }
 
                 if (depth < 0.2f)
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         break;
                 }     // end switch (m_PIDHoverType)
 
-                    // don't go underground 
+                    // don't go underground
                 if (m_targetHoverHeight > terrainheight + 0.5f * (aabb.MaxZ - aabb.MinZ))
                 {
                     float fz = (m_targetHoverHeight - localpos.Z);
@@ -1248,7 +1248,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     }
                 }
             }
-            
+
             //******************************************
             if (!m_iscolliding)
                 m_collideNormal.Z = 0;
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         /// Used to copy variables from unmanaged space at heartbeat rate and also trigger scene updates acording
         /// also outbounds checking
         /// copy and outbounds now done in move(..) at ode rate
-        /// 
+        ///
         /// </summary>
         public void UpdatePositionAndVelocity()
         {
@@ -1625,7 +1625,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         CollisionEventsThisFrame.Clear();
                     }
                 }
-            }           
+            }
         }
 
         public override bool SubscribedEvents()
@@ -1697,7 +1697,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                                       _position.Z + (m_size.Z - oldsz) * 0.5f);
 
 //                    Velocity = Vector3.Zero;
-                    m_targetVelocity = Vector3.Zero;                  
+                    m_targetVelocity = Vector3.Zero;
 
                     _parent_scene.actor_name_map[collider] = (PhysicsActor)this;
                     _parent_scene.actor_name_map[capsule] = (PhysicsActor)this;
@@ -1717,7 +1717,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z);
                 _position = newPos;
                 m_freemove = false;
-                m_pidControllerActive = true;               
+                m_pidControllerActive = true;
             }
 
         private void changeOrientation(Quaternion newOri)
@@ -1772,35 +1772,35 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
         private void changeSetTorque(Vector3 newTorque)
         {
-        }                                 
+        }
 
         private void changeAddForce(Vector3 newForce)
         {
-        }                                 
+        }
 
         private void changeAddAngularForce(Vector3 arg)
         {
-        }                                 
+        }
 
         private void changeAngularLock(byte arg)
         {
-        }                                 
+        }
 
         private void changeFloatOnWater(bool arg)
         {
-        }                                 
+        }
 
         private void changeVolumedetetion(bool arg)
         {
-        }                                 
+        }
 
         private void changeSelectedStatus(bool arg)
         {
-        }                                 
+        }
 
         private void changeDisable(bool arg)
         {
-        }                                 
+        }
 
         private void changeBuilding(bool arg)
         {
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
index fa32441..63bef7c 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
@@ -170,7 +170,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             m_type = vd.m_type;
             m_flags = vd.m_flags;
 
-            
+
             // Linear properties
             m_linearMotorDirection = vd.m_linearMotorDirection;
 
@@ -761,8 +761,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 roll = (float)Math.Atan2(minuszY, zZ);
             }
             return ;
-        }        
-        
+        }
+
         internal void Step()
         {
             IntPtr Body = rootPrim.Body;
@@ -797,7 +797,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             Vector3 curLocalAngVel = curAngVel * irotq; // current angular velocity in  local
 
             float ldampZ = 0;
-            
+
             bool mousemode = false;
             bool mousemodebank = false;
 
@@ -852,7 +852,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 m_lmEfect = 0;
                 m_ffactor = 1f;
             }
-           
+
             // hover
             if (m_VhoverTimescale < 300 && rootPrim.prim_geom != IntPtr.Zero)
             {
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                                         if (broll > halfpi)
                                             broll = pi - broll;
                                         else if (broll < -halfpi)
-                                            broll = -pi - broll;                           
+                                            broll = -pi - broll;
                     */
                     broll *= m_bankingEfficiency;
                     if (m_bankingMix != 0)
@@ -1054,7 +1054,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     float invamts = 1.0f/m_angularMotorTimescale;
                     float tmp;
 
-                    // get out of x == 0 plane 
+                    // get out of x == 0 plane
                     if(Math.Abs(dirv.X) < 0.001f)
                         dirv.X = 0.001f;
 
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         torque.Y += (tmp - curLocalAngVel.Y) * invamts;
                         torque.Y -= curLocalAngVel.Y * m_amdampY;
                     }
-                    else 
+                    else
                         torque.Y -= curLocalAngVel.Y * m_invtimestep;
 
                     if (Math.Abs(dirv.Y) > 0.01)
@@ -1099,7 +1099,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     {
                         if(mousemodebank)
                             torque.X -= curLocalAngVel.X * m_invtimestep;
-                        else 
+                        else
                             torque.Z -= curLocalAngVel.Z * m_invtimestep;
                     }
                 }
@@ -1133,11 +1133,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 if (m_angularDeflectionEfficiency > 0)
                 {
                     Vector3 dirv;
-                
+
                     if (curLocalVel.X > 0.01f)
                         dirv = curLocalVel;
                     else if (curLocalVel.X < -0.01f)
-                        // use oposite 
+                        // use oposite
                         dirv = -curLocalVel;
                     else
                     {
@@ -1167,7 +1167,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     torque.Z -= curLocalAngVel.Z * m_amdampZ;
                 }
             }
-          
+
             force *= dmass.mass;
 
             force += rootPrim.m_force;
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
index bb661e5..923e2ff 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
@@ -27,7 +27,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         AssetOK = 0x0f,     // 00001111
 
         NeedMask = 0x30,    // 00110000
-        needMesh = 0x10,    // 00010000 
+        needMesh = 0x10,    // 00010000
         needAsset = 0x20,   // 00100000
 
         FailMask = 0xC0,    // 11000000
@@ -287,7 +287,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         public bool needsMeshing(ODEPhysRepData repData)
         {
             PrimitiveBaseShape pbs = repData.pbs;
-            // check sculpts or meshs 
+            // check sculpts or meshs
             if (pbs.SculptEntry)
             {
                 if (meshSculptedPrim)
@@ -462,7 +462,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         repData.meshState = MeshState.MeshFailed;
                         return;
                     }
-                }               
+                }
             }
 
             repData.meshState = MeshState.AssetOK;
@@ -525,7 +525,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             }
 
             mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex, true);
-   
+
             if (mesh == null)
             {
                 if (pbs.SculptEntry)
@@ -607,7 +607,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                     else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
                     {
-                        //a tube 
+                        //a tube
 
                         volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
                         tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY);
@@ -857,7 +857,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             // this is crude aproximation
             profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
             profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
-            volume *= (profileEnd - profileBegin);           
+            volume *= (profileEnd - profileBegin);
 
             repData.volume = volume;
         }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
index 51b8e4e..4cb1736 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
@@ -11,16 +11,16 @@ using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.PhysicsModule.ubOde
 {
-        [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ubODEPhysicsScene")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ubODEPhysicsScene")]
     class ubOdeModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Dictionary<Scene, ODEScene> m_scenes = new Dictionary<Scene, ODEScene>();
         private bool m_Enabled = false;
-                private IConfigSource m_config;
+        private IConfigSource m_config;
         private bool OSOdeLib;
-        
+
 
        #region INonSharedRegionModule
 
@@ -80,7 +80,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
             if(m_scenes.ContainsKey(scene)) // ???
                 return;
-                    ODEScene newodescene = new ODEScene(scene, m_config, Name, Version, OSOdeLib);
+            ODEScene newodescene = new ODEScene(scene, m_config, Name, Version, OSOdeLib);
             m_scenes[scene] = newodescene;
         }
 
@@ -100,13 +100,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         {
             if (!m_Enabled)
                 return;
-            
+
             if(m_scenes.ContainsKey(scene))
             {
                 m_scenes[scene].RegionLoaded();
             }
 
         }
-        #endregion                      
+        #endregion
     }
 }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index a50905b..a2fbf41 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -33,7 +33,7 @@
  * ODEDynamics.cs contains methods dealing with Prim Physical motion
  * (dynamics) and the associated settings. Old Linear and angular
  * motors for dynamic motion have been replace with  MoveLinear()
- * and MoveAngular(); 'Physical' is used only to switch ODE dynamic 
+ * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
  * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
  * switch between 'VEHICLE' parameter use and general dynamics
  * settings use.
@@ -107,7 +107,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         private float m_targetHoverHeight;
         private float m_groundHeight;
         private float m_waterHeight;
-        private float m_buoyancy;                //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. 
+        private float m_buoyancy;                //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
 
         private int body_autodisable_frames;
         public int bodydisablecontrol = 0;
@@ -143,7 +143,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
         private UUID? m_assetID;
         private MeshState m_meshState;
-        
+
         public ODEScene _parent_scene;
 
         /// <summary>
@@ -888,7 +888,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                 m_lastVelocity = _velocity;
                 if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)
-                    m_vehicle.Stop();              
+                    m_vehicle.Stop();
 
                 if(Body != IntPtr.Zero)
                     d.BodySetLinearVel(Body, 0, 0, 0); // stop it
@@ -980,7 +980,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         {
 //                m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);
             AddChange(changes.AngLock, axislock);
-         
+
         }
 
         public override void SubscribeEvents(int ms)
@@ -1464,7 +1464,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             IntPtr vertices, indices;
             int vertexCount, indexCount;
             int vertexStride, triStride;
-            
+
             IMesh mesh = m_mesh;
 
             if (mesh == null)
@@ -1529,7 +1529,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 m_OBB = _size * 0.5f;
                 m_physCost = 0.1f;
                 m_streamCost = 1.0f;
-              
+
                 _parent_scene.mesher.ReleaseMesh(mesh);
                 m_meshState = MeshState.MeshFailed;
                 m_mesh = null;
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             if (childrenPrim.Count == 0)
             {
                 collide_geom = prim_geom;
-                m_targetSpace = _parent_scene.ActiveSpace;               
+                m_targetSpace = _parent_scene.ActiveSpace;
             }
             else
             {
@@ -1911,7 +1911,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);
                 _zeroFlag = false;
                 bodydisablecontrol = 0;
-            }               
+            }
             _parent_scene.addActiveGroups(this);
         }
 
@@ -2011,7 +2011,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             d.Matrix3 mat = new d.Matrix3();
             d.Quaternion quat = new d.Quaternion();
 
-            d.Mass tmpdmass = new d.Mass { };         
+            d.Mass tmpdmass = new d.Mass { };
             d.Mass objdmass = new d.Mass { };
 
             d.BodyGetMass(Body, out tmpdmass);
@@ -2039,7 +2039,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             // subtract current prim inertia from object
             DMassSubPartFromObj(ref tmpdmass, ref objdmass);
 
-            // back prim own inertia 
+            // back prim own inertia
             tmpdmass = primdMass;
 
             // update to new position and orientation
@@ -2444,7 +2444,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             MakeBody();
         }
 
- 
+
         #region changes
 
         private void changeadd()
@@ -3011,7 +3011,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
             primVolume = repData.volume;
 
-            CreateGeom();          
+            CreateGeom();
 
             if (prim_geom != IntPtr.Zero)
             {
@@ -3145,7 +3145,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                     d.BodySetLinearVel(Body, newVel.X, newVel.Y, newVel.Z);
                 }
-                //resetCollisionAccounting();           
+                //resetCollisionAccounting();
             }
             _velocity = newVel;
         }
@@ -3171,7 +3171,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                     d.BodySetAngularVel(Body, newAngVel.X, newAngVel.Y, newAngVel.Z);
                 }
-                //resetCollisionAccounting();           
+                //resetCollisionAccounting();
             }
             m_rotationalVelocity = newAngVel;
         }
@@ -3316,7 +3316,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     // let vehicles sleep
                     if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)
                         return;
-                    
+
                     if (++bodydisablecontrol < 50)
                         return;
 
@@ -3414,7 +3414,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                             break;
                     }     // end switch (m_PIDHoverType)
 
-                    // don't go underground unless volumedetector 
+                    // don't go underground unless volumedetector
 
                     if (m_targetHoverHeight > m_groundHeight || m_isVolumeDetect)
                     {
@@ -3526,7 +3526,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                         d.BodySetLinearVel(Body, 0, 0, 0); // stop it
                         d.BodySetAngularVel(Body, 0, 0, 0); // stop it
-                        d.BodySetPosition(Body, lpos.X, lpos.Y, lpos.Z); // put it somewhere 
+                        d.BodySetPosition(Body, lpos.X, lpos.Y, lpos.Z); // put it somewhere
                         m_lastposition = _position;
                         m_lastorientation = _orientation;
 
@@ -3635,7 +3635,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         _orientation.X = ori.X;
                         _orientation.Y = ori.Y;
                         _orientation.Z = ori.Z;
-                        _orientation.W = ori.W;                   
+                        _orientation.W = ori.W;
                     }
 
                     // update velocities and aceleration
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs
index adefd5e..f671722 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODERayCastRequestManager.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                             continue;
                         }
                     }
-                   
+
                     CurrentRayFilter = req.filter;
                     CurrentMaxCount = req.Count;
 
@@ -279,7 +279,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         /// Method that actually initiates the raycast with spaces
         /// </summary>
         /// <param name="req"></param>
-        /// 
+        ///
 
         private void NoContacts(ODERayRequest req)
         {
@@ -488,7 +488,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             newcontactgeom = (d.ContactGeom)Marshal.PtrToStructure(contactptr, typeof(d.ContactGeom));
             return true;
         }
-        
+
         // This is the standard Near. g1 is the ray
         private void near(IntPtr space, IntPtr g1, IntPtr g2)
         {
@@ -530,7 +530,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             uint col1 = d.GeomGetCollideBits(g1);
             uint col2 = d.GeomGetCollideBits(g2);
 */
-            
+
             uint ID = 0;
             PhysicsActor p2 = null;
 
@@ -671,7 +671,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             {
                 d.GeomDestroy(Plane);
                 Plane = IntPtr.Zero;
-            }           
+            }
         }
     }
 
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 410463c..bed66cc 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
         light = 7 // compatibility with old viewers
     }
-    
+
     public enum changes : int
     {
         Add = 0,                // arg null. finishs the prim creation. should be used internally only ( to remove later ?)
@@ -182,7 +182,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         const float comumContactERP = 0.75f;
         const float comumContactCFM = 0.0001f;
         const float comumContactSLIP = 0f;
-        
+
         float frictionMovementMult = 0.8f;
 
         float TerrainBounce = 0.1f;
@@ -241,7 +241,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         /// </summary>
         private List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
         private List<PhysicsActor> _collisionEventPrimRemove = new List<PhysicsActor>();
-        
+
         private HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
         public Dictionary<IntPtr, PhysicsActor> actor_name_map = new Dictionary<IntPtr, PhysicsActor>();
 
@@ -262,7 +262,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         private IntPtr TerrainGeom;
         private float[] TerrainHeightFieldHeight;
         private GCHandle TerrainHeightFieldHeightsHandler = new GCHandle();
-       
+
         private int m_physicsiterations = 15;
         private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
 //        private PhysicsActor PANull = new NullPhysicsActor();
@@ -330,7 +330,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             EngineType = pname;
             PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
             EngineName = pname + " " + pversion;
-                        m_config = psourceconfig;
+            m_config = psourceconfig;
             m_OSOdeLib = pOSOdeLib;
 
 //            m_OSOdeLib = false; //debug
@@ -343,7 +343,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
             base.Initialise(m_frameWorkScene.PhysicsRequestAsset,
                 (m_frameWorkScene.Heightmap != null ? m_frameWorkScene.Heightmap.GetFloatsSerialised() : new float[m_frameWorkScene.RegionInfo.RegionSizeX * m_frameWorkScene.RegionInfo.RegionSizeY]),
-                (float)m_frameWorkScene.RegionInfo.RegionSettings.WaterHeight);           
+                (float)m_frameWorkScene.RegionInfo.RegionSettings.WaterHeight);
         }
 
         public void RegionLoaded()
@@ -354,7 +354,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 m_log.ErrorFormat("[ubOde] No mesher. module disabled");
                 return;
             }
-            
+
             m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig);
             m_frameWorkScene.PhysicsEnabled = true;
         }
@@ -394,7 +394,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 }
                 catch
                 {
-                    // i must RtC#FM 
+                    // i must RtC#FM
                     // i did!
                 }
 
@@ -674,7 +674,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
         /// <param name="space">The space that contains the geoms.  Remember, spaces are also geoms</param>
         /// <param name="g1">a geometry or space</param>
         /// <param name="g2">another geometry or space</param>
-        /// 
+        ///
 
         private void near(IntPtr space, IntPtr g1, IntPtr g2)
         {
@@ -784,7 +784,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             if (count == 0)
                 return;
 
-            // try get physical actors 
+            // try get physical actors
             PhysicsActor p1;
             PhysicsActor p2;
 
@@ -1135,10 +1135,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         chr.IsColliding = false;
                         // chr.CollidingGround = false; not done here
                         chr.CollidingObj = false;
-                        
+
                         if(chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero )
                             continue;
-                    
+
                         // do colisions with static space
                         d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);
 
@@ -1160,7 +1160,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 foreach (OdePrim aprim in _activeprims)
                 {
                     aprim.CollisionScore = 0;
-                    aprim.IsColliding = false;                   
+                    aprim.IsColliding = false;
                 }
             }
             lock (_activegroups)
@@ -1170,7 +1170,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     foreach (OdePrim aprim in _activegroups)
                     {
                         if(!aprim.m_outbounds && d.BodyIsEnabled(aprim.Body) &&
-                                aprim.collide_geom != IntPtr.Zero)    
+                                aprim.collide_geom != IntPtr.Zero)
                         {
                             d.SpaceCollide2(StaticSpace, aprim.collide_geom, IntPtr.Zero, nearCallback);
                             d.SpaceCollide2(GroundSpace, aprim.collide_geom, IntPtr.Zero, nearCallback);
@@ -1251,7 +1251,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun);
             newAv.Flying = isFlying;
             newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
-            
+
             return newAv;
         }
 
@@ -1301,7 +1301,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
         public void addActivePrim(OdePrim activatePrim)
         {
-            // adds active prim..   
+            // adds active prim..
             lock (_activeprims)
             {
                 if (!_activeprims.Contains(activatePrim))
@@ -1324,7 +1324,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             OdePrim newPrim;
             lock (OdeLock)
             {
-              
+
                 newPrim = new OdePrim(name, this, position, size, rotation, pbs, isphysical, isPhantom, shapeType, localID);
             }
             return newPrim;
@@ -1372,7 +1372,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             {
 //                lock (OdeLock)
                 {
-                    
+
                     OdePrim p = (OdePrim)prim;
                     p.setPrimForRemoval();
                 }
@@ -1423,7 +1423,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 _prims[prim.LocalID] = prim;
             }
         }
-        
+
         public bool haveActor(PhysicsActor actor)
         {
             if (actor is OdePrim)
@@ -1531,14 +1531,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             x = (int)(pos.X * spacesPerMeterX);
             if (x > spaceGridMaxX)
                 return staticPrimspaceOffRegion[1];
-            
+
             y = (int)(pos.Y * spacesPerMeterY);
             if (y > spaceGridMaxY)
                 return staticPrimspaceOffRegion[3];
 
             return staticPrimspace[x, y];
         }
- 
+
         #endregion
 
 
@@ -1628,7 +1628,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             TimeSpan timedif = now - m_lastframe;
             float timeStep = (float)timedif.TotalSeconds;
             m_lastframe = now;
-            
+
             // acumulate time so we can reduce error
             step_time += timeStep;
 
@@ -1654,7 +1654,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 }
 
                 ODEchangeitem item;
-                
+
 //                d.WorldSetQuickStepNumIterations(world, curphysiteractions);
 
                 int loopstartMS = Util.EnvironmentTickCount();
@@ -1662,9 +1662,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 int changestimeMS = 0;
                 int maxChangestime = (int)(reqTimeStep * 500f); // half the time
                 int maxLoopTime = (int)(reqTimeStep * 1200f); // 1.2 the time
- 
+
                 d.AllocateODEDataForThread(~0U);
-               
+
                 if (ChangesQueue.Count > 0)
                 {
                     while (ChangesQueue.Dequeue(out item))
@@ -1726,7 +1726,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                                 aprim.Move();
                             }
                         }
- 
+
                         m_rayCastManager.ProcessQueuedRequests();
 
                         collision_optimized();
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                                     {
                                         pobj.SendCollisions((int)(odetimestepMS));
                                         if(pobj.Body != IntPtr.Zero && !pobj.m_isSelected &&
-                                            !pobj.m_disabled && !pobj.m_building && 
+                                            !pobj.m_disabled && !pobj.m_building &&
                                             !d.BodyIsEnabled(pobj.Body))
                                         sleepers.Add(pobj);
                                     }
@@ -1900,7 +1900,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
                     d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
                 }
-                
+
                 fps = (float)nodeframes * ODE_STEPSIZE / reqTimeStep;
 
                 if(step_time < HalfOdeStep)
@@ -2166,7 +2166,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 h0 = (float)heights[iy]; // 0,1
                 h2 = (float)heights[iy+xstep]; // 1,1 vertice
                 norm.X = h0 - h2;
-                norm.Y = h1 - h0;              
+                norm.Y = h1 - h0;
             }
             else
             {
@@ -2214,7 +2214,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             const float thickness = 10f;
             const int wrap = 0;
 
- 
+
             float hfmin = float.MaxValue;
             float hfmax = float.MinValue;
             float val;
@@ -2503,7 +2503,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
 
             orderedPrims.Sort(compareByCollisionsDesc);
             topColliders = orderedPrims.Take(25).ToDictionary(p => p.LocalID, p => p.CollisionScore);
-           
+
             return topColliders;
         }
 
@@ -2546,7 +2546,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             }
         }
 
-       
+
         public override List<ContactResult> RaycastWorld(Vector3 position, Vector3 direction, float length, int Count)
         {
             List<ContactResult> ourresults = new List<ContactResult>();
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
index 0cdaa60..5d2b1f7 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
@@ -243,8 +243,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                     triangle.v3.Z)
                 || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z ==
                     triangle.v3.Z)
-                )               
-            {               
+                )
+            {
                 return;
             }
 
@@ -444,7 +444,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         {
             if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
                 throw new NotSupportedException("Attempt to Append to a pinned Mesh");
-        
+
             if (!(newMesh is Mesh))
                 return;
 
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 7f0713a..163f439 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -58,8 +58,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         // Setting baseDir to a path will enable the dumping of raw files
         // raw files can be imported by blender so a visual inspection of the results can be done
 
-                private bool m_Enabled = false;
-                
+        private bool m_Enabled = false;
+
         public static object diskLock = new object();
 
         public bool doMeshFileCache = true;
@@ -120,7 +120,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 }
 
                 CacheExpire = TimeSpan.FromHours(fcache);
-                
+
                 lock (diskLock)
                 {
                     if(doMeshFileCache && cachePath != "")
@@ -165,9 +165,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             if (!m_Enabled)
                 return;
         }
-                
+
         #endregion
-                
+
         /// <summary>
         /// creates a simple box mesh of the specified size. This mesh is of very low vertex count and may
         /// be useful as a backup proxy when level of detail is not needed or when more complex meshes fail
@@ -266,7 +266,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         private void AddSubMesh(OSDMap subMeshData, List<Coord> coords, List<Face> faces)
         {
     //                                    Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap));
-    
+
             // As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some Mesh Level
             // of Detail Blocks (maps) contain just a NoGeometry key to signal there is no
             // geometry for this submesh.
@@ -294,15 +294,15 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 ushort uX = Utils.BytesToUInt16(posBytes, i);
                 ushort uY = Utils.BytesToUInt16(posBytes, i + 2);
                 ushort uZ = Utils.BytesToUInt16(posBytes, i + 4);
-    
+
                 Coord c = new Coord(
                 Utils.UInt16ToFloat(uX, posMin.X, posMax.X),
                 Utils.UInt16ToFloat(uY, posMin.Y, posMax.Y),
                 Utils.UInt16ToFloat(uZ, posMin.Z, posMax.Z));
-    
+
                 coords.Add(c);
             }
-    
+
             byte[] triangleBytes = subMeshData["TriangleList"].AsBinary();
             for (int i = 0; i < triangleBytes.Length; i += 6)
             {
@@ -448,7 +448,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                     if (physicsParms != null)
                         usemesh = true;
                 }
-                
+
                 if(!usemesh && (map.ContainsKey("physics_convex")))
                         physicsParms = (OSDMap)map["physics_convex"];
 
@@ -488,9 +488,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 
                                 byte[] decompressedBuf = outMs.GetBuffer();
 
-                                decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);  
+                                decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
                             }
-                        }          
+                        }
                     }
                 }
                 catch (Exception e)
@@ -622,7 +622,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                             faces.Add(f);
                                         }
                                         vertsoffset += vs.Count;
-                                        vs.Clear(); 
+                                        vs.Clear();
                                         continue;
                                     }
     /*
@@ -648,7 +648,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                         c.Z = hullr.Vertices[i].z;
                                         coords.Add(c);
                                     }
-                               
+
                                     for (i = 0; i < nindexs; i += 3)
                                     {
                                         t1 = hullr.Indices[i];
@@ -687,7 +687,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                         c.Z = vs[i].z;
                                         coords.Add(c);
                                     }
-                               
+
                                     for (i = 0; i < nindexs; i += 3)
                                     {
                                         t1 = indices[i];
@@ -707,12 +707,12 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                 }
                             }
                             if (coords.Count > 0 && faces.Count > 0)
-                                return true;                      
+                                return true;
                         }
                         else
                         {
                             // if neither mesh or decomposition present, warn and use convex
-                            m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName);                     
+                            m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName);
                         }
                     }
                     vs.Clear();
@@ -947,7 +947,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         {
             PrimMesh primMesh;
             coords = new List<Coord>();
-            faces = new List<Face>();            
+            faces = new List<Face>();
 
             float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
             float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
@@ -975,7 +975,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 profileHollow = 0.0f;
             else if (profileHollow > 0.95f)
                 profileHollow = 0.95f;
-          
+
             int sides = 4;
             LevelOfDetail iLOD = (LevelOfDetail)lod;
             byte profshape = (byte)(primShape.ProfileCurve & 0x07);
@@ -1033,7 +1033,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             }
 
             primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides);
-            
+
             if (primMesh.errorMessage != null)
                 if (primMesh.errorMessage.Length > 0)
                     m_log.Error("[ERROR] " + primMesh.errorMessage);
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 for (int i = 0; i < someBytes.Length; i++)
                     hash = mdjb2(hash, someBytes[i]);
                 hash = hash << 8;
-            }          
+            }
 
             if (convex)
                 hash |= 4;
@@ -1204,7 +1204,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         {
             return CreateMesh(primName, primShape, size, lod, false, false, false);
         }
-        
+
         public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
         {
             Mesh mesh = null;
@@ -1245,7 +1245,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
         }
 
         private static Vector3 m_MeshUnitSize = new Vector3(1.0f, 1.0f, 1.0f);
-        
+
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde)
         {
 #if SPAM
@@ -1348,7 +1348,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                     m_uniqueMeshes.Add(key, mesh);
                 }
                 catch { }
-            }           
+            }
 
             return mesh;
         }
@@ -1380,7 +1380,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                         m_uniqueReleasedMeshes.Add(mesh.Key, mesh);
                     }
                     catch { }
-                }           
+                }
             }
         }
 
@@ -1447,7 +1447,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 //                            BinaryFormatter bformatter = new BinaryFormatter();
                             mesh = Mesh.FromStream(stream,key);
                         }
-                        
+
                     }
                     catch (Exception e)
                     {
@@ -1524,7 +1524,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 }
             }
         }
-        
+
         public void ExpireFileCache()
         {
             if (!doCacheExpire)
@@ -1543,8 +1543,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                         int ndirs = 0;
                         DateTime OlderTime = File.GetLastAccessTimeUtc(controlfile) - CacheExpire;
                         File.SetLastAccessTimeUtc(controlfile, DateTime.UtcNow);
-                        
-                        foreach (string dir in Directory.GetDirectories(cachePath))                       
+
+                        foreach (string dir in Directory.GetDirectories(cachePath))
                         {
                             try
                             {
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
index 51d067a..10facf2 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
@@ -522,7 +522,7 @@ namespace PrimMesher
         public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool hasProfileCut, bool createFaces)
         {
             const float halfSqr2 = 0.7071067811866f;
-            
+
             coords = new List<Coord>();
             faces = new List<Face>();
 
@@ -769,7 +769,7 @@ namespace PrimMesher
                         }
                     }
                 }
-                
+
             }
 
             else if (createFaces)
@@ -865,7 +865,7 @@ namespace PrimMesher
             int i;
             int numVerts = coords.Count;
             Coord vert;
-                     
+
             for (i = 0; i < numVerts; i++)
             {
                 vert = coords[i];
@@ -1226,7 +1226,7 @@ namespace PrimMesher
             s += "\nrevolutions..........: " + this.revolutions.ToString();
             s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();
             s += "\nhasProfileCut........: " + this.hasProfileCut.ToString();
-            s += "\nhasHollow............: " + this.hasHollow.ToString();          
+            s += "\nhasHollow............: " + this.hasHollow.ToString();
 
             return s;
         }
@@ -1324,7 +1324,7 @@ namespace PrimMesher
                     needEndFaces = true;
             }
             else needEndFaces = true;
-            
+
             if (pathType == PathType.Circular)
             {
                 if (sides == 3)
@@ -1377,7 +1377,7 @@ namespace PrimMesher
                     hollow *= 1.414f;
             }
 
-            Profile profile = new Profile(sides, profileStart, profileEnd, hollow, hollowSides, 
+            Profile profile = new Profile(sides, profileStart, profileEnd, hollow, hollowSides,
                                 HasProfileCut,true);
             errorMessage = profile.errorMessage;
 
@@ -1407,7 +1407,7 @@ namespace PrimMesher
             path.stepsPerRevolution = stepsPerRevolution;
 
             path.Create(pathType, steps);
-            
+
             int lastNode = path.pathNodes.Count - 1;
 
             for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
@@ -1537,7 +1537,7 @@ namespace PrimMesher
         /// DEPRICATED - use Extrude(PathType.Linear) instead
         /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.
         /// </summary>
-        /// 
+        ///
         public void ExtrudeLinear()
         {
             Extrude(PathType.Linear);
@@ -1548,7 +1548,7 @@ namespace PrimMesher
         /// DEPRICATED - use Extrude(PathType.Circular) instead
         /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.
         /// </summary>
-        /// 
+        ///
         public void ExtrudeCircular()
         {
             Extrude(PathType.Circular);
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs
index adb1f2e..6503e35 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/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.Region.PhysicsModule.ubODEMeshing")]
@@ -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/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
index 2ca2af7..ebe2523 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
@@ -57,7 +57,7 @@ namespace PrimMesher
             int numLodPixels = lod * lod;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
 
             bool needsScaling = false;
-            bool smallMap = false;          
+            bool smallMap = false;
 
             width = bmW;
             height = bmH;
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index a7fa502..b71932e 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// <param name="assembly"></param>
         /// <param name="linemap"></param>
         void PerformScriptCompile(
-            string source, string asset, UUID ownerID, 
+            string source, string asset, UUID ownerID,
             out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 361a0b9..2e1dbbe 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Post an event to a single script
         /// </summary>
         bool PostScriptEvent(UUID itemID, EventParams parms);
-        
+
         /// <summary>
         /// Post event to an entire prim
         /// </summary>
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Assemblies that need to be referenced when compiling scripts.
         /// </summary>
         /// <remarks>
-        /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE 
+        /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE
         /// FUTURE.
         /// This can be null if there are no additional assemblies.
         /// </remarks>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index e4297c4..40c2fd2 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         string State { get; set; }
 
         /// <summary>
-        /// If true then the engine is responsible for persisted state.  If false then some other component may 
+        /// If true then the engine is responsible for persisted state.  If false then some other component may
         /// persist state (e.g. attachments persisting in assets).
         /// </summary>
         bool StatePersistedHere { get; }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// </summary>
         /// <param name="data"></param>
         void PostEvent(EventParams data);
-        
+
         void Suspend();
         void Resume();
 
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Reset the script.
         /// </summary>
         /// <remarks>
-        /// This must not be called by any thread other than the one executing the scripts current event.  This is 
+        /// This must not be called by any thread other than the one executing the scripts current event.  This is
         /// because there is no wait or abort logic if another thread is in the middle of processing a script event.
         /// Such an external thread should use ResetScript() instead.
         /// </remarks>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 84d44a1..6a39bb9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -81,64 +81,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public Dataserver DataserverPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_Dataserver[m_ScriptEngine]; 
+                    return m_Dataserver[m_ScriptEngine];
             }
         }
 
         public Timer TimerPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_Timer[m_ScriptEngine]; 
+                    return m_Timer[m_ScriptEngine];
             }
         }
 
         public HttpRequest HttpRequestPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_HttpRequest[m_ScriptEngine]; 
+                    return m_HttpRequest[m_ScriptEngine];
             }
         }
 
         public Listener ListenerPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_Listener[m_ScriptEngine]; 
+                    return m_Listener[m_ScriptEngine];
             }
         }
 
         public SensorRepeat SensorRepeatPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_SensorRepeat[m_ScriptEngine]; 
+                    return m_SensorRepeat[m_ScriptEngine];
             }
         }
 
         public XmlRequest XmlRequestPlugin
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_XmlRequest[m_ScriptEngine]; 
+                    return m_XmlRequest[m_ScriptEngine];
             }
         }
 
         public IScriptEngine[] ScriptEngines
         {
-            get 
-            { 
+            get
+            {
                 lock (staticLock)
-                    return m_ScriptEngines.ToArray(); 
+                    return m_ScriptEngines.ToArray();
             }
         }
 
@@ -387,7 +387,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
- 
+
 
         public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5269bf9..8f9ff03 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected IScriptEngine m_ScriptEngine;
         protected SceneObjectPart m_host;
-  
+
         /// <summary>
         /// The item that hosts this script
         /// </summary>
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host = host;
             m_item = item;
             m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
- 
+
             LoadConfig();
 
             m_TransferModule =
@@ -400,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
 
                 IConfig smtpConfig = seConfigSource.Configs["SMTP"];
-                if (smtpConfig != null) 
+                if (smtpConfig != null)
                 {
                     // there's an smtp config, so load in the snooze time.
                     EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME);
@@ -666,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             case ScriptBaseClass.LINK_SET:
                 return new List<SceneObjectPart>(part.ParentGroup.Parts);
 
-            case ScriptBaseClass.LINK_ROOT:               
+            case ScriptBaseClass.LINK_ROOT:
                 ret.Add(part.ParentGroup.RootPart);
                 return ret;
 
@@ -807,8 +807,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             lock (Util.RandomClass)
             {
-                                return Util.RandomClass.NextDouble() * mag;
-                        }
+                return Util.RandomClass.NextDouble() * mag;
+            }
         }
 
         public LSL_Integer llFloor(double f)
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             /*  This method is more accurate than the SL one, and thus causes problems
                 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
-                
+
             double dotProduct = LSL_Vector.Dot(a, b);
             LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
             double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
@@ -1115,12 +1115,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
             */
-            
+
             // This method mimics the 180 errors found in SL
             // See www.euclideanspace.com... angleBetween
             LSL_Vector vec_a = a;
             LSL_Vector vec_b = b;
-            
+
             // Eliminate zero length
             LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
             LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
             }
-            
+
             // Normalize
             vec_a = llVecNorm(vec_a);
             vec_b = llVecNorm(vec_b);
@@ -1137,13 +1137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Calculate axis and rotation angle
             LSL_Vector axis = vec_a % vec_b;
             LSL_Float cos_theta  = vec_a * vec_b;
-    
+
             // Check if parallel
             if (cos_theta > 0.99999)
             {
                 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
             }
-            
+
             // Check if anti-parallel
             else if (cos_theta < -0.99999)
             {
@@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return new LSL_Rotation(x,y,z,s);
             }
         }
-                
+
         public void llWhisper(int channelID, string text)
         {
             m_host.AddScriptLPS(1);
@@ -1261,7 +1261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 World.SimChat(Utils.StringToBytes(text),
                     ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
-            
+
             }
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             SceneObjectGroup group = m_host.ParentGroup;
- 
+
             if (group == null || group.IsDeleted || group.inTransit)
                 return 1.0f;
 
@@ -1841,7 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             SceneObjectGroup group = m_host.ParentGroup;
- 
+
             if (group == null || group.IsDeleted || group.inTransit)
                 return 1.0f;
 
@@ -1970,7 +1970,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent");
             if (userAgent.IndexOf("SecondLife") < 0)
                 return; // Not the embedded browser. Is this check good enough?
-                                
+
             // Use the IP address of the client and check against the request
             // seperate logins from the same IP will allow all of them to get non-text/plain as long
             // as the owner is in the region. Same as SL!
@@ -2030,7 +2030,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_UrlModule.HttpContentType(new UUID(id),type);
             }
         }
-*/              
+*/
         public void SetTexGen(SceneObjectPart part, int face,int style)
         {
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
@@ -2774,7 +2774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetRot(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-          
+
             // try to let this work as in SL...
             if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
             {
@@ -2960,7 +2960,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
         }
-                
+
         public void llSetAngularVelocity(LSL_Vector avel, int local)
         {
             m_host.AddScriptLPS(1);
@@ -3129,7 +3129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 m_SoundModule.SendSound(
                     m_host.UUID,
-                    ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), 
+                    ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound),
                     volume, false, 0,
                     0, false, false);
             }
@@ -3602,7 +3602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 //            LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0);
             // find normalized left axis parallel to horizon
 //            LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir));
-            
+
             LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f);
             left = llVecNorm(left);
             // make up orthogonal to left and dir
@@ -3851,7 +3851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ScriptSleep(2000);
                 return;
             }
-            
+
             // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
             // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent,
             // but I don't think we have a list of scenes available from here.
@@ -3864,7 +3864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID friendTransactionID = UUID.Random();
 
             //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
-            
+
             GridInstantMessage msg = new GridInstantMessage();
             msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid;
             msg.toAgentID = new Guid(user); // toAgentID.Guid;
@@ -4217,7 +4217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             ScenePresence presence = World.GetScenePresence(agentID);
-            
+
             if (presence != null)
             {
                 // If permissions are being requested from an NPC and were not implicitly granted above then
@@ -4285,7 +4285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.TaskInventory.LockItemsForWrite(true);
             m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
             m_host.TaskInventory.LockItemsForWrite(false);
-            
+
             m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                     "run_time_permissions", new Object[] {
                     new LSL_Integer(answer) },
@@ -4363,7 +4363,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID targetID;
 
             if (!UUID.TryParse(target, out targetID))
-                return;           
+                return;
 
             SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
             if (targetPart == null)
@@ -4493,7 +4493,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                     }
                     finally { }
-                    
+
                     newRoot.ParentGroup.HasGroupChanged = true;
                     newRoot.ParentGroup.ScheduleGroupForFullUpdate();
                 }
@@ -4515,7 +4515,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             TaskInventoryItem item = m_item;
-             
+
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
             {
@@ -4634,7 +4634,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     count = count + 1;
                 }
             }
-            
+
             m_host.TaskInventory.LockItemsForRead(false);
             return count;
         }
@@ -4729,7 +4729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (agentItem == null)
                 {
-                    llSay(0, message); 
+                    llSay(0, message);
                     return;
                 }
 
@@ -4758,7 +4758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (m_TransferModule != null)
                         m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
                 }
-                
+
                 //This delay should only occur when giving inventory to avatars.
                 ScriptSleep(m_sleepMsOnGiveInventory);
             }
@@ -5064,7 +5064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // Can't TP sitting avatars
                 if (presence.ParentID != 0) // Sitting
                     return;
-                                                
+
                 if (m_item.PermsGranter == agentId)
                 {
                     // If attached using llAttachToAvatarTemp, cowardly refuse
@@ -5190,7 +5190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     string movementAnimation = presence.Animator.CurrentMovementAnimation;
                     string lslMovementAnimation;
-                    
+
                     if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
                         return lslMovementAnimation;
                 }
@@ -5531,7 +5531,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 rot.Normalize();
 
             double angle = 2 * Math.Acos(rot.s);
-            if (angle > Math.PI) 
+            if (angle > Math.PI)
                 angle = 2 * Math.PI - angle;
 
             return angle;
@@ -6916,10 +6916,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             SceneObjectPart part = World.GetSceneObjectPart(uuid);
             if (part != null)
             {
-                
+
                 if(part.ParentGroup.IsAttachment)
                 {
-                    uuid = part.ParentGroup.AttachedAvatar;   
+                    uuid = part.ParentGroup.AttachedAvatar;
                 }
                 else
                 {
@@ -10266,7 +10266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             }
                             break;
 
-                        case ScriptBaseClass.PRIM_ROTATION:                       
+                        case ScriptBaseClass.PRIM_ROTATION:
                             if (remain < 1)
                                 return new LSL_List();
 
@@ -10329,7 +10329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             catch (InvalidCastException e)
             {
                 Error(
-                    originFunc, 
+                    originFunc,
                     string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message);
             }
 
@@ -10433,7 +10433,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             while (str2.EndsWith("="))
                 str2 = str2.Substring(0, str2.Length - 1);
-            
+
             byte[] d1 = new byte[str1.Length];
             byte[] d2 = new byte[str2.Length];
 
@@ -10638,7 +10638,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
 
-                if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 
+                if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
                     == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
 /*
                 {
@@ -10803,7 +10803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             List<SceneObjectPart> parts;
             List<ScenePresence> avatars;
-            
+
             LSL_List res = new LSL_List();
             LSL_List remaining = new LSL_List();
 
@@ -12887,7 +12887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return;
                 }
             }
-           
+
             ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
             if (avatar != null)
             {
@@ -13239,7 +13239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             byte[] d2 = new Byte[data1.Length];
             int pos = 0;
-            
+
             if (data1.Length <= data2.Length)
             {
                 Array.Copy(data2, 0, d2, 0, data1.Length);
@@ -13636,7 +13636,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             LSL_List ret = new LSL_List();
             UUID key = new UUID();
-            
+
 
             if (UUID.TryParse(id, out key))
             {
@@ -13824,7 +13824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_NAME:
                                 ret.Add(new LSL_String(obj.Name));
                                 break;
-                            case ScriptBaseClass.OBJECT_DESC:                               
+                            case ScriptBaseClass.OBJECT_DESC:
                                 ret.Add(new LSL_String(obj.Description));
                                 break;
                             case ScriptBaseClass.OBJECT_POS:
@@ -13865,7 +13865,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 }
                                 else
                                 {
-                                    vel = obj.Velocity; 
+                                    vel = obj.Velocity;
                                 }
 
                                 ret.Add(vel);
@@ -14263,8 +14263,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ossl.CheckThreatLevel(ThreatLevel.High, "print");
                 m_log.Info("LSL print():" + str);
             }
-        }       
-                
+        }
+
         public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
         {
             List<SceneObjectPart> parts = GetLinkParts(link);
@@ -14488,7 +14488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             // get work copies
             float sx = rayStart.X;
-            float ex = rayEnd.X;  
+            float ex = rayEnd.X;
             float sy = rayStart.Y;
             float ey = rayEnd.Y;
 
@@ -14497,7 +14497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // region size info
             float rsx =  World.RegionInfo.RegionSizeX;
- 
+
             float tmp;
 
             // region bounds
@@ -14513,7 +14513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 sy += dy * dx;
                 sx = 0;
             }
-            else if(sx >= rsx) 
+            else if(sx >= rsx)
             {
                 if(ex >= rsx)  // totally outside
                     return null;
@@ -14537,7 +14537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 sx += dy * dx;
                 sy = 0;
             }
-            else if(sy >= rsy) 
+            else if(sy >= rsy)
             {
                 if(dy >= 0) // out and going away
                     return null;
@@ -14875,7 +14875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return a.Depth.CompareTo(b.Depth);
             });
-           
+
             int values = 0;
             SceneObjectGroup thisgrp = m_host.ParentGroup;
 
@@ -14931,7 +14931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             list.Add(new LSL_Integer(values));
             return list;
         }
-        
+
 
         /// <summary>
         /// Implementation of llCastRay similar to SL 2015-04-21.
@@ -15076,7 +15076,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         isNonphysical = !isPhysical;
                         isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) ||
                                             (part.VolumeDetectActive);
-                                                
+
                         if (isPhysical && rejectPhysical)
                             continue;
                         if (isNonphysical && rejectNonphysical)
@@ -16291,7 +16291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             pos = sitroot.AbsolutePosition + pos * sitroot.GetWorldRotation();
                         }
                         else
-                            pos = avatar.AbsolutePosition;     
+                            pos = avatar.AbsolutePosition;
 
                         res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
                         break;
@@ -16471,7 +16471,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         res.Add(new LSL_String(""));
                         break;
 
-                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:                      
+                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                         Quaternion lrot = avatar.Rotation;
                         res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
                         break;
@@ -16577,7 +16577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 presence.SetAnimationOverride("ALL", UUID.Zero);
                 return;
             }
-                
+
             string state = String.Empty;
 
             foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 8cd065b..cec595d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -831,6 +831,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             return success;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 1e26036..692bec0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -107,14 +107,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Dumps an error message on the debug console.
         /// </summary>
         /// <param name='message'></param>
-        internal void MODShoutError(string message) 
+        internal void MODShoutError(string message)
         {
             if (message.Length > 1023)
                 message = message.Substring(0, 1023);
 
             World.SimChat(
                 Utils.StringToBytes(message),
-                ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, 
+                ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL,
                 m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="fname">The name of the function to invoke</param>
         /// <param name="parms">List of parameters</param>
@@ -130,9 +130,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void modInvokeN(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -145,9 +145,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String modInvokeS(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -161,9 +161,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer modInvokeI(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -173,13 +173,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int result = (int)modInvoke(fname,parms);
             return new LSL_Integer(result);
         }
-        
+
         public LSL_Float modInvokeF(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -193,9 +193,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Key modInvokeK(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -209,9 +209,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector modInvokeV(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -225,9 +225,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Rotation modInvokeR(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -241,9 +241,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_List modInvokeL(string fname, params object[] parms)
         {
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type returntype = m_comms.LookupReturnType(fname);
@@ -308,22 +308,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
 //            m_log.DebugFormat(
-//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
-//                fname, 
-//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
+//                fname,
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
 //                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
 
             Type[] signature = m_comms.LookupTypeSignature(fname);
             if (signature.Length != parms.Length)
                 MODError(String.Format("wrong number of parameters to function {0}",fname));
-            
+
             object[] convertedParms = new object[parms.Length];
             for (int i = 0; i < parms.Length; i++)
                 convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname);
 
             // now call the function, the contract with the function is that it will always return
             // non-null but don't trust it completely
-            try 
+            try
             {
                 object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms);
                 if (result != null)
@@ -342,7 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return null;
         }
-        
+
         /// <summary>
         /// Send a command to functions registered on an event
         /// </summary>
@@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         protected object ConvertFromLSL(object lslparm, Type type, string fname)
         {
-            
+
             if(lslparm.GetType() == type)
                 return lslparm;
 
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     for (int i = 0; i < plist.Length; i++)
                     {
                         if (plist[i] is LSL_String)
-                            result[i] = (string)(LSL_String)plist[i];                            
+                            result[i] = (string)(LSL_String)plist[i];
                         else if (plist[i] is LSL_Integer)
                             result[i] = (int)(LSL_Integer)plist[i];
                         // The int check exists because of the many plain old int script constants in ScriptBase which
@@ -451,7 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return result;
                 }
             }
-            
+
             MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType()));
             return null;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ba5a46d..066f6a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         internal float m_ScriptDelayFactor = 1.0f;
         internal float m_ScriptDistanceFactor = 1.0f;
         internal bool m_debuggerSafe = false;
-        internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();      
+        internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
         protected IUrlModule m_UrlModule = null;
 
         public void Initialize(
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     //Only gods may use the function
                     if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
                     {
-                        if (World.Permissions.IsGod(ownerID)) 
+                        if (World.Permissions.IsGod(ownerID))
                         {
                             return String.Empty;
                         }
@@ -427,7 +427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     //Only grid gods may use the function
                     if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD"))
                     {
-                        if (World.Permissions.IsGridGod(ownerID)) 
+                        if (World.Permissions.IsGridGod(ownerID))
                         {
                             return String.Empty;
                         }
@@ -856,11 +856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // {
 
                         // We will launch the teleport on a new thread so that when the script threads are terminated
-                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.                        
+                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
                         Util.FireAndForget(
                             o => World.RequestTeleportLocation(
                                 presence.ControllingClient, regionName, position,
-                                lookat, (uint)TPFlags.ViaLocation), 
+                                lookat, (uint)TPFlags.ViaLocation),
                             null, "OSSL_Api.TeleportAgentByRegionCoords");
 
                         ScriptSleep(5000);
@@ -906,8 +906,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
                         Util.FireAndForget(
                             o => World.RequestTeleportLocation(
-                                presence.ControllingClient, regionHandle, 
-                                position, lookat, (uint)TPFlags.ViaLocation), 
+                                presence.ControllingClient, regionHandle,
+                                position, lookat, (uint)TPFlags.ViaLocation),
                             null, "OSSL_Api.TeleportAgentByRegionName");
 
                         ScriptSleep(5000);
@@ -972,13 +972,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             UUID targetID = new UUID(target);
-            
-            ForceSit(avatar, targetID);             
+
+            ForceSit(avatar, targetID);
         }
 
         public void ForceSit(string avatar, UUID targetID)
         {
-            UUID agentID; 
+            UUID agentID;
 
             if (!UUID.TryParse(avatar, out agentID))
                 return;
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
                 return target.ControllingClient.RemoteEndPoint.Address.ToString();
             }
-            
+
             // fall through case, just return nothing
             return "";
         }
@@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ScenePresence target = null;
             if ((World.Entities[avatarID] is ScenePresence))
                 target = (ScenePresence)World.Entities[avatarID];
-                
+
             if (target == null)
                 return;
 
@@ -1115,8 +1115,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         else
                             animID = UUID.Zero;
                     }
-                    
-                  
+
+
                     if (animID == UUID.Zero)
                         target.Animator.RemoveAnimation(animation);
                     else
@@ -1257,7 +1257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public string osSetPenColor(string drawList, string color)
         {
             CheckThreatLevel(ThreatLevel.None, "osSetPenColor");
-            
+
             m_host.AddScriptLPS(1);
             drawList += "PenColor " + color + "; ";
             return drawList;
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             return result;
         }
-        
+
         private ArrayList osdToArray(OSDArray list)
         {
             ArrayList result = new ArrayList();
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             Object decoded = osParseJSONNew(JSON);
-            
+
             if ( decoded is Hashtable ) {
                 return (Hashtable) decoded;
             } else if ( decoded is ArrayList ) {
@@ -1902,7 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
 //            CheckThreatLevel(ThreatLevel.VeryHigh, "osDie");
             // if this is restricted to objects rezzed by this host level can be reduced
-          
+
             CheckThreatLevel(ThreatLevel.Low, "osDie");
             m_host.AddScriptLPS(1);
 
@@ -1931,7 +1931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (sceneOG.OwnerID != m_host.OwnerID)
                 return;
-            
+
             // harakiri check
             if(sceneOG.UUID == m_host.ParentGroup.UUID)
                 throw new SelfDeleteException();
@@ -2042,16 +2042,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (assetID != UUID.Zero)
             {
                 StringBuilder notecardData = new StringBuilder();
-    
+
                 for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
                 {
                     string line = NotecardCache.GetLine(assetID, count) + "\n";
-    
+
     //                m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line);
-    
+
                     notecardData.Append(line);
                 }
-    
+
                 return notecardData.ToString();
             }
 
@@ -2086,7 +2086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (a == null)
                 {
-                    // Whoops, it's still possible here that the notecard name was properly 
+                    // Whoops, it's still possible here that the notecard name was properly
                     // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
                     assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
                     if (assetID == UUID.Zero)
@@ -2291,7 +2291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            
+
             return "";
         }
 
@@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             IConfigSource config = m_ScriptEngine.ConfigSource;
-            string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", 
+            string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
                 new string[] { "Startup", "Hypergrid" }, String.Empty);
 
             if (!string.IsNullOrEmpty(HomeURI))
@@ -2705,12 +2705,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
             m_host.AddScriptLPS(1);
-            
+
             // have to get the npc module also here to set the default Not Owned
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             if(module == null)
                 return new LSL_Key(UUID.Zero.ToString());
-            
+
             bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0;
 
             return NpcCreate(firstname, lastname, position, notecard, owned, false, false);
@@ -2795,7 +2795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         groupTitle = "- NPC -";
                 }
             }
-               
+
             if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0)
             {
                 UUID id;
@@ -2973,7 +2973,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (!module.CheckPermissions(npcId, m_host.OwnerID))
                     return;
-                
+
                 module.MoveToTarget(npcId, World, pos, false, true, false);
             }
         }
@@ -3202,7 +3202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (!module.CheckPermissions(npcId, m_host.OwnerID))
                         return;
 
-                    module.DeleteNPC(npcId, World);                   
+                    module.DeleteNPC(npcId, World);
                 }
             }
             catch { }
@@ -3259,7 +3259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcTouch");
             m_host.AddScriptLPS(1);
-            
+
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             int linkNum = link_num.value;
             if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS))
@@ -3400,7 +3400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             bool isMale = vpShapeMale > 0.5f;
             return new LSL_String(isMale ? "male" : "female");
         }
-        
+
         /// <summary>
         /// Get current region's map texture UUID
         /// </summary>
@@ -3441,7 +3441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return key.ToString();
         }
-        
+
        /// <summary>
         /// Return information regarding various simulator statistics (sim fps, physics fps, time
         /// dilation, total number of prims, total number of active scripts, script lps, various
@@ -3455,7 +3455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             LSL_List ret = new LSL_List();
             float[] stats = World.StatsReporter.LastReportedSimStats;
-            
+
             for (int i = 0; i < 21; i++)
             {
                 ret.Add(new LSL_Float(stats[i]));
@@ -3488,7 +3488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return (int)pws;
         }
-        
+
         public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
@@ -3498,7 +3498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (avatar != null)
                 avatar.SpeedModifier = (float)SpeedModifier;
         }
-        
+
         public void osKickAvatar(string FirstName, string SurName, string alert)
         {
             CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
@@ -3528,7 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (presence != null) health = presence.Health;
             return health;
         }
-        
+
         public void osCauseDamage(string avatar, double damage)
         {
             CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
@@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID avatarId = new UUID(avatar);
             Vector3 pos = m_host.GetWorldPosition();
 
-            ScenePresence presence = World.GetScenePresence(avatarId); 
+            ScenePresence presence = World.GetScenePresence(avatarId);
             if (presence != null)
             {
                 LandData land = World.GetLandData(pos);
@@ -3556,7 +3556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
         }
-        
+
         public void osCauseHealing(string avatar, double healing)
         {
             CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
@@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
             m_host.AddScriptLPS(1);
             InitLSL();
-            
+
             return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
         }
 
@@ -3634,12 +3634,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams");
             m_host.AddScriptLPS(1);
             InitLSL();
-            
+
             m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams");
         }
-        
+
         /// <summary>
-        /// Set parameters for light projection in host prim 
+        /// Set parameters for light projection in host prim
         /// </summary>
         public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb)
         {
@@ -3723,7 +3723,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Get the description from an inventory item
         /// </summary>
         /// <param name="inventoryName"></param>
-        /// <returns>Item description</returns>  
+        /// <returns>Item description</returns>
         public LSL_String osGetInventoryDesc(string item)
         {
             m_host.AddScriptLPS(1);
@@ -3921,7 +3921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (item.InvType != (int)InventoryType.Object)
             {
                 // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set
-                // up the api reference.  
+                // up the api reference.
                 if (m_LSL_Api != null)
                     ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName));
 
@@ -4002,10 +4002,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID targetUUID;
             if(!UUID.TryParse(avatar.ToString(), out targetUUID))
                 return;
-            
+
             if(targetUUID == UUID.Zero)
                 return;
-            
+
             ScenePresence target;
             if(!World.TryGetScenePresence(targetUUID, out target))
                return;
@@ -4068,7 +4068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            bool optionObjCreator = (options & 
+            bool optionObjCreator = (options &
                         ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0;
             bool optionScriptCreator = (options &
                         ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0;
@@ -4316,7 +4316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
             m_host.AddScriptLPS(1);
-            
+
             Hashtable opts = new Hashtable();
             for (int i = 0 ; i < options.Length ; i++)
             {
@@ -4334,7 +4334,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
             m_host.AddScriptLPS(1);
-            
+
             Hashtable opts = new Hashtable();
             for (int i = 0 ; i < options.Length ; i++)
             {
@@ -4362,7 +4362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     m_host.CollisionSoundType = 0; // full return to default sounds
                 else
                     m_host.CollisionSoundType = 2; // default sounds with volume
-                m_host.aggregateScriptEvents();           
+                m_host.aggregateScriptEvents();
                 return;
             }
             // TODO: Parameter check logic required.
@@ -4376,7 +4376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             else
                  m_host.CollisionSoundType = -1;
 
-            m_host.aggregateScriptEvents();           
+            m_host.aggregateScriptEvents();
         }
 
         // still not very usefull, detector is lost on rez, restarts, etc
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 7bfe27b..d401ed8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // your head but the sensor will stay with your (global)
                 // avatar rotation and position.
                 // Position of a sensor in a child prim attached to an avatar
-                // will be still wrong. 
+                // will be still wrong.
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
 
                 // Don't proceed if the avatar for this attachment has since been removed from the scene.
@@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             SceneObjectPart SensePoint = ts.host;
             Vector3 fromRegionPos = SensePoint.GetWorldPosition();
-            
+
             Quaternion q = SensePoint.GetWorldRotation();
             if (SensePoint.ParentGroup.IsAttachment)
             {
@@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // your head but the sensor will stay with your (global)
                 // avatar rotation and position.
                 // Position of a sensor in a child prim attached to an avatar
-                // will be still wrong. 
+                // will be still wrong.
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
 
                 // Don't proceed if the avatar for this attachment has since been removed from the scene.
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0);
             Vector3 toRegionPos;
             double dis;
-            
+
             Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence =>
             {
 //                m_log.DebugFormat(
@@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
                 if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0)
                     return;
-                
+
                 // if the object the script is in is attached and the avatar is the owner
                 // then this one is not wanted
                 if (attached && presence.UUID == SensePoint.OwnerID)
@@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
 
                 AddSenseRepeater(ts);
-                
+
                 idx += 6;
             }
         }
@@ -716,6 +716,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             }
 
             return retList;
-        }           
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 5b1fdc0..cae1c14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -200,6 +200,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             }
 
             return retList;
-        }  
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
index 16805e4..e6676b4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ScriptEngine.Shared.Api")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
index aa78aaa..7c518f3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Vector modInvokeV(string fname, params object[] parms);
         LSL_Rotation modInvokeR(string fname, params object[] parms);
         LSL_List modInvokeL(string fname, params object[] parms);
-        
+
         //Module functions
         string modSendCommand(string modules, string command, string k);
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 7415fea..bee060a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         NoAccess = -1,
 
         /// <summary>
-        /// Function is no threat at all. It doesn't constitute a threat to 
+        /// Function is no threat at all. It doesn't constitute a threat to
         /// either users or the system and has no known side effects.
         /// </summary>
         None = 0,
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         Nuisance = 1,
 
         /// <summary>
-        /// Extreme levels of abuse of this function can cause impaired 
+        /// Extreme levels of abuse of this function can cause impaired
         /// functioning of the region, or very gullible users can be tricked
         /// into experiencing harmless effects.
         /// </summary>
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         /// <summary>
         /// Intentional abuse can cause denial of service and crashes with
-        /// potential of data or state loss; or trusting users can be tricked 
+        /// potential of data or state loss; or trusting users can be tricked
         /// into embarrassing or uncomfortable situations.
         /// </summary>
         Moderate = 4,
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         // Avatar Info Commands
         string osGetAgentIP(string agent);
         LSL_List osGetAgents();
-        
+
         // Teleport commands
         void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
         void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 903b362..3a90c77 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -746,7 +746,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int FRICTION = 2;
         public const int RESTITUTION = 4;
         public const int GRAVITY_MULTIPLIER = 8;
-        
+
         // extra constants for llSetPrimMediaParams
         public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
         public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 9d36341..1a42c3a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1580,7 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetVelocity(force, local);
         }
 
-                
+
         public void llSetAngularVelocity(LSL_Vector force, int local)
         {
             m_LSL_Functions.llSetAngularVelocity(force, local);
@@ -1995,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2);
         }
-        
+
         public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
         {
             return m_LSL_Functions.llGetPrimMediaParams(face, rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c34ccd0..6164734 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -539,7 +539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start);
         }
-        
+
 
         // Information about data loaded into the region
         public string osLoadedCreationDate()
@@ -914,7 +914,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osGetRegionMapTexture(regionName);
         }
-        
+
         public LSL_List osGetRegionStats()
         {
             return m_OSSL_Functions.osGetRegionStats();
@@ -934,12 +934,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osGetSimulatorMemory();
         }
-        
+
         public void osKickAvatar(string FirstName,string SurName,string alert)
         {
             m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
         }
-        
+
         public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
         {
             m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
@@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             m_OSSL_Functions.osCauseDamage(avatar, damage);
         }
-        
+
         public void osCauseHealing(string avatar, double healing)
         {
             m_OSSL_Functions.osCauseHealing(avatar, healing);
@@ -984,12 +984,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             m_OSSL_Functions.osForceOtherSit(avatar, target);
         }
-        
+
         public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
         {
             return m_OSSL_Functions.osGetPrimitiveParams(prim, rules);
         }
-        
+
         public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
         {
             m_OSSL_Functions.osSetPrimitiveParams(prim, rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
index b1825ac..81020f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ScriptEngine.Shared.Api.Runtime")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index bc6ce4f..031f00a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -433,9 +433,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             if (m_insertCoopTerminationChecks)
             {
                 // We have to check in event functions as well because the user can manually call these.
-                if (previousSymbol is GlobalFunctionDefinition 
-                    || previousSymbol is WhileStatement 
-                    || previousSymbol is DoWhileStatement 
+                if (previousSymbol is GlobalFunctionDefinition
+                    || previousSymbol is WhileStatement
+                    || previousSymbol is DoWhileStatement
                     || previousSymbol is ForLoop
                     || previousSymbol is StateEvent)
                 GenerateIndentedLine(m_coopTerminationCheck, sb);
@@ -474,8 +474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             {
                 // A non-braced single line do while structure cannot contain multiple statements.
                 // So to insert the termination check we change this to a braced control structure instead.
-                if (previousSymbol is WhileStatement 
-                    || previousSymbol is DoWhileStatement 
+                if (previousSymbol is WhileStatement
+                    || previousSymbol is DoWhileStatement
                     || previousSymbol is ForLoop)
                 {
                     transformToBlock = true;
@@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         // This code checks for LSL of the following forms, and generates a
         // warning if it finds them.
         //
-        // list l = [ "foo" ]; 
+        // list l = [ "foo" ];
         // l = (l=[]) + l + ["bar"];
         // (produces l=["foo","bar"] in SL but l=["bar"] in OS)
         //
@@ -758,7 +758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             for (int i = 0; i < fls.kids.Count; i++)
             {
                 SYMBOL s = (SYMBOL)fls.kids[i];
-                
+
                 // Statements surrounded by parentheses in for loops
                 //
                 // e.g.  for ((i = 0), (j = 7); (i < 10); (++i))
@@ -774,7 +774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 // like it would be considerably more complicated to handle).
                 while (s is ParenthesisExpression)
                     s = (SYMBOL)s.kids.Pop();
-                    
+
                 GenerateNodeToSB(fls, s, sb);
                 if (0 < comma--)
                     Generate(", ", sb);
@@ -891,9 +891,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     else if (value is OpenMetaverse.Quaternion)
                         retval = String.Format("new LSL_Types.Quaternion(\"{0}\")",((OpenMetaverse.Quaternion)value).ToString());
                     else retval = id;
-                    
+
                     Generate(retval, s, sb);
-                    return; 
+                    return;
                 }
             }
 
@@ -911,7 +911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             string modinvoke = null;
             if (m_comms != null)
                 modinvoke = m_comms.LookupModInvocation(fc.Id);
-            
+
             if (modinvoke != null)
             {
                 if (fc.kids[0] is ArgumentList)
@@ -926,7 +926,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             {
                 Generate(String.Format("{0}(", CheckName(fc.Id)), fc, sb);
             }
-            
+
             foreach (SYMBOL kid in fc.kids)
                 GenerateNodeToSB(fc, kid, sb);
 
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         {
             Indent(sb);
             sb.Append(s);
-            
+
             if (null != sym)
                 m_positionMap.Add(new KeyValuePair<int, int>(m_CSharpLine, m_CSharpCol), new KeyValuePair<int, int>(sym.Line, sym.Position));
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
index 7a2a4a0..19a248f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             if (word.StartsWith("ll")) return false;
             char first = word.ToCharArray(0,1)[0];
             if (first >= 'A' && first <= 'Z') return false;
-           
+
             return (reservedWords.BinarySearch(word) >= 0);
         }
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index f632cb0..f3b8e1d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             {
                 in_startup = false;
                 CheckOrCreateScriptsDirectory();
-                
+
                 // First time we start? Delete old files
                 if (DeleteScriptsOnStartup)
                     DeleteOldFiles();
@@ -310,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             {
 //                m_log.DebugFormat("[Compiler]: Found existing assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name);
 
-                // If we have already read this linemap file, then it will be in our dictionary. 
+                // If we have already read this linemap file, then it will be in our dictionary.
                 // Don't build another copy of the dictionary (saves memory) and certainly
-                // don't keep reading the same file from disk multiple times. 
+                // don't keep reading the same file from disk multiple times.
                 if (!m_lineMaps.ContainsKey(assembly))
                     m_lineMaps[assembly] = ReadMapFile(assembly + ".map");
                 linemap = m_lineMaps[assembly];
@@ -366,8 +366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
                 LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls);
                 AddCSScriptHeader(
-                        m_scriptEngine.ScriptClassName, 
-                        m_scriptEngine.ScriptBaseClassName, 
+                        m_scriptEngine.ScriptClassName,
+                        m_scriptEngine.ScriptBaseClassName,
                         m_scriptEngine.ScriptBaseClassParameters,
                         sb);
 
@@ -381,20 +381,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 }
 
                 linemap = ((CSCodeGenerator)LSL_Converter).PositionMap;
-                // Write the linemap to a file and save it in our dictionary for next time. 
+                // Write the linemap to a file and save it in our dictionary for next time.
                 m_lineMaps[assembly] = linemap;
                 WriteMapFile(assembly + ".map", linemap);
                 LSL_Converter.Clear();
             }
             else
-            {         
+            {
                 switch (language)
                 {
                     case enumCompileType.cs:
                         compileScript = CreateCSCompilerScript(
-                            compileScript, 
-                            m_scriptEngine.ScriptClassName, 
-                            m_scriptEngine.ScriptBaseClassName, 
+                            compileScript,
+                            m_scriptEngine.ScriptClassName,
+                            m_scriptEngine.ScriptBaseClassName,
                             m_scriptEngine.ScriptBaseClassParameters);
                         break;
                     case enumCompileType.vb:
@@ -434,22 +434,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         public static void AddCSScriptHeader(string className, string baseClassName, ParameterInfo[] constructorParameters, StringBuilder sb)
         {
             sb.Append(string.Format(
-@"using OpenSim.Region.ScriptEngine.Shared; 
+@"using OpenSim.Region.ScriptEngine.Shared;
 using System.Collections.Generic;
 
-namespace SecondLife 
-{{ 
-    public class {0} : {1} 
+namespace SecondLife
+{{
+    public class {0} : {1}
     {{
         public {0}({2}) : base({3}) {{}}
 ",
                 className,
-                baseClassName, 
-                constructorParameters != null 
-                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString())) 
-                    : "", 
-                constructorParameters != null 
-                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name)) 
+                baseClassName,
+                constructorParameters != null
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString()))
+                    : "",
+                constructorParameters != null
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name))
                     : ""
                ));
         }
@@ -462,26 +462,26 @@ namespace SecondLife
         public static string CreateCSCompilerScript(
             string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters)
         {
-            compileScript = string.Format(    
-@"using OpenSim.Region.ScriptEngine.Shared; 
+            compileScript = string.Format(
+@"using OpenSim.Region.ScriptEngine.Shared;
 using System.Collections.Generic;
 
-namespace SecondLife 
-{{ 
-    public class {0} : {1} 
+namespace SecondLife
+{{
+    public class {0} : {1}
     {{
         public {0}({2}) : base({3}) {{}}
 {4}
     }}
 }}",
                 className,
-                baseClassName, 
-                constructorParameters != null 
-                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString())) 
-                    : "", 
-                constructorParameters != null 
-                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name)) 
-                    : "", 
+                baseClassName,
+                constructorParameters != null
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString()))
+                    : "",
+                constructorParameters != null
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name))
+                    : "",
                 compileScript);
 
             return compileScript;
@@ -508,7 +508,7 @@ namespace SecondLife
         internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset, string assembly)
         {
 //            m_log.DebugFormat("[Compiler]: Compiling to assembly\n{0}", Script);
-            
+
             string ext = "." + lang.ToString();
 
             // Output assembly name
@@ -562,7 +562,7 @@ namespace SecondLife
 
             if (m_scriptEngine.ScriptReferencedAssemblies != null)
                 Array.ForEach<string>(
-                    m_scriptEngine.ScriptReferencedAssemblies, 
+                    m_scriptEngine.ScriptReferencedAssemblies,
                     a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a)));
 
             parameters.GenerateExecutable = false;
@@ -571,7 +571,7 @@ namespace SecondLife
             //parameters.WarningLevel = 1; // Should be 4?
             parameters.TreatWarningsAsErrors = false;
             parameters.GenerateInMemory = false;
-  
+
             CompilerResults results;
 
             CodeDomProvider provider;
@@ -605,7 +605,7 @@ namespace SecondLife
 //                            results = CScodeProvider.CompileAssemblyFromSource(
 //                                parameters, Script);
 //                        }
-                        
+
                         results = provider.CompileAssemblyFromSource(
                                 parameters, Script);
                         // Deal with an occasional segv in the compiler.
@@ -685,14 +685,14 @@ namespace SecondLife
             }
 
             provider.Dispose();
-           
+
             if (hadErrors)
             {
                 throw new Exception(errtext);
             }
 
             //  On today's highly asynchronous systems, the result of
-            //  the compile may not be immediately apparent. Wait a 
+            //  the compile may not be immediately apparent. Wait a
             //  reasonable amount of time before giving up on it.
 
             if (!File.Exists(assembly))
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
index 7966f59..304cd81 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ScriptEngine.Shared.CodeTools")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index ad4ccf0..12ba4de 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve);
 
             System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler;
-                
+
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll"));
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             CSCodeGenerator cg = new CSCodeGenerator();
             string output = cg.Convert(input);
 
-            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);         
+            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);
             //            System.Console.WriteLine(output);
 
             positionMap = cg.PositionMap;
@@ -154,7 +154,7 @@ erros position is better tested on viewers
         @l;
         i = 1;
     }
-}", out positionMap);           
+}", out positionMap);
 
             Assert.AreEqual(
                 new KeyValuePair<int, int>(7, 9),
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 67ce10a..220ec72 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("changed");
-        }  
+        }
 
         [Test]
         public void TestCollisionEvent()
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision");
-        }  
+        }
 
         [Test]
         public void TestCollisionStartEvent()
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision_start");
-        }  
+        }
 
         [Test]
         public void TestCollisionEndEvent()
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision_end");
-        }  
+        }
 
         [Test]
         public void TestOnRezEvent()
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("on_rez");
-        }  
+        }
 
         [Test]
         public void TestRunTimePermissionsEvent()
@@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("run_time_permissions");
-        }  
+        }
 
         [Test]
         public void TestSensorEvent()
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("sensor");
-        }  
+        }
 
         [Test]
         public void TestTouchEvent()
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch");
-        }  
+        }
 
         [Test]
         public void TestTouchStartEvent()
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch_start");
-        }            
+        }
 
         [Test]
         public void TestTouchEndEvent()
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch_end");
-        }  
+        }
 
         [Test]
         public void TestLandCollisionEvent()
@@ -351,8 +351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             }
 
             Assert.That(
-                gotException, 
-                Is.EqualTo(expectException), 
+                gotException,
+                Is.EqualTo(expectException),
                 "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a");
         }
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
index f87f446..66210b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
@@ -379,7 +379,7 @@ public override int yynum { get { return 96; }}
  public FLOAT_CONSTANT(Lexer yyl):base(yyl) {}}
 //%|LSLTokens
 public class yyLSLTokens : YyLexer {
- public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] { 
+ public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] {
 101,4,6,52,0,
 46,0,53,0,6,
 102,4,16,117,0,
@@ -19717,13 +19717,13 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
       break;
    case 1063: ;
       break;
-   case 1076: ;   
+   case 1076: ;
       break;
    case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
       break;
    case 1067: ;
       break;
-   case 1072: ;   
+   case 1072: ;
       break;
    case 1003: { ((LSLTokens)yym).str += "\\\""; }
       break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 5fef83c..e4b5891 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -886,1493 +886,1493 @@ public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
   public LSLProgramRoot_1(Parser yyq):base(yyq,
-        ((GlobalDefinitions)(yyq.StackAt(1).m_value))
-        , 
-        ((States)(yyq.StackAt(0).m_value))
-        ){}}
+    ((GlobalDefinitions)(yyq.StackAt(1).m_value))
+    ,
+    ((States)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class LSLProgramRoot_2 : LSLProgramRoot {
   public LSLProgramRoot_2(Parser yyq):base(yyq,
-        ((States)(yyq.StackAt(0).m_value))
-        ){}}
+    ((States)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalDefinitions_1 : GlobalDefinitions {
   public GlobalDefinitions_1(Parser yyq):base(yyq,
-        ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalDefinitions_2 : GlobalDefinitions {
   public GlobalDefinitions_2(Parser yyq):base(yyq,
-        ((GlobalDefinitions)(yyq.StackAt(1).m_value))
-        , 
-        ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((GlobalDefinitions)(yyq.StackAt(1).m_value))
+    ,
+    ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalDefinitions_3 : GlobalDefinitions {
   public GlobalDefinitions_3(Parser yyq):base(yyq,
-        ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
-        ){}}
+    ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalDefinitions_4 : GlobalDefinitions {
   public GlobalDefinitions_4(Parser yyq):base(yyq,
-        ((GlobalDefinitions)(yyq.StackAt(1).m_value))
-        , 
-        ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
-        ){}}
+    ((GlobalDefinitions)(yyq.StackAt(1).m_value))
+    ,
+    ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration {
   public GlobalVariableDeclaration_1(Parser yyq):base(yyq,
-        ((Declaration)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Declaration)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration {
   public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax
-)yyq), 
-        ((Declaration)(yyq.StackAt(3).m_value))
-        , 
-        ((Expression)(yyq.StackAt(1).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(2).m_value))
-        .yytext)){}}
+)yyq),
+    ((Declaration)(yyq.StackAt(3).m_value))
+    ,
+    ((Expression)(yyq.StackAt(1).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(2).m_value))
+    .yytext)){}}
 
 public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition {
-  public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+  public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void",
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition {
   public GlobalFunctionDefinition_2(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(5).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Typename)(yyq.StackAt(5).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class States_1 : States {
   public States_1(Parser yyq):base(yyq,
-        ((State)(yyq.StackAt(0).m_value))
-        ){}}
+    ((State)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class States_2 : States {
   public States_2(Parser yyq):base(yyq,
-        ((States)(yyq.StackAt(1).m_value))
-        , 
-        ((State)(yyq.StackAt(0).m_value))
-        ){}}
+    ((States)(yyq.StackAt(1).m_value))
+    ,
+    ((State)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class State_1 : State {
   public State_1(Parser yyq):base(yyq,
-        ((DEFAULT_STATE)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((StateBody)(yyq.StackAt(1).m_value))
-        ){}}
+    ((DEFAULT_STATE)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class State_2 : State {
   public State_2(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((StateBody)(yyq.StackAt(1).m_value))
-        ){}}
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class StateBody_1 : StateBody {
   public StateBody_1(Parser yyq):base(yyq,
-        ((StateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_2 : StateBody {
   public StateBody_2(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((StateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((StateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_3 : StateBody {
   public StateBody_3(Parser yyq):base(yyq,
-        ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_4 : StateBody {
   public StateBody_4(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_5 : StateBody {
   public StateBody_5(Parser yyq):base(yyq,
-        ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_6 : StateBody {
   public StateBody_6(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_7 : StateBody {
   public StateBody_7(Parser yyq):base(yyq,
-        ((IntArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_8 : StateBody {
   public StateBody_8(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((IntArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((IntArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_9 : StateBody {
   public StateBody_9(Parser yyq):base(yyq,
-        ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_10 : StateBody {
   public StateBody_10(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_11 : StateBody {
   public StateBody_11(Parser yyq):base(yyq,
-        ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_12 : StateBody {
   public StateBody_12(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_13 : StateBody {
   public StateBody_13(Parser yyq):base(yyq,
-        ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_14 : StateBody {
   public StateBody_14(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_15 : StateBody {
   public StateBody_15(Parser yyq):base(yyq,
-        ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateBody_16 : StateBody {
   public StateBody_16(Parser yyq):base(yyq,
-        ((StateBody)(yyq.StackAt(1).m_value))
-        , 
-        ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StateBody)(yyq.StackAt(1).m_value))
+    ,
+    ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StateEvent_1 : StateEvent {
   public StateEvent_1(Parser yyq):base(yyq,
-        ((Event)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Event)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class VoidArgStateEvent_1 : VoidArgStateEvent {
   public VoidArgStateEvent_1(Parser yyq):base(yyq,
-        ((VoidArgEvent)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((VoidArgEvent)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class KeyArgStateEvent_1 : KeyArgStateEvent {
   public KeyArgStateEvent_1(Parser yyq):base(yyq,
-        ((KeyArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntArgStateEvent_1 : IntArgStateEvent {
   public IntArgStateEvent_1(Parser yyq):base(yyq,
-        ((IntArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class VectorArgStateEvent_1 : VectorArgStateEvent {
   public VectorArgStateEvent_1(Parser yyq):base(yyq,
-        ((VectorArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((VectorArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent {
   public IntRotRotArgStateEvent_1(Parser yyq):base(yyq,
-        ((IntRotRotArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntRotRotArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent {
   public IntVecVecArgStateEvent_1(Parser yyq):base(yyq,
-        ((IntVecVecArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntVecVecArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class KeyIntIntArgStateEvent_1 : KeyIntIntArgStateEvent {
   public KeyIntIntArgStateEvent_1(Parser yyq):base(yyq,
-        ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((Declaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Declaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ArgumentDeclarationList_2 : ArgumentDeclarationList {
   public ArgumentDeclarationList_2(Parser yyq):base(yyq,
-        ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
-        , 
-        ((Declaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
+    ,
+    ((Declaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class KeyArgumentDeclarationList_1 : KeyArgumentDeclarationList {
   public KeyArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((KeyDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
   public IntArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((IntDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList {
   public VectorArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((VecDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((VecDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList {
   public IntRotRotArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((IntDeclaration)(yyq.StackAt(4).m_value))
-        , 
-        ((RotDeclaration)(yyq.StackAt(2).m_value))
-        , 
-        ((RotDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntDeclaration)(yyq.StackAt(4).m_value))
+    ,
+    ((RotDeclaration)(yyq.StackAt(2).m_value))
+    ,
+    ((RotDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationList {
   public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((IntDeclaration)(yyq.StackAt(4).m_value))
-        , 
-        ((VecDeclaration)(yyq.StackAt(2).m_value))
-        , 
-        ((VecDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IntDeclaration)(yyq.StackAt(4).m_value))
+    ,
+    ((VecDeclaration)(yyq.StackAt(2).m_value))
+    ,
+    ((VecDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class KeyIntIntArgumentDeclarationList_1 : KeyIntIntArgumentDeclarationList {
   public KeyIntIntArgumentDeclarationList_1(Parser yyq):base(yyq,
-        ((KeyDeclaration)(yyq.StackAt(4).m_value))
-        , 
-        ((IntDeclaration)(yyq.StackAt(2).m_value))
-        , 
-        ((IntDeclaration)(yyq.StackAt(0).m_value))
-        ){}}
+    ((KeyDeclaration)(yyq.StackAt(4).m_value))
+    ,
+    ((IntDeclaration)(yyq.StackAt(2).m_value))
+    ,
+    ((IntDeclaration)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Declaration_1 : Declaration {
   public Declaration_1(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((Typename)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class KeyDeclaration_1 : KeyDeclaration {
   public KeyDeclaration_1(Parser yyq):base(yyq,
-        ((KEY_TYPE)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((KEY_TYPE)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntDeclaration_1 : IntDeclaration {
   public IntDeclaration_1(Parser yyq):base(yyq,
-        ((INTEGER_TYPE)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((INTEGER_TYPE)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VecDeclaration_1 : VecDeclaration {
   public VecDeclaration_1(Parser yyq):base(yyq,
-        ((VECTOR_TYPE)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((VECTOR_TYPE)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class RotDeclaration_1 : RotDeclaration {
   public RotDeclaration_1(Parser yyq):base(yyq,
-        ((ROTATION_TYPE)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((ROTATION_TYPE)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class CompoundStatement_1 : CompoundStatement {
   public CompoundStatement_1(Parser yyq):base(yyq){}}
 
 public class CompoundStatement_2 : CompoundStatement {
   public CompoundStatement_2(Parser yyq):base(yyq,
-        ((StatementList)(yyq.StackAt(1).m_value))
-        ){}}
+    ((StatementList)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class StatementList_1 : StatementList {
   public StatementList_1(Parser yyq):base(yyq,
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class StatementList_2 : StatementList {
   public StatementList_2(Parser yyq):base(yyq,
-        ((StatementList)(yyq.StackAt(1).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((StatementList)(yyq.StackAt(1).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class EmptyStatement_1 : EmptyStatement {
   public EmptyStatement_1(Parser yyq):base(yyq){}}
 
 public class Statement_1 : Statement {
   public Statement_1(Parser yyq):base(yyq,
-        ((EmptyStatement)(yyq.StackAt(1).m_value))
-        ){}}
+    ((EmptyStatement)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_2 : Statement {
   public Statement_2(Parser yyq):base(yyq,
-        ((Declaration)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Declaration)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_3 : Statement {
   public Statement_3(Parser yyq):base(yyq,
-        ((Assignment)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Assignment)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_4 : Statement {
   public Statement_4(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_5 : Statement {
   public Statement_5(Parser yyq):base(yyq,
-        ((ReturnStatement)(yyq.StackAt(1).m_value))
-        ){}}
+    ((ReturnStatement)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_6 : Statement {
   public Statement_6(Parser yyq):base(yyq,
-        ((JumpLabel)(yyq.StackAt(1).m_value))
-        ){}}
+    ((JumpLabel)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_7 : Statement {
   public Statement_7(Parser yyq):base(yyq,
-        ((JumpStatement)(yyq.StackAt(1).m_value))
-        ){}}
+    ((JumpStatement)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_8 : Statement {
   public Statement_8(Parser yyq):base(yyq,
-        ((StateChange)(yyq.StackAt(1).m_value))
-        ){}}
+    ((StateChange)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class Statement_9 : Statement {
   public Statement_9(Parser yyq):base(yyq,
-        ((IfStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((IfStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Statement_10 : Statement {
   public Statement_10(Parser yyq):base(yyq,
-        ((WhileStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((WhileStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Statement_11 : Statement {
   public Statement_11(Parser yyq):base(yyq,
-        ((DoWhileStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((DoWhileStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Statement_12 : Statement {
   public Statement_12(Parser yyq):base(yyq,
-        ((ForLoop)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ForLoop)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Statement_13 : Statement {
   public Statement_13(Parser yyq):base(yyq,
-        ((CompoundStatement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((CompoundStatement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class JumpLabel_1 : JumpLabel {
   public JumpLabel_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class JumpStatement_1 : JumpStatement {
   public JumpStatement_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class StateChange_1 : StateChange {
   public StateChange_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class StateChange_2 : StateChange {
   public StateChange_2(Parser yyq):base(yyq,
-        ((DEFAULT_STATE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((DEFAULT_STATE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IfStatement_1 : IfStatement {
   public IfStatement_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IfStatement_2 : IfStatement {
   public IfStatement_2(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(4).m_value))
-        , 
-        ((Statement)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(4).m_value))
+    ,
+    ((Statement)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IfStatement_3 : IfStatement {
   public IfStatement_3(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IfStatement_4 : IfStatement {
   public IfStatement_4(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(4).m_value))
-        , 
-        ((Statement)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(4).m_value))
+    ,
+    ((Statement)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class WhileStatement_1 : WhileStatement {
   public WhileStatement_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class WhileStatement_2 : WhileStatement {
   public WhileStatement_2(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class DoWhileStatement_1 : DoWhileStatement {
   public DoWhileStatement_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(5).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(5).m_value))
+    ){}}
 
 public class DoWhileStatement_2 : DoWhileStatement {
   public DoWhileStatement_2(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(5).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(5).m_value))
+    ){}}
 
 public class ForLoop_1 : ForLoop {
   public ForLoop_1(Parser yyq):base(yyq,
-        ((ForLoopStatement)(yyq.StackAt(6).m_value))
-        , 
-        ((Expression)(yyq.StackAt(4).m_value))
-        , 
-        ((ForLoopStatement)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ForLoopStatement)(yyq.StackAt(6).m_value))
+    ,
+    ((Expression)(yyq.StackAt(4).m_value))
+    ,
+    ((ForLoopStatement)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ForLoop_2 : ForLoop {
-  public ForLoop_2(Parser yyq):base(yyq,null, 
-        ((Expression)(yyq.StackAt(4).m_value))
-        , 
-        ((ForLoopStatement)(yyq.StackAt(2).m_value))
-        , 
-        ((Statement)(yyq.StackAt(0).m_value))
-        ){}}
+  public ForLoop_2(Parser yyq):base(yyq,null,
+    ((Expression)(yyq.StackAt(4).m_value))
+    ,
+    ((ForLoopStatement)(yyq.StackAt(2).m_value))
+    ,
+    ((Statement)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ForLoopStatement_1 : ForLoopStatement {
   public ForLoopStatement_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ForLoopStatement_2 : ForLoopStatement {
   public ForLoopStatement_2(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ForLoopStatement_3 : ForLoopStatement {
   public ForLoopStatement_3(Parser yyq):base(yyq,
-        ((ForLoopStatement)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ForLoopStatement)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ForLoopStatement_4 : ForLoopStatement {
   public ForLoopStatement_4(Parser yyq):base(yyq,
-        ((ForLoopStatement)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ForLoopStatement)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Assignment_1 : Assignment {
   public Assignment_1(Parser yyq):base(yyq,
-        ((Declaration)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Declaration)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class Assignment_2 : Assignment {
   public Assignment_2(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class SimpleAssignment_1 : SimpleAssignment {
   public SimpleAssignment_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_2 : SimpleAssignment {
   public SimpleAssignment_2(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_3 : SimpleAssignment {
   public SimpleAssignment_3(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_4 : SimpleAssignment {
   public SimpleAssignment_4(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((STAR_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((STAR_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_5 : SimpleAssignment {
   public SimpleAssignment_5(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_6 : SimpleAssignment {
   public SimpleAssignment_6(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_7 : SimpleAssignment {
   public SimpleAssignment_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_8 : SimpleAssignment {
   public SimpleAssignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_9 : SimpleAssignment {
   public SimpleAssignment_9(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_10 : SimpleAssignment {
   public SimpleAssignment_10(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((STAR_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((STAR_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_11 : SimpleAssignment {
   public SimpleAssignment_11(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_12 : SimpleAssignment {
   public SimpleAssignment_12(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_13 : SimpleAssignment {
   public SimpleAssignment_13(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_14 : SimpleAssignment {
   public SimpleAssignment_14(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_15 : SimpleAssignment {
   public SimpleAssignment_15(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_16 : SimpleAssignment {
   public SimpleAssignment_16(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((STAR_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((STAR_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_17 : SimpleAssignment {
   public SimpleAssignment_17(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_18 : SimpleAssignment {
   public SimpleAssignment_18(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        , 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    ,
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_19 : SimpleAssignment {
   public SimpleAssignment_19(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_20 : SimpleAssignment {
   public SimpleAssignment_20(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_21 : SimpleAssignment {
   public SimpleAssignment_21(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_22 : SimpleAssignment {
   public SimpleAssignment_22(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((STAR_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((STAR_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_23 : SimpleAssignment {
   public SimpleAssignment_23(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class SimpleAssignment_24 : SimpleAssignment {
   public SimpleAssignment_24(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext), 
-        ((SimpleAssignment)(yyq.StackAt(0).m_value))
-        , 
-        ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext),
+    ((SimpleAssignment)(yyq.StackAt(0).m_value))
+    ,
+    ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class ReturnStatement_1 : ReturnStatement {
   public ReturnStatement_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ReturnStatement_2 : ReturnStatement {
   public ReturnStatement_2(Parser yyq):base(yyq){}}
 
 public class Constant_1 : Constant {
-  public Constant_1(Parser yyq):base(yyq,"integer", 
-        ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+  public Constant_1(Parser yyq):base(yyq,"integer",
+    ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Constant_2 : Constant {
-  public Constant_2(Parser yyq):base(yyq,"integer", 
-        ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+  public Constant_2(Parser yyq):base(yyq,"integer",
+    ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Constant_3 : Constant {
-  public Constant_3(Parser yyq):base(yyq,"float", 
-        ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+  public Constant_3(Parser yyq):base(yyq,"float",
+    ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Constant_4 : Constant {
-  public Constant_4(Parser yyq):base(yyq,"string", 
-        ((STRING_CONSTANT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+  public Constant_4(Parser yyq):base(yyq,"string",
+    ((STRING_CONSTANT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class ListConstant_1 : ListConstant {
   public ListConstant_1(Parser yyq):base(yyq,
-        ((ArgumentList)(yyq.StackAt(1).m_value))
-        ){}}
+    ((ArgumentList)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class VectorConstant_1 : VectorConstant {
   public VectorConstant_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(5).m_value))
-        , 
-        ((Expression)(yyq.StackAt(3).m_value))
-        , 
-        ((Expression)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(5).m_value))
+    ,
+    ((Expression)(yyq.StackAt(3).m_value))
+    ,
+    ((Expression)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class RotationConstant_1 : RotationConstant {
   public RotationConstant_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(7).m_value))
-        , 
-        ((Expression)(yyq.StackAt(5).m_value))
-        , 
-        ((Expression)(yyq.StackAt(3).m_value))
-        , 
-        ((Expression)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(7).m_value))
+    ,
+    ((Expression)(yyq.StackAt(5).m_value))
+    ,
+    ((Expression)(yyq.StackAt(3).m_value))
+    ,
+    ((Expression)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class ConstantExpression_1 : ConstantExpression {
   public ConstantExpression_1(Parser yyq):base(yyq,
-        ((Constant)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Constant)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class IdentExpression_1 : IdentExpression {
   public IdentExpression_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IdentDotExpression_1 : IdentDotExpression {
   public IdentDotExpression_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IncrementDecrementExpression_1 : IncrementDecrementExpression {
   public IncrementDecrementExpression_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((INCREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true){}}
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((INCREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true){}}
 
 public class IncrementDecrementExpression_2 : IncrementDecrementExpression {
   public IncrementDecrementExpression_2(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((DECREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true){}}
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((DECREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true){}}
 
 public class IncrementDecrementExpression_3 : IncrementDecrementExpression {
   public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext), 
-        ((INCREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext),
+    ((INCREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true){}}
 
 public class IncrementDecrementExpression_4 : IncrementDecrementExpression {
   public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext), 
-        ((DECREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext),
+    ((DECREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true){}}
 
 public class IncrementDecrementExpression_5 : IncrementDecrementExpression {
   public IncrementDecrementExpression_5(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext, 
-        ((INCREMENT)(yyq.StackAt(1).m_value))
-        .yytext, false){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext,
+    ((INCREMENT)(yyq.StackAt(1).m_value))
+    .yytext, false){}}
 
 public class IncrementDecrementExpression_6 : IncrementDecrementExpression {
   public IncrementDecrementExpression_6(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext, 
-        ((DECREMENT)(yyq.StackAt(1).m_value))
-        .yytext, false){}}
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext,
+    ((DECREMENT)(yyq.StackAt(1).m_value))
+    .yytext, false){}}
 
 public class IncrementDecrementExpression_7 : IncrementDecrementExpression {
   public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext), 
-        ((INCREMENT)(yyq.StackAt(3).m_value))
-        .yytext, false){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext),
+    ((INCREMENT)(yyq.StackAt(3).m_value))
+    .yytext, false){}}
 
 public class IncrementDecrementExpression_8 : IncrementDecrementExpression {
   public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext), 
-        ((DECREMENT)(yyq.StackAt(3).m_value))
-        .yytext, false){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext),
+    ((DECREMENT)(yyq.StackAt(3).m_value))
+    .yytext, false){}}
 
 public class FunctionCallExpression_1 : FunctionCallExpression {
   public FunctionCallExpression_1(Parser yyq):base(yyq,
-        ((FunctionCall)(yyq.StackAt(0).m_value))
-        ){}}
+    ((FunctionCall)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class BinaryExpression_1 : BinaryExpression {
   public BinaryExpression_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PLUS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PLUS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_2 : BinaryExpression {
   public BinaryExpression_2(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((MINUS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((MINUS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_3 : BinaryExpression {
   public BinaryExpression_3(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((STAR)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((STAR)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_4 : BinaryExpression {
   public BinaryExpression_4(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((SLASH)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((SLASH)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_5 : BinaryExpression {
   public BinaryExpression_5(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((PERCENT)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((PERCENT)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_6 : BinaryExpression {
   public BinaryExpression_6(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((AMP)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((AMP)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_7 : BinaryExpression {
   public BinaryExpression_7(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((STROKE)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((STROKE)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_8 : BinaryExpression {
   public BinaryExpression_8(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((CARET)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((CARET)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_9 : BinaryExpression {
   public BinaryExpression_9(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((RIGHT_ANGLE)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((RIGHT_ANGLE)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_10 : BinaryExpression {
   public BinaryExpression_10(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((LEFT_ANGLE)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((LEFT_ANGLE)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_11 : BinaryExpression {
   public BinaryExpression_11(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((EQUALS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((EQUALS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_12 : BinaryExpression {
   public BinaryExpression_12(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_13 : BinaryExpression {
   public BinaryExpression_13(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((LESS_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((LESS_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_14 : BinaryExpression {
   public BinaryExpression_14(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((GREATER_EQUALS)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((GREATER_EQUALS)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_15 : BinaryExpression {
   public BinaryExpression_15(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((AMP_AMP)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((AMP_AMP)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_16 : BinaryExpression {
   public BinaryExpression_16(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((STROKE_STROKE)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((STROKE_STROKE)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_17 : BinaryExpression {
   public BinaryExpression_17(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((LEFT_SHIFT)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((LEFT_SHIFT)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class BinaryExpression_18 : BinaryExpression {
   public BinaryExpression_18(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(2).m_value))
-        , 
-        ((Expression)(yyq.StackAt(0).m_value))
-        , 
-        ((RIGHT_SHIFT)(yyq.StackAt(1).m_value))
-        .yytext){}}
+    ((Expression)(yyq.StackAt(2).m_value))
+    ,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ,
+    ((RIGHT_SHIFT)(yyq.StackAt(1).m_value))
+    .yytext){}}
 
 public class UnaryExpression_1 : UnaryExpression {
   public UnaryExpression_1(Parser yyq):base(yyq,
-        ((EXCLAMATION)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((EXCLAMATION)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class UnaryExpression_2 : UnaryExpression {
   public UnaryExpression_2(Parser yyq):base(yyq,
-        ((MINUS)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((MINUS)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class UnaryExpression_3 : UnaryExpression {
   public UnaryExpression_3(Parser yyq):base(yyq,
-        ((TILDE)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((TILDE)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ParenthesisExpression_1 : ParenthesisExpression {
   public ParenthesisExpression_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class ParenthesisExpression_2 : ParenthesisExpression {
   public ParenthesisExpression_2(Parser yyq):base(yyq,
-        ((SimpleAssignment)(yyq.StackAt(1).m_value))
-        ){}}
+    ((SimpleAssignment)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class TypecastExpression_1 : TypecastExpression {
   public TypecastExpression_1(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((Constant)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Typename)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((Constant)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class TypecastExpression_2 : TypecastExpression {
   public TypecastExpression_2(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(2).m_value))
-        .yytext, new IdentExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext)){}}
+    ((Typename)(yyq.StackAt(2).m_value))
+    .yytext, new IdentExpression(((LSLSyntax
+)yyq),
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext)){}}
 
 public class TypecastExpression_3 : TypecastExpression {
   public TypecastExpression_3(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(4).m_value))
-        .yytext, new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(0).m_value))
-        .yytext)){}}
+    ((Typename)(yyq.StackAt(4).m_value))
+    .yytext, new IdentDotExpression(((LSLSyntax
+)yyq),
+    ((IDENT)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(0).m_value))
+    .yytext)){}}
 
 public class TypecastExpression_4 : TypecastExpression {
   public TypecastExpression_4(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(3).m_value))
-        .yytext, new IncrementDecrementExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((INCREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true)){}}
+    ((Typename)(yyq.StackAt(3).m_value))
+    .yytext, new IncrementDecrementExpression(((LSLSyntax
+)yyq),
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((INCREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true)){}}
 
 public class TypecastExpression_5 : TypecastExpression {
   public TypecastExpression_5(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(5).m_value))
-        .yytext, new IncrementDecrementExpression(((LSLSyntax
+    ((Typename)(yyq.StackAt(5).m_value))
+    .yytext, new IncrementDecrementExpression(((LSLSyntax
 )yyq), new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext), 
-        ((INCREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true)){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext),
+    ((INCREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true)){}}
 
 public class TypecastExpression_6 : TypecastExpression {
   public TypecastExpression_6(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(3).m_value))
-        .yytext, new IncrementDecrementExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext, 
-        ((DECREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true)){}}
+    ((Typename)(yyq.StackAt(3).m_value))
+    .yytext, new IncrementDecrementExpression(((LSLSyntax
+)yyq),
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext,
+    ((DECREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true)){}}
 
 public class TypecastExpression_7 : TypecastExpression {
   public TypecastExpression_7(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(5).m_value))
-        .yytext, new IncrementDecrementExpression(((LSLSyntax
+    ((Typename)(yyq.StackAt(5).m_value))
+    .yytext, new IncrementDecrementExpression(((LSLSyntax
 )yyq), new IdentDotExpression(((LSLSyntax
-)yyq), 
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((IDENT)(yyq.StackAt(1).m_value))
-        .yytext), 
-        ((DECREMENT)(yyq.StackAt(0).m_value))
-        .yytext, true)){}}
+)yyq),
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((IDENT)(yyq.StackAt(1).m_value))
+    .yytext),
+    ((DECREMENT)(yyq.StackAt(0).m_value))
+    .yytext, true)){}}
 
 public class TypecastExpression_8 : TypecastExpression {
   public TypecastExpression_8(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(2).m_value))
-        .yytext, 
-        ((FunctionCall)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Typename)(yyq.StackAt(2).m_value))
+    .yytext,
+    ((FunctionCall)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class TypecastExpression_9 : TypecastExpression {
   public TypecastExpression_9(Parser yyq):base(yyq,
-        ((Typename)(yyq.StackAt(4).m_value))
-        .yytext, 
-        ((Expression)(yyq.StackAt(1).m_value))
-        ){}}
+    ((Typename)(yyq.StackAt(4).m_value))
+    .yytext,
+    ((Expression)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class FunctionCall_1 : FunctionCall {
   public FunctionCall_1(Parser yyq):base(yyq,
-        ((IDENT)(yyq.StackAt(3).m_value))
-        .yytext, 
-        ((ArgumentList)(yyq.StackAt(1).m_value))
-        ){}}
+    ((IDENT)(yyq.StackAt(3).m_value))
+    .yytext,
+    ((ArgumentList)(yyq.StackAt(1).m_value))
+    ){}}
 
 public class ArgumentList_1 : ArgumentList {
   public ArgumentList_1(Parser yyq):base(yyq,
-        ((Argument)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Argument)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ArgumentList_2 : ArgumentList {
   public ArgumentList_2(Parser yyq):base(yyq,
-        ((ArgumentList)(yyq.StackAt(2).m_value))
-        , 
-        ((Argument)(yyq.StackAt(0).m_value))
-        ){}}
+    ((ArgumentList)(yyq.StackAt(2).m_value))
+    ,
+    ((Argument)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class ExpressionArgument_1 : ExpressionArgument {
   public ExpressionArgument_1(Parser yyq):base(yyq,
-        ((Expression)(yyq.StackAt(0).m_value))
-        ){}}
+    ((Expression)(yyq.StackAt(0).m_value))
+    ){}}
 
 public class Typename_1 : Typename {
   public Typename_1(Parser yyq):base(yyq,
-        ((INTEGER_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((INTEGER_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_2 : Typename {
   public Typename_2(Parser yyq):base(yyq,
-        ((FLOAT_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((FLOAT_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_3 : Typename {
   public Typename_3(Parser yyq):base(yyq,
-        ((STRING_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((STRING_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_4 : Typename {
   public Typename_4(Parser yyq):base(yyq,
-        ((KEY_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((KEY_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_5 : Typename {
   public Typename_5(Parser yyq):base(yyq,
-        ((VECTOR_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((VECTOR_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_6 : Typename {
   public Typename_6(Parser yyq):base(yyq,
-        ((ROTATION_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((ROTATION_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Typename_7 : Typename {
   public Typename_7(Parser yyq):base(yyq,
-        ((LIST_TYPE)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LIST_TYPE)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_1 : Event {
   public Event_1(Parser yyq):base(yyq,
-        ((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_2 : Event {
   public Event_2(Parser yyq):base(yyq,
-        ((EMAIL_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_3 : Event {
   public Event_3(Parser yyq):base(yyq,
-        ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-        ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-        ((LISTEN_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-        ((MONEY_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((MONEY_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-        ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-        ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-        ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_1 : VoidArgEvent {
   public VoidArgEvent_1(Parser yyq):base(yyq,
-        ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_2 : VoidArgEvent {
   public VoidArgEvent_2(Parser yyq):base(yyq,
-        ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_3 : VoidArgEvent {
   public VoidArgEvent_3(Parser yyq):base(yyq,
-        ((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_4 : VoidArgEvent {
   public VoidArgEvent_4(Parser yyq):base(yyq,
-        ((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_5 : VoidArgEvent {
   public VoidArgEvent_5(Parser yyq):base(yyq,
-        ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_6 : VoidArgEvent {
   public VoidArgEvent_6(Parser yyq):base(yyq,
-        ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_7 : VoidArgEvent {
   public VoidArgEvent_7(Parser yyq):base(yyq,
-        ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VoidArgEvent_8 : VoidArgEvent {
   public VoidArgEvent_8(Parser yyq):base(yyq,
-        ((TIMER_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((TIMER_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class KeyArgEvent_1 : KeyArgEvent {
   public KeyArgEvent_1(Parser yyq):base(yyq,
-        ((ATTACH_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((ATTACH_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class KeyArgEvent_2 : KeyArgEvent {
   public KeyArgEvent_2(Parser yyq):base(yyq,
-        ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_1 : IntArgEvent {
   public IntArgEvent_1(Parser yyq):base(yyq,
-        ((CHANGED_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((CHANGED_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_2 : IntArgEvent {
   public IntArgEvent_2(Parser yyq):base(yyq,
-        ((COLLISION_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((COLLISION_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_3 : IntArgEvent {
   public IntArgEvent_3(Parser yyq):base(yyq,
-        ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_4 : IntArgEvent {
   public IntArgEvent_4(Parser yyq):base(yyq,
-        ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_5 : IntArgEvent {
   public IntArgEvent_5(Parser yyq):base(yyq,
-        ((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_6 : IntArgEvent {
   public IntArgEvent_6(Parser yyq):base(yyq,
-        ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_7 : IntArgEvent {
   public IntArgEvent_7(Parser yyq):base(yyq,
-        ((SENSOR_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((SENSOR_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_8 : IntArgEvent {
   public IntArgEvent_8(Parser yyq):base(yyq,
-        ((TOUCH_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((TOUCH_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_9 : IntArgEvent {
   public IntArgEvent_9(Parser yyq):base(yyq,
-        ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntArgEvent_10 : IntArgEvent {
   public IntArgEvent_10(Parser yyq):base(yyq,
-        ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VectorArgEvent_1 : VectorArgEvent {
   public VectorArgEvent_1(Parser yyq):base(yyq,
-        ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VectorArgEvent_2 : VectorArgEvent {
   public VectorArgEvent_2(Parser yyq):base(yyq,
-        ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class VectorArgEvent_3 : VectorArgEvent {
   public VectorArgEvent_3(Parser yyq):base(yyq,
-        ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntRotRotArgEvent_1 : IntRotRotArgEvent {
   public IntRotRotArgEvent_1(Parser yyq):base(yyq,
-        ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class IntVecVecArgEvent_1 : IntVecVecArgEvent {
   public IntVecVecArgEvent_1(Parser yyq):base(yyq,
-        ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 
 public class KeyIntIntArgEvent_1 : KeyIntIntArgEvent {
   public KeyIntIntArgEvent_1(Parser yyq):base(yyq,
-        ((CONTROL_EVENT)(yyq.StackAt(0).m_value))
-        .yytext){}}
+    ((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+    .yytext){}}
 public class yyLSLSyntax
 : YyParser {
   public override object Action(Parser yyq,SYMBOL yysym, int yyact) {
     switch(yyact) {
-         case -1: break; //// keep compiler happy
+     case -1: break; //// keep compiler happy
 }  return null; }
 
 public class ArgumentDeclarationList_3 : ArgumentDeclarationList {
@@ -2390,7 +2390,7 @@ public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
 public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
   public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
 public yyLSLSyntax
-():base() { arr = new int[] { 
+():base() { arr = new int[] {
 101,4,6,52,0,
 46,0,53,0,102,
 20,103,4,28,76,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 110fce6..7db6b6d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
         }
 
         protected EventAbortException(
-                SerializationInfo info, 
+                SerializationInfo info,
                 StreamingContext context)
         {
         }
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
         }
 
         protected SelfDeleteException(
-                SerializationInfo info, 
+                SerializationInfo info,
                 StreamingContext context)
         {
         }
@@ -76,14 +76,14 @@ namespace OpenSim.Region.ScriptEngine.Shared
         }
 
         protected ScriptDeleteException(
-                SerializationInfo info, 
+                SerializationInfo info,
                 StreamingContext context)
         {
         }
     }
 
     /// <summary>
-    /// Used to signal when the script is stopping in co-operation with the script engine 
+    /// Used to signal when the script is stopping in co-operation with the script engine
     /// (instead of through Thread.Abort()).
     /// </summary>
     [Serializable]
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
         }
 
         protected ScriptCoopStopException(
-                SerializationInfo info, 
+                SerializationInfo info,
                 StreamingContext context)
         {
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
index fdbdd8c..411d49c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ScriptEngine.Shared.Instance")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 7129c8a..9d72b1c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         // The following is for setting a minimum delay between events
         private double m_minEventDelay;
-        
+
         private long m_eventDelayTicks;
         private long m_nextEventTimeTicks;
         private bool m_startOnInit = true;
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 if (value > 0.001)
                     m_minEventDelay = value;
-                else 
+                else
                     m_minEventDelay = 0.0;
 
                 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L);
@@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 {
                     bool wasSuspended = m_Suspended;
                     m_Suspended = value;
-    
+
                     if (wasSuspended && !m_Suspended)
                     {
                         lock (EventQueue)
@@ -201,11 +201,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public long EventsQueued
         {
-            get 
+            get
             {
                 lock (EventQueue)
                     return EventQueue.Count;
-            }   
+            }
         }
 
         public long EventsProcessed { get; private set; }
@@ -221,7 +221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private static readonly int MeasurementWindow = 30 * 1000;   // show the *recent* time used by the script, to find currently active scripts
 
         private bool m_coopTermination;
- 
+
         private EventWaitHandle m_coopSleepHandle;
 
         public void ClearQueue()
@@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         /// <param name='stateSource'></param>
         /// <returns>false if load failed, true if suceeded</returns>
         public bool Load(
-            IScript script, EventWaitHandle coopSleepHandle, string assemblyPath, 
+            IScript script, EventWaitHandle coopSleepHandle, string assemblyPath,
             string dataPath, StateSource stateSource, bool coopTermination)
         {
             m_Script = script;
@@ -324,13 +324,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 return false;
             }
 
-            // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called.           
+            // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called.
             string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state");
 
             if (File.Exists(savedState))
             {
                 //                m_log.DebugFormat(
-                //                    "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}", 
+                //                    "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}",
                 //                    ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
 
                 string xml = String.Empty;
@@ -395,7 +395,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             //            else
             //            {
             //                m_log.DebugFormat(
-            //                    "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}", 
+            //                    "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}",
             //                    ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
             //            }
 
@@ -407,11 +407,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             if (ShuttingDown)
                 return;
 
-            if (m_startedFromSavedState) 
+            if (m_startedFromSavedState)
             {
                 if (m_startOnInit)
                     Start();
-                if (m_postOnRez) 
+                if (m_postOnRez)
                 {
                     PostEvent(new EventParams("on_rez",
                         new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0]));
@@ -439,13 +439,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0]));
                 }
             }
-            else 
+            else
             {
                 if (m_startOnInit)
                     Start();
                 PostEvent(new EventParams("state_entry",
                                           new Object[0], new DetectParams[0]));
-                if (m_postOnRez) 
+                if (m_postOnRez)
                 {
                     PostEvent(new EventParams("on_rez",
                         new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0]));
@@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private void ReleaseControls()
         {
             SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
-            
+
             if (part != null)
             {
                 int permsMask;
@@ -508,8 +508,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 m_log.Warn(
                     string.Format(
-                        "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}.  Exception  ", 
-                        savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 
+                        "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}.  Exception  ",
+                        savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
                     e);
             }
         }
@@ -631,7 +631,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             if (!m_InSelfDelete)
             {
                 m_log.DebugFormat(
-                    "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms", 
+                    "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms",
                     ScriptName, ItemID, PrimName, LocalID, timeout);
 
                 workItem.Abort();
@@ -709,7 +709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             lock (EventQueue)
             {
                 // The only events that persist across state changes are timers
-                if (m_StateChangeInProgress && data.EventName != "timer") 
+                if (m_StateChangeInProgress && data.EventName != "timer")
                     return;
 
                 if (EventQueue.Count >= m_MaxScriptQueue)
@@ -784,7 +784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     return 0;
 
                 ExecutionTimer.Restart();
-                
+
                 try
                 {
                     return EventProcessorInt();
@@ -927,7 +927,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
                                 if(e.InnerException != null && e.InnerException is ScriptException)
                                 {
-                                    string text = e.InnerException.Message + 
+                                    string text = e.InnerException.Message +
                                                 "(script: " + ScriptName +
                                                 " event: " + data.EventName +
                                                 " at " + Part.AbsolutePosition + ")";
@@ -945,10 +945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                         Part.UUID,
                                         Part.AbsolutePosition,
                                         Part.ParentGroup.Scene.Name));
-        
-                                }    
+
+                                }
                                 else
-                                {  
+                                {
 
                                     // DISPLAY ERROR INWORLD
                                     string text = FormatException(e);
@@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             return null;
         }
-        
+
         public override string ToString()
         {
             return String.Format("{0} {1} on {2}", ScriptName, ItemID, PrimName);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index 5b9794b..8138117 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             m_xEngine.DebugLevel = 1;
 
             IniConfigSource configSource = new IniConfigSource();
-            
+
             IConfig startupConfig = configSource.AddConfig("Startup");
             startupConfig.Set("DefaultScriptEngine", "XEngine");
 
@@ -124,9 +124,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         llSay(0, ""Thin Lizzy"");
@@ -143,12 +143,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
-        integer i = 0;        
+        integer i = 0;
         for (i = 0; i <= 1; i++) llSay(0, ""Iter "" + (string)i);
     }
 }";
@@ -162,14 +162,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
-        
+
         for (i = 0; i < 2147483647; i++) llSay(0, ""Iter "" + (string)i);
     }
 }";
@@ -183,15 +183,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
-        
-        for (i = 0; i < 2147483647; i++) 
+
+        for (i = 0; i < 2147483647; i++)
         {
             llSay(0, ""Iter "" + (string)i);
         }
@@ -207,12 +207,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
-        integer i = 0;        
+        integer i = 0;
         while (i < 2) llSay(0, ""Iter "" + (string)i++);
     }
 }";
@@ -226,15 +226,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
 
-        while (1 == 1)        
+        while (1 == 1)
             llSay(0, ""Iter "" + (string)i++);
     }
 }";
@@ -248,15 +248,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
 
-        while (1 == 1) 
+        while (1 == 1)
         {
             llSay(0, ""Iter "" + (string)i++);
         }
@@ -272,9 +272,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
@@ -293,9 +293,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
@@ -315,15 +315,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
 
-        do 
+        do
         {
             llSay(0, ""Iter "" + (string)i++);
         } while (1 == 1);
@@ -339,15 +339,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
             TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
         llSay(0, ""Thin Lizzy"");
 
-        @p1;      
+        @p1;
         llSay(0, ""Iter "" + (string)i++);
         jump p1;
     }
@@ -364,7 +364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"
 integer i = 0;
 
@@ -375,7 +375,7 @@ ufn1()
 }
 
 default
-{    
+{
     state_entry()
     {
         integer i = 0;
@@ -396,9 +396,9 @@ default
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            string script = 
+            string script =
 @"default
-{    
+{
     state_entry()
     {
         integer i = 0;
@@ -417,7 +417,7 @@ default
 //            UUID objectId = TestHelpers.ParseTail(0x100);
 //            UUID itemId = TestHelpers.ParseTail(0x3);
 
-            SceneObjectGroup so 
+            SceneObjectGroup so
                 = SceneHelpers.CreateSceneObject(1, userId, string.Format("Object for {0}", itemName), 0x100);
             m_scene.AddNewSceneObject(so, true);
 
@@ -505,7 +505,7 @@ default
 
             if (++m_chatMessagesReceived >= m_chatMessagesThreshold)
             {
-                m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld;            
+                m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
                 m_chatEvent.Set();
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 738a814..f16fd01 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     return false;
                 }
             }
-            
+
             public static bool operator true(key k)
             {
                 return (Boolean)k;
@@ -1575,7 +1575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 string s = String.Format(Culture.FormatProvider, "{0:0.000000}", f.value);
                 m_string = s;
             }
-            
+
             public LSLString(int i)
             {
                 string s = String.Format("{0}", i);
@@ -1583,7 +1583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             }
 
             public LSLString(LSLInteger i) : this(i.value) {}
-            
+
             #endregion
 
             #region Operators
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             {
                 return new LSLString(d);
             }
-            
+
             static public explicit operator LSLString(int i)
             {
                 return new LSLString(i);
@@ -1936,7 +1936,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                         return false;
                     }
                 }
-                
+
                 return value == ((LSLInteger)o).value;
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
index d08b0a6..a5362a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Region.ScriptEngine.Shared")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
index 30dc4cd..4dc8fc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         public void TearDown()
         {
             MainServer.Instance.Stop();
-        }       
+        }
 
         [Test]
         public void TestLlReleaseUrl()
@@ -204,8 +204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 // Check that request to URL works.
                 string testResponse = "Hello World";
 
-                m_engine.ClearPostedEvents();                
-                m_engine.PostEventHook 
+                m_engine.ClearPostedEvents();
+                m_engine.PostEventHook
                     += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
 
 //                Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index 9b7cab2..d652b0d1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 // Item has copy permissions so original should stay intact.
                 List<TaskInventoryItem> originalItems = so1.RootPart.Inventory.GetInventoryItems();
                 Assert.That(originalItems.Count, Is.EqualTo(1));
-    
+
                 // Should now have copied.
                 List<TaskInventoryItem> copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName);
                 Assert.That(copiedItems.Count, Is.EqualTo(1));
@@ -194,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             api.llGiveInventory(user2Id.ToString(), inventoryItemName);
 
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(
                     m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
 
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Create an object embedded inside the first
             UUID itemId = TestHelpers.ParseTail(0x20);
-            TaskInventoryItem tii 
+            TaskInventoryItem tii
                 = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
             tii.NextPermissions &= ~((uint)PermissionMask.Modify);
 
@@ -230,7 +230,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             api.llGiveInventory(user2Id.ToString(), inventoryItemName);
 
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(
                     m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
index 14b1890..435a95f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TaskInventoryItem grp1Item
                 = TaskInventoryHelpers.AddNotecard(
                     m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
-            
+
             grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
 
             LSL_Api apiGrp1 = new LSL_Api();
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TaskInventoryItem grp1Item
                 = TaskInventoryHelpers.AddNotecard(
                     m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
-            
+
             grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
 
             LSL_Api apiGrp1 = new LSL_Api();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
index 34a29e6..f978138 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenMetaverse;
- 
+
 using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
 using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
 using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_lslApi = new LSL_Api();
             m_lslApi.Initialize(engine, part, null);
         }
- 
+
         [Test]
         public void TestllListFindList()
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index 9ab3115..a341311 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             string[] ncLines = { "One", "Twoè", "Three" };
 
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
 
             AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]);
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         {
             string key = m_lslApi.llGetNotecardLine(ncName, lineNumber);
             Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString()));
-        
+
             Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1));
             Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID));
 
@@ -223,8 +223,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //                // Check that request to URL works.
 //                string testResponse = "Hello World";
 //
-//                m_engine.ClearPostedEvents();                
-//                m_engine.PostEventHook 
+//                m_engine.ClearPostedEvents();
+//                m_engine.PostEventHook
 //                    += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
 //
 ////                Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index d957bf2..b994901 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Check simple 1 prim case
             {
-                LSL_List resList 
+                LSL_List resList
                     = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
 
                 Assert.That(resList.Length, Is.EqualTo(1));
@@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Check 2 prim case
             {
-                LSL_List resList 
+                LSL_List resList
                     = apiGrp1.llGetLinkPrimitiveParams(
-                        1, 
+                        1,
                         new LSL_List(
-                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
                             new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
                             new LSL_Integer(2),
                             new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Check invalid parameters are ignored
             {
-                LSL_List resList 
+                LSL_List resList
                     = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
 
                 Assert.That(resList.Length, Is.EqualTo(0));
@@ -123,11 +123,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Check all parameters are ignored if an initial bad link is given
             {
-                LSL_List resList 
+                LSL_List resList
                     = apiGrp1.llGetLinkPrimitiveParams(
-                        3, 
+                        3,
                         new LSL_List(
-                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
                             new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
                             new LSL_Integer(1),
                             new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -137,11 +137,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Check only subsequent parameters are ignored when we hit the first bad link number
             {
-                LSL_List resList 
+                LSL_List resList
                     = apiGrp1.llGetLinkPrimitiveParams(
-                        1, 
+                        1,
                         new LSL_List(
-                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
                             new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
                             new LSL_Integer(3),
                             new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
                 0.90f,                                      // Prim hollow
                 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
-                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper
                 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
                 0.90f);                                     // Prim hollow check
 
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
                 0.99f,                                      // Prim hollow
                 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d),    // Prim twist
-                new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper
                 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
                 0.99f);                                     // Prim hollow check
 
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d),     // Prim twist
                 // Expression for y selected to test precision problems during sbyte
                 // cast in SetPrimitiveShapeParams.
-                new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d),   // Prim taper 
+                new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d),   // Prim taper
                 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
                 0.70f);                                     // Prim hollow check
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index d929da8..98800d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -88,19 +88,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             CheckllAngleBetween(new Vector3(1, 1, 1), 0,   1, 1);
             CheckllAngleBetween(new Vector3(1, 1, 1), 90,  1, 1);
             CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1);
-            
+
             CheckllAngleBetween(new Vector3(1, 0, 0), 0,   1.6f, 1.8f);
             CheckllAngleBetween(new Vector3(1, 0, 0), 90,  0.3f, 3.9f);
             CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f);
-            
+
             CheckllAngleBetween(new Vector3(0, 1, 0), 0,   9.8f, -9.4f);
             CheckllAngleBetween(new Vector3(0, 1, 0), 90,  8.4f, -8.2f);
             CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f);
-            
+
             CheckllAngleBetween(new Vector3(0, 0, 1), 0,   -6.8f, 3.4f);
             CheckllAngleBetween(new Vector3(0, 0, 1), 90,  -3.6f, 5.6f);
             CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f);
-            
+
             CheckllAngleBetween(new Vector3(1, 1, 1), 0,   -7.7f, -2.0f);
             CheckllAngleBetween(new Vector3(1, 1, 1), 90,  -3.0f, -9.1f);
             CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f);
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc);
             // Multiple original quaternion by conjugate of quaternion calculated with angles.
             LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s);
-            
+
             Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail");
             Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail");
             Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
index c8c7f82..b2396fa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_stringDoubleSet.Add("1ef", 1.0);
             m_stringDoubleSet.Add("e10", 0.0);
             m_stringDoubleSet.Add("1.e0.0", 1.0);
- 
+
             m_doubleStringSet = new Dictionary<double, string>();
             m_doubleStringSet.Add(2.0, "2.000000");
             m_doubleStringSet.Add(-2.0, "-2.000000");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
index c664108..2bd684f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         public void TestImplicitCastBooleanToLSLInteger()
         {
             TestHelpers.InMethod();
-            
+
             LSL_Types.LSLInteger testInteger;
 
             testInteger = (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
index 8550f2d..0159b9e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         public void TestImplicitCastBooleanToLSLFloat()
         {
             TestHelpers.InMethod();
-            
+
             LSL_Types.LSLString testString;
 
             testString = (LSL_Types.LSLString) (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 99bff83..6936191 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             string npcRaw
                 = osslApi.osNpcCreate(
                     "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED);
-            
+
             otherOsslApi.osNpcRemove(npcRaw);
 
             // Should still be around
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             string npcRaw
                 = osslApi.osNpcCreate(
                     "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED);
-            
+
             osslApi.osNpcRemove(npcRaw);
 
             UUID npcId = new UUID(npcRaw);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
index f4211c8..80d9e2a 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.ScriptBase
         /// <summary>
         /// Used for script sleeps when we are using co-operative script termination.
         /// </summary>
-        /// <remarks>null if co-operative script termination is not active</remarks>  
+        /// <remarks>null if co-operative script termination is not active</remarks>
         WaitHandle m_coopSleepHandle;
 
         public XEngineScriptBase(WaitHandle coopSleepHandle) : base()
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 301eada..55a77bc 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         }
 
         /// <summary>
-        /// When an object gets paid by an avatar and generates the paid event, 
+        /// When an object gets paid by an avatar and generates the paid event,
         /// this will pipe it to the script engine
         /// </summary>
         /// <param name="objectID">Object ID that got paid</param>
@@ -413,7 +413,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return;
 
             foreach(SceneObjectPart part in grp.Parts)
-            { 
+            {
                 myScriptEngine.PostObjectEvent(part.LocalId, new EventParams(
                     "attach",new object[] {
                     new LSL_Types.LSLString(avatar.ToString()) },
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index a2b030d..b3fedcb 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/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.Region.ScriptEngine.XEngine")]
@@ -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/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
index 878e571..71ef0ac 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
             m_xEngine = new XEngine();
 
             IniConfigSource configSource = new IniConfigSource();
-            
+
             IConfig startupConfig = configSource.AddConfig("Startup");
             startupConfig.Set("DefaultScriptEngine", "XEngine");
 
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
index c977285..477059f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
@@ -126,11 +126,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
             OSChatMessage messageReceived = null;
             sceneA.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); };
 
-            sceneA.RezNewScript(userId, scriptItemSceneA, 
+            sceneA.RezNewScript(userId, scriptItemSceneA,
 @"integer c = 0;
 
 default
-{    
+{
     state_entry()
     {
         llSay(0, ""Script running"");
@@ -143,7 +143,7 @@ default
 
     touch_start(integer n)
     {
-        c = c + 1; 
+        c = c + 1;
         llSay(0, (string)c);
     }
 }");
@@ -151,7 +151,7 @@ default
             chatEvent.WaitOne(60000);
 
             Assert.That(messageReceived, Is.Not.Null, "No chat message received.");
-            Assert.That(messageReceived.Message, Is.EqualTo("Script running"));           
+            Assert.That(messageReceived.Message, Is.EqualTo("Script running"));
 
             {
                 // XXX: Should not be doing this so directly.  Should call some variant of EventManager.touch() instead.
@@ -167,7 +167,7 @@ default
                 xEngineA.PostObjectEvent(soSceneA.LocalId, ep);
                 chatEvent.WaitOne(60000);
 
-                Assert.That(messageReceived.Message, Is.EqualTo("1")); 
+                Assert.That(messageReceived.Message, Is.EqualTo("1"));
             }
 
             AutoResetEvent chatEventB = new AutoResetEvent(false);
@@ -181,7 +181,7 @@ default
             chatEventB.WaitOne(60000);
             Assert.That(messageReceived, Is.Not.Null, "No Changed message received.");
             Assert.That(messageReceived.Message, Is.Not.Null, "Changed message without content");
-            Assert.That(messageReceived.Message, Is.EqualTo("Changed")); 
+            Assert.That(messageReceived.Message, Is.EqualTo("Changed"));
 
             // TEST sending event to moved prim and output
             {
@@ -202,7 +202,7 @@ default
                 xEngineB.PostObjectEvent(soSceneB.LocalId, ep);
                 chatEventB.WaitOne(60000);
 
-                Assert.That(messageReceived.Message, Is.EqualTo("2")); 
+                Assert.That(messageReceived.Message, Is.EqualTo("2"));
             }
         }
     }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7822df9..cd5308d 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -131,9 +131,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// It appears that if a script thread is aborted whilst it is holding ReaderWriterLockSlim (possibly the write
         /// lock) then the lock is not properly released.  This causes mono 2.6, 2.10 and possibly
         /// later to crash, sometimes with symptoms such as a leap to 100% script usage and a vm thead dump showing
-        /// all threads waiting on release of ReaderWriterLockSlim write thread which none of the threads listed 
+        /// all threads waiting on release of ReaderWriterLockSlim write thread which none of the threads listed
         /// actually hold.
-        /// 
+        ///
         /// Pausing for event completion reduces the risk of this happening.  However, it may be that aborting threads
         /// is not a mono issue per se but rather a risky activity in itself in an AppDomain that is not immediately
         /// shutting down.
@@ -307,7 +307,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_EventLimit = m_ScriptConfig.GetInt("EventLimit", 30);
             m_KillTimedOutScripts = m_ScriptConfig.GetBoolean("KillTimedOutScripts", false);
             m_SaveTime = m_ScriptConfig.GetInt("SaveInterval", 120) * 1000;
-            m_WaitForEventCompletionOnScriptStop 
+            m_WaitForEventCompletionOnScriptStop
                 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop);
 
             m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
@@ -507,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             {
                 string rawItemId;
                 UUID itemId = UUID.Zero;
-    
+
                 if (cmdparams.Length == 2)
                 {
                     IEnumerable<IScriptInstance> scripts = m_Scripts.Values;
@@ -520,17 +520,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     return;
                 }
-    
+
                 for (int i = 2; i < cmdparams.Length; i++)
                 {
                     rawItemId = cmdparams[i];
-        
+
                     if (!UUID.TryParse(rawItemId, out itemId))
                     {
                         MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid UUID", rawItemId);
                         continue;
                     }
-        
+
                     if (itemId != UUID.Zero)
                     {
                         IScriptInstance instance = GetInstance(itemId);
@@ -816,7 +816,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             if (!m_Enabled)
                 return;
-            
+
             lock (m_ScriptEngines)
             {
                 if (m_ScriptEngines.Contains(this))
@@ -978,14 +978,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                 SceneObjectPart part =
                                         m_Scene.GetSceneObjectPart(
                                         localID);
-                             
+
                                 TaskInventoryItem item =
                                         part.Inventory.GetInventoryItem(itemID);
-    
-                                ScenePresence presence = 
+
+                                ScenePresence presence =
                                         m_Scene.GetScenePresence(
                                         item.OwnerID);
-    
+
                                 if (presence != null)
                                 {
                                    presence.ControllingClient.SendAgentAlertMessage(
@@ -1073,8 +1073,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     {
                         m_log.Error(
                             string.Format(
-                                "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}.  Continuing.  Exception  ", 
-                                o[1], m_Scene.Name), 
+                                "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}.  Continuing.  Exception  ",
+                                o[1], m_Scene.Name),
                             e);
                     }
                 }
@@ -1091,7 +1091,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
             finally
             {
-                // FIXME: On failure we must trigger this even if the compile queue is not actually empty so that the 
+                // FIXME: On failure we must trigger this even if the compile queue is not actually empty so that the
                 // RegionReadyModule is not forever waiting.  This event really needs a different name.
                 m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
                                                                     m_ScriptErrorMessage);
@@ -1108,8 +1108,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 {
                     m_CurrentCompile = null;
 
-                    // This is to avoid a situation where the m_CompileQueue while loop above could complete but 
-                    // OnRezScript() place a new script on the queue and check m_CurrentCompile = null before we hit 
+                    // This is to avoid a situation where the m_CompileQueue while loop above could complete but
+                    // OnRezScript() place a new script on the queue and check m_CurrentCompile = null before we hit
                     // this section.
                     if (m_CompileQueue.Count > 0)
                         m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null);
@@ -1186,7 +1186,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assemblyPath, out linemap);
 
 //                        m_log.DebugFormat(
-//                            "[XENGINE]: Found assembly path {0} onrez {1} in {2}", 
+//                            "[XENGINE]: Found assembly path {0} onrez {1} in {2}",
 //                            assemblyPath, item.ItemID, World.Name);
 
                         if (!m_AddingAssemblies.ContainsKey(assemblyPath)) {
@@ -1239,7 +1239,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 catch (Exception e)
                 {
 //                    m_log.ErrorFormat(
-//                        "[XEngine]: Exception when rezzing script with item ID {0}, {1}{2}", 
+//                        "[XEngine]: Exception when rezzing script with item ID {0}, {1}{2}",
 //                        itemID, e.Message, e.StackTrace);
 
     //                try
@@ -1280,7 +1280,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
             // optionaly do not load a assembly on top of a lot of to release memory
-            // only if logins disable since causes a lot of rubber banding            
+            // only if logins disable since causes a lot of rubber banding
             if(m_CompactMemOnLoad && !m_Scene.LoginsEnabled)
                 GC.Collect(2);
 
@@ -1323,7 +1323,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             {
                                 sandbox = AppDomain.CurrentDomain;
                             }
-                            
+
                             //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
                             //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
                             //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
@@ -1331,7 +1331,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
                             //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
                             //sandbox.SetAppDomainPolicy(sandboxPolicy);
-                            
+
                             m_AppDomains[appDomain] = sandbox;
 
                             m_DomainScripts[appDomain] = new List<UUID>();
@@ -1341,7 +1341,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
                             m_ScriptErrorMessage += "Exception creating app domain:\n";
                             m_ScriptFailCount++;
-                            lock (m_AddingAssemblies) 
+                            lock (m_AddingAssemblies)
                             {
                                 m_AddingAssemblies[assemblyPath]--;
                             }
@@ -1364,14 +1364,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         {
                             coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
 
-                            scriptObj 
+                            scriptObj
                                 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
                                     assemblyName.FullName,
                                     "SecondLife.XEngineScript",
                                     false,
                                     BindingFlags.Default,
                                     null,
-                                    new object[] { coopSleepHandle }, 
+                                    new object[] { coopSleepHandle },
                                     null,
                                     null);
 
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                             try
                             {
-                                scriptObj 
+                                scriptObj
                                     = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
                                         assemblyName.FullName,
                                         "SecondLife.Script",
@@ -1398,7 +1398,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             {
                                 m_log.Error(
                                     string.Format(
-                                        "[XENGINE]: Could not load previous SecondLife.Script from assembly {0} in {1}.  Not starting.  Exception  ", 
+                                        "[XENGINE]: Could not load previous SecondLife.Script from assembly {0} in {1}.  Not starting.  Exception  ",
                                         assemblyName.FullName, World.Name),
                                     e2);
 
@@ -1412,7 +1412,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     {
                         try
                         {
-                            scriptObj 
+                            scriptObj
                                 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
                                     assemblyName.FullName,
                                     "SecondLife.Script",
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                             try
                             {
-                                scriptObj 
+                                scriptObj
                                     = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
                                         assemblyName.FullName,
                                         "SecondLife.XEngineScript",
@@ -1447,7 +1447,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             {
                                 m_log.Error(
                                     string.Format(
-                                        "[XENGINE]: Could not load previous SecondLife.XEngineScript from assembly {0} in {1}.  Not starting.  Exception  ", 
+                                        "[XENGINE]: Could not load previous SecondLife.XEngineScript from assembly {0} in {1}.  Not starting.  Exception  ",
                                         assemblyName.FullName, World.Name),
                                     e2);
 
@@ -1509,7 +1509,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
 
-            lock (m_AddingAssemblies) 
+            lock (m_AddingAssemblies)
             {
                 if (!m_Assemblies.ContainsKey(assetID))
                     m_Assemblies[assetID] = assemblyPath;
@@ -1517,7 +1517,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_AddingAssemblies[assemblyPath]--;
             }
 
-            if (instance != null) 
+            if (instance != null)
                 instance.Init();
 
             bool runIt;
@@ -1570,7 +1570,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
             if (instance.StatePersistedHere)
-                instance.RemoveState(); 
+                instance.RemoveState();
 
             instance.DestroyScriptInstance();
 
@@ -1622,20 +1622,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     // Do not remove assembly files if another instance of the script
                     // is currently initialising
                     if (!m_AddingAssemblies.ContainsKey(m_Assemblies[assetID])
-                        || m_AddingAssemblies[m_Assemblies[assetID]] == 0) 
+                        || m_AddingAssemblies[m_Assemblies[assetID]] == 0)
                     {
 //                        m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]);
                         try
                         {
                             if (File.Exists(m_Assemblies[assetID]))
                                 File.Delete(m_Assemblies[assetID]);
-                            
+
                             if (File.Exists(m_Assemblies[assetID]+".text"))
                                 File.Delete(m_Assemblies[assetID]+".text");
-                            
+
                             if (File.Exists(m_Assemblies[assetID]+".mdb"))
                                 File.Delete(m_Assemblies[assetID]+".mdb");
-                            
+
                             if (File.Exists(m_Assemblies[assetID]+".map"))
                                 File.Delete(m_Assemblies[assetID]+".map");
                         }
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                      new WorkItemCallback(this.ProcessEventHandler),
                                      parms));
         }
-        
+
         /// <summary>
         /// Process a previously posted script event.
         /// </summary>
@@ -1703,7 +1703,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             Culture.SetCurrentCulture();
 
             IScriptInstance instance = (ScriptInstance) parms;
-            
+
 //            m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
 
             return instance.EventProcessor();
@@ -1736,7 +1736,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             instance = m_Scripts[itemID];
                     }
                     catch { /* ignore race conditions */ }
-    
+
                     if (instance != null)
                     {
                         instance.PostEvent(p);
@@ -1744,7 +1744,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     }
                 }
             }
-            
+
             return result;
         }
 
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
index 9d9dee1..ede8ef3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public bool Wait(int t)
         {
             // We use the integer version of WaitAll because the current version of SmartThreadPool has a bug with the
-            // TimeSpan version.  The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an 
+            // TimeSpan version.  The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an
             // int (32-bit) we can end up with bad values.  This occurs on Windows though curiously not on Mono 2.10.8
             // (or very likely other versions of Mono at least up until 3.0.3).
             return SmartThreadPool.WaitAll(new IWorkItemResult[] {wr}, t, false);
diff --git a/OpenSim/Server/Base/CommandManager.cs b/OpenSim/Server/Base/CommandManager.cs
index bd18485..b6e2903 100644
--- a/OpenSim/Server/Base/CommandManager.cs
+++ b/OpenSim/Server/Base/CommandManager.cs
@@ -41,117 +41,117 @@ namespace OpenSim.Server.Base
 {
     /// <summary>
     /// Command manager -
-    /// Wrapper for OpenSim.Framework.PluginManager to allow 
+    /// Wrapper for OpenSim.Framework.PluginManager to allow
     /// us to add commands to the console to perform operations
     /// on our repos and plugins
     /// </summary>
-        public class CommandManager
-        {
-                public AddinRegistry PluginRegistry;
-                protected PluginManager PluginManager;
+    public class CommandManager
+    {
+        public AddinRegistry PluginRegistry;
+        protected PluginManager PluginManager;
 
-                public CommandManager(AddinRegistry registry)
+        public CommandManager(AddinRegistry registry)
         {
-                        PluginRegistry = registry;
-                        PluginManager = new PluginManager(PluginRegistry);
-                        AddManagementCommands();
-                }
-
-                private void AddManagementCommands()
-                {
-                        // add plugin
-                        MainConsole.Instance.Commands.AddCommand("Plugin", true,
+            PluginRegistry = registry;
+            PluginManager = new PluginManager(PluginRegistry);
+            AddManagementCommands();
+        }
+
+        private void AddManagementCommands()
+        {
+            // add plugin
+            MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin add", "plugin add \"plugin index\"",
-                                                                 "Install plugin from repository.",
+                                                     "Install plugin from repository.",
                                                      HandleConsoleInstallPlugin);
 
-                        // remove plugin
+            // remove plugin
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin remove", "plugin remove \"plugin index\"",
-                                                                 "Remove plugin from repository",
+                                                     "Remove plugin from repository",
                                                      HandleConsoleUnInstallPlugin);
 
-                        // list installed plugins
+            // list installed plugins
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
-                                                     "plugin list installed", 
-                                                                 "plugin list installed","List install plugins",
+                                                     "plugin list installed",
+                                                     "plugin list installed","List install plugins",
                                                      HandleConsoleListInstalledPlugin);
 
-                        // list plugins available from registered repositories
+            // list plugins available from registered repositories
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin list available",
-                                                                 "plugin list available","List available plugins",
+                                                     "plugin list available","List available plugins",
                                                      HandleConsoleListAvailablePlugin);
-                        // List available updates
+            // List available updates
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin updates", "plugin updates","List availble updates",
                                                      HandleConsoleListUpdates);
 
-                        // Update plugin
+            // Update plugin
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin update", "plugin update \"plugin index\"","Update the plugin",
                                                      HandleConsoleUpdatePlugin);
 
-                        // Add repository
+            // Add repository
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo add", "repo add \"url\"","Add repository",
                                                      HandleConsoleAddRepo);
 
-                        // Refresh repo
+            // Refresh repo
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo refresh", "repo refresh \"url\"", "Sync with a registered repository",
                                                      HandleConsoleGetRepo);
 
-                        // Remove repository from registry
+            // Remove repository from registry
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo remove",
-                                                                 "repo remove \"[url | index]\"",
-                                                                 "Remove repository from registry",
+                                                     "repo remove \"[url | index]\"",
+                                                     "Remove repository from registry",
                                                      HandleConsoleRemoveRepo);
 
-                        // Enable repo
+            // Enable repo
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo enable", "repo enable \"[url | index]\"",
-                                                                 "Enable registered repository",
+                                                     "Enable registered repository",
                                                      HandleConsoleEnableRepo);
 
-                        // Disable repo
+            // Disable repo
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo disable", "repo disable\"[url | index]\"",
-                                                                 "Disable registered repository",
+                                                     "Disable registered repository",
                                                      HandleConsoleDisableRepo);
 
-                        // List registered repositories
+            // List registered repositories
             MainConsole.Instance.Commands.AddCommand("Repository", true,
                                                      "repo list", "repo list",
-                                                                 "List registered repositories",
+                                                     "List registered repositories",
                                                      HandleConsoleListRepos);
 
-                        // *
+            // *
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin info", "plugin info \"plugin index\"","Show detailed information for plugin",
                                                      HandleConsoleShowAddinInfo);
 
-                        // Plugin disable
+            // Plugin disable
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin disable", "plugin disable \"plugin index\"",
-                                                                 "Disable a plugin",
+                                                     "Disable a plugin",
                                                      HandleConsoleDisablePlugin);
 
-                        // Enable plugin
+            // Enable plugin
             MainConsole.Instance.Commands.AddCommand("Plugin", true,
                                                      "plugin enable", "plugin enable \"plugin index\"",
-                                                                 "Enable the selected plugin plugin",
+                                                     "Enable the selected plugin plugin",
                                                      HandleConsoleEnablePlugin);
         }
-                
+
         #region console handlers
         // Handle our console commands
         //
         // Install plugin from registered repository
         /// <summary>
         /// Handles the console install plugin command. Attempts to install the selected plugin
-        /// and 
+        /// and
         /// </summary>
         /// <param name='module'>
         /// Module.
@@ -323,7 +323,7 @@ namespace OpenSim.Server.Base
         {
             if (cmd.Length >= 3)
             {
-                
+
                 Dictionary<string, object> result = new Dictionary<string, object>();
 
                 int ndx = Convert.ToInt16(cmd[2]);
@@ -355,5 +355,5 @@ namespace OpenSim.Server.Base
             return;
         }
         #endregion
-        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 42a8c57..3357250 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Server.Base
             MainServer.Instance = httpServer;
 
             // If https_listener = true, then add an ssl listener on the https_port...
-            if (ssl_listener == true) 
+            if (ssl_listener == true)
             {
                 uint https_port = (uint)networkConfig.GetInt("https_port", 0);
 
diff --git a/OpenSim/Server/Base/Properties/AssemblyInfo.cs b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
index 02931e7..4be0f25 100644
--- a/OpenSim/Server/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Server.Base")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Server/Base/ProtocolVersions.cs b/OpenSim/Server/Base/ProtocolVersions.cs
index 5c2278c..27eed4c 100644
--- a/OpenSim/Server/Base/ProtocolVersions.cs
+++ b/OpenSim/Server/Base/ProtocolVersions.cs
@@ -31,20 +31,20 @@ namespace OpenSim.Server.Base
     {
         /// <value>
         /// This is the external protocol versions.  It is separate from the OpenSimulator project version.
-        /// 
+        ///
         /// These version numbers should be increased by 1 every time a code
-        /// change in the Service.Connectors and Server.Handlers, espectively, 
+        /// change in the Service.Connectors and Server.Handlers, espectively,
         /// makes the previous OpenSimulator revision incompatible
-        /// with the new revision. 
-        /// 
+        /// with the new revision.
+        ///
         /// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
         /// but not outright failure) do not need a version number increment.
-        /// 
+        ///
         /// Having this version number allows the grid service to reject connections from regions running a version
-        /// of the code that is too old. 
+        /// of the code that is too old.
         ///
         /// </value>
-        
+
         // The range of acceptable servers for client-side connectors
         public readonly static int ClientProtocolVersionMin = 1;
         public readonly static int ClientProtocolVersionMax = 1;
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 57d0a8d..b17d7ba 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Server.Base
         // libomv, which has a hard-coded path to "." for pinvoke
         // to load the openjpeg dll
         //
-        // Will look for a way to fix, but for now this keeps the 
+        // Will look for a way to fix, but for now this keeps the
         // confusion to a minimum. this was copied from our region
         // plugin loader, we have been doing this in there for a long time.
         //
@@ -183,7 +183,7 @@ namespace OpenSim.Server.Base
 
             if(port != 0)
                 server = MainServer.GetHttpServer(port);
-            else    
+            else
                 server = MainServer.Instance;
 
             return server;
@@ -222,19 +222,19 @@ namespace OpenSim.Server.Base
             // This is good to debug configuration problems
             //if (dllName == string.Empty)
             //    Util.PrintCallStack();
-            
+
             string className = String.Empty;
 
             // The path for a dynamic plugin will contain ":" on Windows
             string[] parts = dllName.Split (new char[] {':'});
 
-            if (parts [0].Length > 1) 
+            if (parts [0].Length > 1)
             {
                 dllName = parts [0];
                 if (parts.Length > 1)
                     className = parts[1];
-            } 
-            else 
+            }
+            else
             {
                 // This is Windows - we must replace the ":" in the path
                 dllName = String.Format ("{0}:{1}", parts [0], parts [1]);
@@ -242,17 +242,17 @@ namespace OpenSim.Server.Base
                     className = parts[2];
             }
 
-                        // Handle extra string arguments in a more generic way
-                        if (dllName.Contains("@"))
-                        {
-                                string[] dllNameParts = dllName.Split(new char[] {'@'});
-                                dllName = dllNameParts[dllNameParts.Length - 1];
-                                List<Object> argList = new List<Object>(args);
-                                for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i)
-                                        argList.Add(dllNameParts[i]);
+            // Handle extra string arguments in a more generic way
+            if (dllName.Contains("@"))
+            {
+                string[] dllNameParts = dllName.Split(new char[] {'@'});
+                dllName = dllNameParts[dllNameParts.Length - 1];
+                List<Object> argList = new List<Object>(args);
+                for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i)
+                    argList.Add(dllNameParts[i]);
 
-                                args = argList.ToArray();
-                        }
+                args = argList.ToArray();
+            }
 
             return LoadPlugin<T>(dllName, className, args);
         }
@@ -276,10 +276,10 @@ namespace OpenSim.Server.Base
                 {
                     if (pluginType.IsPublic)
                     {
-                        if (className != String.Empty 
+                        if (className != String.Empty
                             && pluginType.ToString() != pluginType.Namespace + "." + className)
                             continue;
-                        
+
                         Type typeInterface = pluginType.GetInterface(interfaceName);
 
                         if (typeInterface != null)
@@ -295,8 +295,8 @@ namespace OpenSim.Server.Base
                                 if (!(e is System.MissingMethodException))
                                 {
                                     m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}",
-                                        interfaceName, 
-                                        dllName, 
+                                        interfaceName,
+                                        dllName,
                                         e.InnerException == null ? e.Message : e.InnerException.Message),
                                             e);
                                 }
@@ -479,7 +479,7 @@ namespace OpenSim.Server.Base
             XmlDocument doc = new XmlDocument();
 
             doc.LoadXml(data);
-            
+
             XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse");
 
             if (rootL.Count != 1)
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index e18594f..f60b5fb 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Server.Base
 
                 // Check if a prompt was given on the command line
                 prompt = startupConfig.GetString("prompt", prompt);
-                
+
                 // Check for a Log4Net config file on the command line
                 logConfig =startupConfig.GetString("logconfig", logConfig);
             }
@@ -116,7 +116,7 @@ namespace OpenSim.Server.Base
             // Merge OpSys env vars
             Console.WriteLine("[CONFIG]: Loading environment variables for Config");
             Util.MergeEnvironmentToConfig(Config);
-            
+
             // Merge the configuration from the command line into the loaded file
             Config.Merge(argvConfig);
 
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index ab81dd6..bad3ea2 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -151,27 +151,27 @@ namespace OpenSim.Server.Handlers.Asset
                 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
                 return;
             }
-            
+
             AssetBase asset = m_AssetService.Get(assetId.ToString());
             if (asset == null)
-            {                
+            {
                 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
-                return;                
+                return;
             }
-            
+
             string fileName = rawAssetId;
 
             if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
                 return;
-            
+
             using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
             {
                 using (BinaryWriter bw = new BinaryWriter(fs))
                 {
                     bw.Write(asset.Data);
                 }
-            }   
-            
+            }
+
             MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
         }
 
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 91c5c54..8bfc690 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Asset
         public AssetServerGetHandler(IAssetService service) :
                 base("GET", "/assets")
         {
-            m_AssetService = service; 
+            m_AssetService = service;
         }
 
         public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) :
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset
                 httpResponse.ContentType = "text/plain";
                 result = new byte[0];
             }
-            
+
             if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id))
             {
                 httpResponse.StatusCode = (int)HttpStatusCode.Redirect;
diff --git a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
index faa6fb7..4d2228a 100644
--- a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
+++ b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Server.Handlers.Asset.Test
 
             UUID assetId = TestHelpers.ParseTail(0x1);
 
-            IConfigSource config = new IniConfigSource();         
-            config.AddConfig("AssetService");           
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("AssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             AssetService assetService = new AssetService(config);
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Asset.Test
                 XmlSerializer serializer = new XmlSerializer(typeof(AssetBase));
                 serializer.Serialize(writer, asset);
                 writer.Flush();
-            }            
+            }
 
             buffer.Position = 0;
             asph.Handle(null, buffer, null, null);
@@ -87,13 +87,13 @@ namespace OpenSim.Server.Handlers.Asset.Test
         {
             TestHelpers.InMethod();
 
-            IConfigSource config = new IniConfigSource();         
-            config.AddConfig("AssetService");           
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("AssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             AssetService assetService = new AssetService(config);
 
-            AssetServerPostHandler asph = new AssetServerPostHandler(assetService);          
+            AssetServerPostHandler asph = new AssetServerPostHandler(assetService);
 
             MemoryStream buffer = new MemoryStream();
             byte[] badData = new byte[] { 0x48, 0x65, 0x6c, 0x6c, 0x6f };
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 6ee98b3..d3ea7e2 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -132,41 +132,41 @@ namespace OpenSim.Server.Handlers.Authentication
                 case "authenticate":
                     if (!request.ContainsKey("PASSWORD"))
                         return FailureResult();
-                    
+
                     token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime);
-    
+
                     if (token != String.Empty)
                         return SuccessResult(token);
                     return FailureResult();
-    
+
                 case "setpassword":
                     if (!m_AllowSetPassword)
                         return FailureResult();
 
                     if (!request.ContainsKey("PASSWORD"))
                         return FailureResult();
-    
+
                     if (m_AuthenticationService.SetPassword(principalID, request["PASSWORD"].ToString()))
                         return SuccessResult();
                     else
                         return FailureResult();
-    
+
                 case "verify":
                     if (!request.ContainsKey("TOKEN"))
                         return FailureResult();
-                    
+
                     if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime))
                         return SuccessResult();
-    
+
                     return FailureResult();
-    
+
                 case "release":
                     if (!request.ContainsKey("TOKEN"))
                         return FailureResult();
-    
+
                     if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
                         return SuccessResult();
-    
+
                     return FailureResult();
 
                 case "getauthinfo":
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
index 6464399..ac8ff52 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Authentication
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
- 
+
         private IAuthenticationService m_AuthenticationService;
         private IUserAccountService m_UserAccountService;
         private string m_ConfigName = "OpenIdService";
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index b201dc7..a6605a1 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -178,14 +178,14 @@ namespace OpenSim.Server.Handlers.Authentication
 ";
 
         /// <summary>Page shown for an invalid OpenID identity</summary>
-        const string INVALID_OPENID_PAGE = 
+        const string INVALID_OPENID_PAGE =
 @"<html><head><title>Identity not found</title></head>
 <body>Invalid OpenID identity</body></html>";
 
         /// <summary>Page shown if the OpenID endpoint is requested directly</summary>
         const string ENDPOINT_PAGE =
 @"<html><head><title>OpenID Endpoint</title></head><body>
-This is an OpenID server endpoint, not a human-readable resource. 
+This is an OpenID server endpoint, not a human-readable resource.
 For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
 </body></html>";
 
@@ -241,7 +241,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
                             // Check for form POST data
                             if (passwordValues != null && passwordValues.Length == 1)
                             {
-                                if (account != null && 
+                                if (account != null &&
                                     (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty))
                                     authRequest.IsAuthenticated = true;
                                 else
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
index c9b4e9b..310a542 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Authorization
 
             xs = new XmlSerializer(typeof(AuthorizationResponse));
             return ServerUtils.SerializeResult(xs, result);
-            
+
         }
     }
 }
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index ff8699f..69c1a89 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Server.Handlers.Avatar
             request.Remove("METHOD");
             request.Remove("UserID");
         }
-        
+
         byte[] SetItems(Dictionary<string, object> request)
         {
             UUID user = UUID.Zero;
@@ -196,7 +196,7 @@ namespace OpenSim.Server.Handlers.Avatar
             names = _names.ToArray();
             List<string> _values = (List<string>)request["Values"];
             values = _values.ToArray();
-            
+
             if (m_AvatarService.SetItems(user, names, values))
                 return SuccessResult();
 
@@ -227,7 +227,7 @@ namespace OpenSim.Server.Handlers.Avatar
         }
 
 
-        
+
         private byte[] SuccessResult()
         {
             XmlDocument doc = new XmlDocument();
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
index 4c12967..4386a2d 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
                     ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args);
 
             IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
-            
+
             server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth));
             server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth));
         }
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs
index 72014db..0a4df54 100644
--- a/OpenSim/Server/Handlers/Base/ServerConnector.cs
+++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Base
 
         // We call this from our plugin module to get our configuration
         public IConfig GetConfig()
-        { 
+        {
             IConfig config = null;
             config = ServerUtils.GetConfig(ConfigFile, ConfigName);
 
@@ -96,12 +96,12 @@ namespace OpenSim.Server.Handlers.Base
 
         // We get our remote initial configuration for bootstrapping in case
         // we have no configuration in our main file or in an existing
-        // modular config file. This is the last resort to bootstrap the 
+        // modular config file. This is the last resort to bootstrap the
         // configuration, likely a new plugin loading for the first time.
         private IConfigSource GetConfigSource()
         {
             IConfigSource source = null;
-            
+
             source = ServerUtils.LoadInitialConfig(ConfigURL);
 
             if (source == null)
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index 346af32..2aec045 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -83,10 +83,10 @@ namespace OpenSim.Server.Handlers.Grid
                 {
                     _info["login"]
                         = String.Format(
-                            "http://127.0.0.1:{0}/", 
+                            "http://127.0.0.1:{0}/",
                             netCfg.GetString(
                                 "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
-                    
+
                     IssueWarning();
                 }
                 else
@@ -99,7 +99,7 @@ namespace OpenSim.Server.Handlers.Grid
             {
                 _log.Warn("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults");
             }
-            
+
             _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count);
         }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Server.Handlers.Grid
         {
             _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your configuration files");
             _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:");
-            
+
             foreach (string k in _info.Keys)
             {
                 _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]);
@@ -181,7 +181,7 @@ namespace OpenSim.Server.Handlers.Grid
                 new string[] { "Startup", "Hypergrid" }, String.Empty);
 
             if (!String.IsNullOrEmpty(HomeURI))
-                map["home"] = OSD.FromString(HomeURI); 
+                map["home"] = OSD.FromString(HomeURI);
             else // Legacy. Remove soon!
             {
                 IConfig cfg = m_Config.Configs["LoginService"];
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 38629b2..f51c4ee 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Server.Handlers.Grid
                     case "get_grid_extra_features":
                         return GetGridExtraFeatures(request);
                 }
-                
+
                 m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
             }
             catch (Exception e)
@@ -590,22 +590,22 @@ namespace OpenSim.Server.Handlers.Grid
             int flags = m_GridService.GetRegionFlags(scopeID, regionID);
            // m_log.DebugFormat("[GRID HANDLER]: flags for region {0}: {1}", regionID, flags);
 
-            Dictionary<string, object> result = new Dictionary<string, object>(); 
+            Dictionary<string, object> result = new Dictionary<string, object>();
             result["result"] = flags.ToString();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
-        
+
         byte[] GetGridExtraFeatures(Dictionary<string, object> request)
         {
 
             Dictionary<string, object> result = new Dictionary<string, object> ();
             Dictionary<string, object> extraFeatures = m_GridService.GetExtraFeatures ();
 
-            foreach (string key in extraFeatures.Keys) 
+            foreach (string key in extraFeatures.Keys)
             {
                 result [key] = extraFeatures [key];
             }
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
index f3d678f..684d1a8 100644
--- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
     public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentPostHandler
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private IGatekeeperService m_GatekeeperService;
 
         public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) : base("/foreignagent")
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs
index 6c79c60..870a5ef 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
         }
 
         // Called from standalone configurations
-        public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn) 
+        public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn)
             : base(config, server, configName)
         {
             if (configName != string.Empty)
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 37b47ed..8116050 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             m_UserAgentService = uas;
             m_FriendsLocalSimConnector = friendsConn;
 
-            m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})", 
+            m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})",
                 (m_FriendsLocalSimConnector == null ? "robust" : "standalone"));
 
             if (m_TheService == null)
@@ -105,24 +105,24 @@ namespace OpenSim.Server.Handlers.Hypergrid
 
                     case "validate_friendship_offered":
                         return ValidateFriendshipOffered(request);
-                        
+
                     case "statusnotification":
                         return StatusNotification(request);
                     /*
                     case "friendship_approved":
                         return FriendshipApproved(request);
-                    
+
                     case "friendship_denied":
                         return FriendshipDenied(request);
-                    
+
                     case "friendship_terminated":
                         return FriendshipTerminated(request);
-                    
+
                     case "grant_rights":
                         return GrantRights(request);
                         */
                 }
-                
+
                 m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method);
             }
             catch (Exception e)
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
index 8145a21..63f376d 100644
--- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
 
         public InstantMessageServerConnector(IConfigSource config, IHttpServer server) :
             this(config, server, (IInstantMessageSimConnector)null)
-        {            
+        {
         }
 
         public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) :
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 37feabe..394b133 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -63,14 +63,14 @@ namespace OpenSim.Server.Handlers.Hypergrid
 
         public UserAgentServerConnector(IConfigSource config, IHttpServer server) :
             this(config, server, (IFriendsSimConnector)null)
-        {            
+        {
         }
 
         public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) :
             this(config, server)
         {
         }
-        
+
         public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) :
                 base(config, server, String.Empty)
         {
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 0bab5aa..e90b869 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Inventory
         {
             if (configName != string.Empty)
                 m_ConfigName = configName;
-    
+
             IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
@@ -92,7 +92,7 @@ namespace OpenSim.Server.Handlers.Inventory
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
                 "POST", "/GetFolderContent/", GetFolderContent, CheckAuthSession));
-            
+
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<InventoryFolderBase, bool>(
                     "POST", "/UpdateFolder/", m_InventoryService.UpdateFolder, CheckAuthSession));
@@ -151,7 +151,7 @@ namespace OpenSim.Server.Handlers.Inventory
 
             m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService));
 
-            
+
             // for persistent active gestures
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>>
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 96d6451..4400395 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Server.Handlers.Inventory
                 result["FID"] = icoll.FolderID.ToString();
                 result["VERSION"] = icoll.Version.ToString();
                 Dictionary<string, object> folders = new Dictionary<string, object>();
-                int i = 0; 
+                int i = 0;
                 if (icoll.Folders != null)
                 {
                     foreach (InventoryFolderBase f in icoll.Folders)
@@ -407,7 +407,7 @@ namespace OpenSim.Server.Handlers.Inventory
                 }
             }
             result["ITEMS"] = sitems;
-            
+
             string xmlString = ServerUtils.BuildXmlResponse(result);
 
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
diff --git a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
index d368bd3..c4b339f 100644
--- a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Land
                 m_log.Error("[LAND IN CONNECTOR]: Land service was not provided");
                 return;
             }
-            
+
             //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
             //if (authentication)
             //    m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index 5d672c3..072429a 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Login
 
         private ILoginService m_LocalService;
         private bool m_Proxy;
-        
+
 
         public LLLoginHandlers(ILoginService service, bool hasProxy)
         {
@@ -136,7 +136,7 @@ namespace OpenSim.Server.Handlers.Login
                     bool LibOMVclient = false;
                     if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy")
                         LibOMVclient = true;
-                    
+
                     LoginResponse reply = null;
                     reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient);
 
@@ -279,11 +279,11 @@ namespace OpenSim.Server.Handlers.Login
                                        sock.Close("success");
                                    }
                                };
-            
+
             sock.HandshakeAndUpgrade();
 
         }
-        
+
 
         private XmlRpcResponse FailedXMLRPCResponse()
         {
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
index f60e892..56ac3c2 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.Login
             m_DosProtectionOptions.ForgetTimeSpan =
                 TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000));
             m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION";
-            
+
 
             return loginService;
         }
@@ -106,7 +106,7 @@ namespace OpenSim.Server.Handlers.Login
         private void InitializeHandlers(IHttpServer server)
         {
             LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy);
-            server.AddXmlRPCHandler("login_to_simulator", 
+            server.AddXmlRPCHandler("login_to_simulator",
                 new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked,
                     m_DosProtectionOptions).Process, false);
             server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false);
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 38dfffc..7611f53 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Server.Handlers.MapImage
                     }
                     else
                     {
-                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", 
+                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}",
                             ipAddr, x, y);
                         return FailureResult("Region not found at given coordinates");
                     }
diff --git a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
index 4f8f7e1..f292b95 100644
--- a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Server.Handlers.MapImage
                     }
                     else
                     {
-                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", 
+                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}",
                             ipAddr, x, y);
                         return FailureResult("Region not found at given coordinates");
                     }
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index 3525a01..e3ee467 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Server.Handlers.Neighbour
 
             // Finally!
             GridRegion thisRegion = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
-            
+
             OSDMap resp = new OSDMap(1);
 
             if (thisRegion != null)
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index ac2e75f..65ac4e6 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Neighbour
                 m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
                 return;
             }
-            
+
             //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
             //if (authentication)
             //    m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 49dbcb5..be16e17 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Server.Handlers.Presence
 
             return FailureResult();
         }
-        
+
         byte[] Report(Dictionary<string, object> request)
         {
             UUID session = UUID.Zero;
@@ -241,7 +241,7 @@ namespace OpenSim.Server.Handlers.Presence
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 2dfb862..eecb370 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -39,8 +39,8 @@ namespace OpenSim.Server.Handlers.Profiles
 {
     public class UserProfilesConnector: ServiceConnector
     {
-//        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
-        
+//        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         // Our Local Module
         public IUserProfilesService ServiceModule
         {
@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Profiles
 
             Object[] args = new Object[] { config, ConfigName };
             ServiceModule = ServerUtils.LoadPlugin<IUserProfilesService>(service, args);
-            
+
             JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
 
             Server.AddJsonRPCHandler("avatarclassifiedsrequest", handler.AvatarClassifiedsRequest);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index cac38f5..f23a981 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -48,17 +48,17 @@ namespace OpenSim.Server.Handlers
         static readonly ILog m_log =
             LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public IUserProfilesService Service
         {
             get; private set;
         }
-        
+
         public JsonRpcProfileHandlers(IUserProfilesService service)
         {
             Service = service;
         }
-        
+
         #region Classifieds
         /// <summary>
         /// Request avatar's classified ads.
@@ -80,17 +80,17 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Classified Request");
                 return false;
             }
-            
+
             OSDMap request = (OSDMap)json["params"];
             UUID creatorId = new UUID(request["creatorId"].AsString());
-            
-            
+
+
             OSDArray data = (OSDArray) Service.AvatarClassifiedsRequest(creatorId);
             response.Result = data;
-            
+
             return true;
         }
-        
+
         public bool ClassifiedUpdate(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -100,7 +100,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Classified Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserClassifiedAdd ad = new UserClassifiedAdd();
             object Ad = (object)ad;
@@ -110,12 +110,12 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(ad);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
-        
+
         public bool ClassifiedDelete(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -124,10 +124,10 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Classified Delete Request");
                 return false;
             }
-            
+
             OSDMap request = (OSDMap)json["params"];
             UUID classifiedId = new UUID(request["classifiedId"].AsString());
-            
+
             if (Service.ClassifiedDelete(classifiedId))
                 return true;
 
@@ -135,7 +135,7 @@ namespace OpenSim.Server.Handlers
             response.Error.Message = "data error removing record";
             return false;
         }
-        
+
         public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -145,7 +145,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Classified Info Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserClassifiedAdd ad = new UserClassifiedAdd();
             object Ad = (object)ad;
@@ -155,13 +155,13 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(ad);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
         #endregion Classifieds
-        
+
         #region Picks
         public bool AvatarPicksRequest(OSDMap json, ref JsonRpcResponse response)
         {
@@ -171,17 +171,17 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Picks Request");
                 return false;
             }
-            
+
             OSDMap request = (OSDMap)json["params"];
             UUID creatorId = new UUID(request["creatorId"].AsString());
-            
-            
+
+
             OSDArray data = (OSDArray) Service.AvatarPicksRequest(creatorId);
             response.Result = data;
-            
+
             return true;
         }
-        
+
         public bool PickInfoRequest(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -191,7 +191,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Picks Info Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfilePick pick = new UserProfilePick();
             object Pick = (object)pick;
@@ -201,12 +201,12 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(pick);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
-        
+
         public bool PicksUpdate(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -216,7 +216,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Picks Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfilePick pick = new UserProfilePick();
             object Pick = (object)pick;
@@ -226,13 +226,13 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(pick);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = "unable to update pick";
-            
+
             return false;
         }
-        
+
         public bool PicksDelete(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -241,18 +241,18 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Picks Delete Request");
                 return false;
             }
-            
+
             OSDMap request = (OSDMap)json["params"];
             UUID pickId = new UUID(request["pickId"].AsString());
             if(Service.PicksDelete(pickId))
                 return true;
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = "data error removing record";
             return false;
         }
         #endregion Picks
-        
+
         #region Notes
         public bool AvatarNotesRequest(OSDMap json, ref JsonRpcResponse response)
         {
@@ -277,7 +277,7 @@ namespace OpenSim.Server.Handlers
             response.Error.Message = "Error reading notes";
             return false;
         }
-        
+
         public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -287,7 +287,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Notes Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfileNotes note = new UserProfileNotes();
             object Notes = (object) note;
@@ -300,7 +300,7 @@ namespace OpenSim.Server.Handlers
             return true;
         }
         #endregion Notes
-        
+
         #region Profile Properties
         public bool AvatarPropertiesRequest(OSDMap json, ref JsonRpcResponse response)
         {
@@ -311,7 +311,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Properties Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfileProperties props = new UserProfileProperties();
             object Props = (object)props;
@@ -321,12 +321,12 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(props);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
-        
+
         public bool AvatarPropertiesUpdate(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -336,7 +336,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Properties Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfileProperties props = new UserProfileProperties();
             object Props = (object)props;
@@ -346,13 +346,13 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(props);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
         #endregion Profile Properties
-        
+
         #region Interests
         public bool AvatarInterestsUpdate(OSDMap json, ref JsonRpcResponse response)
         {
@@ -363,7 +363,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Interests Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserProfileProperties props = new UserProfileProperties();
             object Props = (object)props;
@@ -373,7 +373,7 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(props);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
@@ -399,7 +399,7 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(prefs);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
 //            m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message);
@@ -415,7 +415,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("User Preferences Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserPreferences prefs = new UserPreferences();
             object Prefs = (object)prefs;
@@ -425,7 +425,7 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(prefs);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message);
@@ -443,13 +443,13 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("Avatar Image Assets Request");
                 return false;
             }
-            
+
             OSDMap request = (OSDMap)json["params"];
             UUID avatarId = new UUID(request["avatarId"].AsString());
 
             OSDArray data = (OSDArray) Service.AvatarImageAssetsRequest(avatarId);
             response.Result = data;
-            
+
             return true;
         }
         #endregion Utiltiy
@@ -464,7 +464,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("User Application Service URL Request: No Parameters!");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserAppData props = new UserAppData();
             object Props = (object)props;
@@ -475,15 +475,15 @@ namespace OpenSim.Server.Handlers
                 res["result"] = OSD.FromString("success");
                 res["token"] = OSD.FromString (result);
                 response.Result = res;
-                
+
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
         }
-        
+
         public bool UpdateUserAppData(OSDMap json, ref JsonRpcResponse response)
         {
             if(!json.ContainsKey("params"))
@@ -493,7 +493,7 @@ namespace OpenSim.Server.Handlers
                 m_log.DebugFormat ("User App Data Update Request");
                 return false;
             }
-            
+
             string result = string.Empty;
             UserAppData props = new UserAppData();
             object Props = (object)props;
@@ -503,7 +503,7 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(props);
                 return true;
             }
-            
+
             response.Error.Code = ErrorCode.InternalError;
             response.Error.Message = string.Format("{0}", result);
             return false;
diff --git a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
index 7d3665b..4d6402f 100644
--- a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Server.Handlers")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 364f1fd..4e1f72e 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Server.Handlers.Simulation
             {
                 // If there is no version in the packet at all we're looking at 0.6 or
                 // even more ancient. Refuse it.
-                if(theirVersion == 0f) 
+                if(theirVersion == 0f)
                 {
                     resp["success"] = OSD.FromBoolean(false);
                     resp["reason"] = OSD.FromString("Your region is running a old version of opensim no longer supported. Consider updating it");
@@ -199,8 +199,8 @@ namespace OpenSim.Server.Handlers.Simulation
                 }
 
                 version = theirVersion;
-                  
-                if (version < VersionInfo.SimulationServiceVersionAcceptedMin || 
+
+                if (version < VersionInfo.SimulationServiceVersionAcceptedMin ||
                     version > VersionInfo.SimulationServiceVersionAcceptedMax )
                 {
                     resp["success"] = OSD.FromBoolean(false);
@@ -274,7 +274,7 @@ namespace OpenSim.Server.Handlers.Simulation
             OSDArray featuresWanted = new OSDArray();
             foreach (UUID feature in features)
                 featuresWanted.Add(OSD.FromString(feature.ToString()));
-            
+
             resp["features"] = featuresWanted;
 
             // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map!
@@ -460,7 +460,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 source.RegionLocY = Int32.Parse(args["source_y"].AsString());
                 source.RegionName = args["source_name"].AsString();
                 source.RegionID = UUID.Parse(args["source_uuid"].AsString());
-                
+
                 if (args.ContainsKey("source_server_uri"))
                     source.RawServerURI = args["source_server_uri"].AsString();
                 else
diff --git a/OpenSim/Server/Properties/AssemblyInfo.cs b/OpenSim/Server/Properties/AssemblyInfo.cs
index ee45e10..6d15078 100644
--- a/OpenSim/Server/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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("Robust")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index ed5a481..c343044 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Server
             ServicePointManager.UseNagleAlgorithm = false;
 
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
-            
+
             string registryLocation;
 
             IConfig serverConfig = m_Server.Config.Configs["Startup"];
@@ -70,7 +70,7 @@ namespace OpenSim.Server
             }
 
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
-            
+
             registryLocation = serverConfig.GetString("RegistryLocation",".");
 
             IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index c57db48..5c37c33 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Services.AssetService
         public virtual AssetBase Get(string id)
         {
 //            m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id);
-            
+
             UUID assetID;
 
             if (!UUID.TryParse(id, out assetID))
@@ -166,7 +166,7 @@ namespace OpenSim.Services.AssetService
                 return new bool[ids.Length];
             }
         }
-        
+
         public virtual string Store(AssetBase asset)
         {
             bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0];
@@ -175,14 +175,14 @@ namespace OpenSim.Services.AssetService
 //                m_log.DebugFormat(
 //                    "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length);
                if (!m_Database.StoreAsset(asset))
-                {
+                {
                 return UUID.Zero.ToString();
-                }
+                }
             }
 //            else
 //            {
 //                m_log.DebugFormat(
-//                    "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length);                
+//                    "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length);
 //            }
 
             return asset.ID;
diff --git a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
index ddcb997..8da7100 100644
--- a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.AssetService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index b1e5184..9490d55 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Services.AssetService
         public virtual AssetBase Get(string id)
         {
 //            m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id);
-            
+
             UUID assetID;
 
             if (!UUID.TryParse(id, out assetID))
@@ -162,7 +162,7 @@ namespace OpenSim.Services.AssetService
         public virtual bool Get(string id, Object sender, AssetRetrieved handler)
         {
             //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id);
-            
+
             UUID assetID;
 
             if (!UUID.TryParse(id, out assetID))
@@ -171,7 +171,7 @@ namespace OpenSim.Services.AssetService
             AssetBase asset = Get(id);
 
             //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset);
-            
+
             handler(id, sender, asset);
 
             return true;
@@ -182,7 +182,7 @@ namespace OpenSim.Services.AssetService
             UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id));
             return m_Database.AssetsExist(uuid);
         }
-        
+
         public virtual string Store(AssetBase asset)
         {
             bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0];
@@ -222,7 +222,7 @@ namespace OpenSim.Services.AssetService
 
         private void MigrateFromChainedService(AssetBase asset)
         {
-            Store(asset); 
+            Store(asset);
             m_ChainedAssetService.Delete(asset.ID);
         }
     }
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index e42f9a0..f66b4e2 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService
     // Generic Authentication service used for identifying
     // and authenticating principals.
     // Principals may be clients acting on users' behalf,
-    // or any other components that need 
+    // or any other components that need
     // verifiable identification.
     //
     public class AuthenticationServiceBase : ServiceBase
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
- 
+
         protected IAuthenticationData m_Database;
         protected IUserAccountService m_UserAccountService = null;
 
@@ -178,7 +178,7 @@ namespace OpenSim.Services.AuthenticationService
             m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID);
             return true;
         }
-        
+
         protected string GetToken(UUID principalID, int lifetime)
         {
             UUID token = UUID.Random();
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index a9359f3..0204699 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService
     // Generic Authentication service used for identifying
     // and authenticating principals.
     // Principals may be clients acting on users' behalf,
-    // or any other components that need 
+    // or any other components that need
     // verifiable identification.
     //
     public class PasswordAuthenticationService :
@@ -50,7 +50,7 @@ namespace OpenSim.Services.AuthenticationService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
- 
+
         public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) :
                 base(config, userService)
         {
diff --git a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
index ef4e234..c946b04 100644
--- a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.AuthenticationService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
index 1510168..0bd5b1f 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Services.AuthenticationService
     // Generic Authentication service used for identifying
     // and authenticating principals.
     // Principals may be clients acting on users' behalf,
-    // or any other components that need 
+    // or any other components that need
     // verifiable identification.
     //
     public class WebkeyAuthenticationService :
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
- 
+
         public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) :
                 base(config, userService)
         {
@@ -79,7 +79,7 @@ namespace OpenSim.Services.AuthenticationService
                 {
                     if (data.Data.ContainsKey("webLoginKey"))
                     {
-                                                string key = data.Data["webLoginKey"].ToString();
+                        string key = data.Data["webLoginKey"].ToString();
                         if (key == password)
                         {
                             data.Data["webLoginKey"] = UUID.Zero.ToString();
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index bbc8470..4203c7b 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Dictionary<string, IAuthenticationService> m_svcChecks 
+        private Dictionary<string, IAuthenticationService> m_svcChecks
             = new Dictionary<string, IAuthenticationService>();
-        
+
         public WebkeyOrPasswordAuthenticationService(IConfigSource config)
             : base(config)
         {
@@ -86,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService
                     }
                 }
 
-              
+
 
                 if (result == string.Empty)
                 {
@@ -97,8 +97,8 @@ namespace OpenSim.Services.AuthenticationService
             {
                 m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
             }
-            
-            
+
+
             return result;
         }
     }
diff --git a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
index 75b1284..f87095a 100644
--- a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.AuthorizationService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs
index 423c781..222944c 100644
--- a/OpenSim/Services/AvatarService/AvatarService.cs
+++ b/OpenSim/Services/AvatarService/AvatarService.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Services.AvatarService
             AvatarData avatar = GetAvatar(principalID);
             return avatar.ToAvatarAppearance();
         }
-        
+
         public bool SetAppearance(UUID principalID, AvatarAppearance appearance)
         {
             AvatarData avatar = new AvatarData(appearance);
@@ -136,7 +136,7 @@ namespace OpenSim.Services.AvatarService
                 {
                     av.Data["Value"] = kvp.Value;
                 }
-                
+
                 if (!m_Database.Store(av))
                 {
                     m_Database.Delete("PrincipalID", principalID.ToString());
diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs
index ab9d7cd..c1c4fb7 100644
--- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs
+++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Services.AvatarService
                 connString = presenceConfig.GetString("ConnectionString", connString);
                 realm = presenceConfig.GetString("Realm", realm);
             }
-            
+
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
diff --git a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
index d64e53f..816ab0b 100644
--- a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.AvatarService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index 4090ef9..90c14d7 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.Base")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 209a57a..2017f50 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Services.Base
     public class ServiceBase
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public T LoadPlugin<T>(string dllName) where T:class
         {
             return LoadPlugin<T>(dllName, new Object[0]);
@@ -105,12 +105,12 @@ namespace OpenSim.Services.Base
                 List<string> strArgs = new List<string>();
                 foreach (Object arg in args)
                     strArgs.Add(arg.ToString());
-                
+
                 m_log.Error(
                     string.Format(
-                        "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", 
+                        "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}",
                         interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e);
-                
+
                 return null;
             }
         }
diff --git a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs
index 0e72c8b..bd342fa 100644
--- a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs
+++ b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors
             {
                 m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message);
             }
-                
+
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
             if (replyData != null)
             {
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index bdc3bef..3fa8b54 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors
         private List<AssetBase>[] m_sendRetries = new  List<AssetBase>[MAXSENDRETRIESLEN];
         private System.Timers.Timer m_retryTimer;
         private int m_maxAssetRequestConcurrency = 30;
-        
+
         private delegate void AssetRetrievedEx(AssetBase asset);
 
         // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
@@ -150,7 +150,7 @@ namespace OpenSim.Services.Connectors
             string prefix = id.Substring(0, 2).ToLower();
 
             string host;
-            
+
             // HG URLs will not be valid UUIDS
             if (m_UriMap.ContainsKey(prefix))
                 host = m_UriMap[prefix];
@@ -180,11 +180,11 @@ namespace OpenSim.Services.Connectors
             if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below
                 m_retryCounter = 1;
 
-            int inUse = 0; 
+            int inUse = 0;
             int nextlevel;
-            int timefactor; 
+            int timefactor;
             List<AssetBase> retrylist;
-            // we need to go down            
+            // we need to go down
             for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--)
             {
                 lock(m_sendRetries)
@@ -219,13 +219,13 @@ namespace OpenSim.Services.Connectors
                 lock(m_sendRetries)
                     m_sendRetries[i] = null;
 
-                // we are the only ones with a copy of this retrylist now                
+                // we are the only ones with a copy of this retrylist now
                 foreach(AssetBase ass in retrylist)
                    retryStore(ass, nextlevel);
             }
 
             lock(m_sendRetries)
-            {          
+            {
                 if(inUse == 0 )
                     m_retryTimer.Stop();
 
@@ -245,7 +245,7 @@ namespace OpenSim.Services.Connectors
             AssetBase asset = null;
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
-            
+
             if (asset == null || asset.Data == null || asset.Data.Length == 0)
             {
                 // XXX: Commented out for now since this has either never been properly operational or not for some time
@@ -259,7 +259,7 @@ namespace OpenSim.Services.Connectors
 
                 asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth);
 
- 
+
                 if (m_Cache != null)
                 {
                     if (asset != null)
@@ -438,7 +438,7 @@ namespace OpenSim.Services.Connectors
                 // This is most likely to happen because the server doesn't support this function,
                 // so just silently return "doesn't exist" for all the assets.
             }
-            
+
             if (exist == null)
                 exist = new bool[ids.Length];
 
@@ -557,7 +557,7 @@ namespace OpenSim.Services.Connectors
                 if(nextRetryLevel >= MAXSENDRETRIESLEN)
                     m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}",
                             asset.ID.ToString(), asset.Type.ToString());
-                else                
+                else
                 {
                     lock(m_sendRetries)
                     {
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
index d2da85f..a130f71 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
@@ -37,7 +37,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class AuthorizationServicesConnector 
+    public class AuthorizationServicesConnector
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
         private bool m_ResponseOnFailure = true;
-       
+
         public AuthorizationServicesConnector()
         {
         }
@@ -78,11 +78,11 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Authorization connector init error");
             }
             m_ServerURI = serviceURI;
-            
+
             // this dictates what happens if the remote service fails, if the service fails and the value is true
             // the user is authorized for the region.
             bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true);
-                    
+
             m_ResponseOnFailure = responseOnFailure;
             m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized");
         }
@@ -91,11 +91,11 @@ namespace OpenSim.Services.Connectors
         {
             // do a remote call to the authorization server specified in the AuthorizationServerURI
             m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI);
-            
+
             string uri = m_ServerURI;
-            
+
             AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID);
-            
+
             AuthorizationResponse response;
             try
             {
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors
             }
             m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message);
             message = response.Message;
-            
+
             return response.IsAuthorized;
         }
 
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
index 3f44efa..424e95a 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
@@ -94,13 +94,13 @@ namespace OpenSim.Services.Connectors
             AvatarData avatar = GetAvatar(userID);
             return avatar.ToAvatarAppearance();
         }
-        
+
         public bool SetAppearance(UUID userID, AvatarAppearance appearance)
         {
             AvatarData avatar = new AvatarData(appearance);
             return SetAvatar(userID,avatar);
         }
-            
+
         public AvatarData GetAvatar(UUID userID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index b7702a8..873b554 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Friends
 
 
         #region IFriendsService
-        
+
         public FriendInfo[] GetFriends(UUID PrincipalID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index ceb2146..ded7806 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -683,7 +683,7 @@ namespace OpenSim.Services.Connectors
 
             return rinfos;
         }
-        
+
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
@@ -755,7 +755,7 @@ namespace OpenSim.Services.Connectors
             if (reply != string.Empty)
             {
                 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-                
+
                 if ((replyData != null) && replyData.Count > 0)
                 {
                     foreach (string key in replyData.Keys)
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index eef492d..e814c45 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             string filename = string.Empty;
 
             try
-            {               
+            {
                 //m_log.Debug("JPEG: " + imageURL);
                 string name = regionID.ToString();
                 filename = Path.Combine(storagePath, name + ".jpg");
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index b5e6d69..91e1740 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -33,7 +33,7 @@ using Nini.Config;
 
 namespace OpenSim.Services.Connectors
 {
-    public class HeloServicesConnector 
+    public class HeloServicesConnector
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 1b45bcf..b261675 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             return "homeagent/";
         }
 
-        // The Login service calls this interface with fromLogin=true 
+        // The Login service calls this interface with fromLogin=true
         // Sims call it with fromLogin=false
         // Either way, this is verified by the handler
         public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason)
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
         }
 
         public void SetClientToken(UUID sessionID, string token)
-        { 
+        {
             // no-op
         }
 
@@ -416,7 +416,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
             XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList);
 //            string reason = string.Empty;
-            
+
             // Send and get reply
             List<UUID> online = new List<UUID>();
             XmlRpcResponse response = null;
@@ -497,7 +497,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             hash["userID"] = userID.ToString();
 
             hash = CallServer("get_server_urls", hash);
-           
+
             Dictionary<string, object> serverURLs = new Dictionary<string, object>();
             foreach (object key in hash.Keys)
             {
@@ -516,7 +516,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Hashtable hash = new Hashtable();
             hash["userID"] = userID.ToString();
 
-            hash = CallServer("locate_user", hash);           
+            hash = CallServer("locate_user", hash);
 
             string url = string.Empty;
 
@@ -574,7 +574,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 // We can not use m_ServerURL here anymore because it causes
                 // the HTTP request to be built without a host name. This messes
-                // with OSGrid's NGINX and can make OSGrid avatars unable to TP 
+                // with OSGrid's NGINX and can make OSGrid avatars unable to TP
                 // to other grids running recent mono.
                 response = request.Send(m_ServerURLHost, 10000);
             }
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index bd5841b..dcf25ad 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors
         /// In this case, -1 is default timeout (100 seconds), not infinite.
         /// </remarks>
         private int m_requestTimeoutSecs = -1;
-                private string m_configName = "InventoryService";
+        private string m_configName = "InventoryService";
 
         private const double CACHE_EXPIRATION_SECONDS = 20.0;
         private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>();
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors
         public XInventoryServicesConnector(IConfigSource source, string configName)
             : base(source, configName)
         {
-                        m_configName = configName;
+            m_configName = configName;
             Initialise(source);
         }
 
@@ -114,13 +114,13 @@ namespace OpenSim.Services.Connectors
 
             StatsManager.RegisterStat(
                 new Stat(
-                "RequestsMade", 
-                "Requests made", 
-                "Number of requests made to the remove inventory service", 
-                "requests", 
-                "inventory", 
-                serviceURI, 
-                StatType.Pull, 
+                "RequestsMade",
+                "Requests made",
+                "Number of requests made to the remove inventory service",
+                "requests",
+                "inventory",
+                serviceURI,
+                StatType.Pull,
                 MeasuresOfInterest.AverageChangeOverTime,
                 s => s.Value = RequestsMade,
                 StatVerbosity.Debug));
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors
 
             return inventory;
         }
-        
+
         public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
         {
             InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length];
@@ -674,7 +674,7 @@ namespace OpenSim.Services.Connectors
                         { "ASSET", assetID.ToString() }
                     });
 
-            // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int           
+            // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int
             if (ret == null)
                 return 0;
 
@@ -719,7 +719,7 @@ namespace OpenSim.Services.Connectors
                 reply = SynchronousRestFormsRequester.MakeRequest(
                     "POST", m_ServerURI + "/xinventory",
                      ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth);
-                
+
                 if (reply != String.Empty)
                     break;
 
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 5e9331e..047880a 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -122,12 +122,12 @@ namespace OpenSim.Services.Connectors
                         catch (Exception e)
                         {
                             m_log.ErrorFormat(
-                                "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", 
+                                "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}",
                                 e.Message, e.StackTrace);
                         }
                     }
                 }
-                else 
+                else
                     m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle);
             }
             catch (Exception e)
@@ -135,7 +135,7 @@ namespace OpenSim.Services.Connectors
                 m_log.ErrorFormat(
                     "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace);
             }
-        
+
             return landData;
         }
     }
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index 1f14b32..89d64ca 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString, 
+                        reqString,
                         m_Auth);
                 if (reply != string.Empty)
                 {
@@ -315,8 +315,8 @@ namespace OpenSim.Services.Connectors
                 }
                 else
                 {
-                                        if (replyData["result"].ToString() == "null")
-                                                return null;
+                    if (replyData["result"].ToString() == "null")
+                        return null;
 
                     m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString());
                 }
@@ -366,7 +366,7 @@ namespace OpenSim.Services.Connectors
 
             if (replyData != null)
             {
-                if (replyData.ContainsKey("result") && 
+                if (replyData.ContainsKey("result") &&
                     (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
                 {
                     return new PresenceInfo[0];
diff --git a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
index 3c5ca7d..76d26d6 100644
--- a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.Connectors")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 531939f..121e863 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public string Name { get { return "SimianAssetServiceConnector"; } }
         public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } }
         public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } }
-        
+
         #endregion ISharedRegionModule
 
         public SimianAssetServiceConnector(IConfigSource source)
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return SimianGetOperation(id);
         }
-        
+
 
         public AssetBase GetCached(string id)
         {
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // return GetRemoteMetadata(id);
             return SimianGetMetadataOperation(id);
         }
-        
+
         public byte[] GetData(string id)
         {
             if (String.IsNullOrEmpty(m_serverUrl))
@@ -296,7 +296,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return SimianStoreOperation(asset);
         }
-        
+
         /// <summary>
         /// Update an asset's content
         /// </summary>
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return SimianDeleteOperation(id);
         }
-        
+
 #endregion IAssetService
 
 #region SimianOperations
@@ -369,9 +369,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString());
                     return false;
                 }
-                
+
                 return true;
-                
+
             }
             catch (Exception ex)
             {
@@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                             { "Temporary", asset.Temporary ? "1" : "0" },
                             { "Name", asset.Name }
                     };
-                
+
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
                 if (! response["Success"].AsBoolean())
                 {
@@ -410,13 +410,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
                 // asset.ID is always set before calling this function
                 return asset.ID;
-                
+
             }
             catch (Exception ex)
             {
                 m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message);
             }
-            
+
             return null;
         }
 
@@ -427,12 +427,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <returns></returns>
         private AssetBase SimianGetOperation(string id)
         {
-            try 
+            try
             {
                 NameValueCollection requestArgs = new NameValueCollection
                     {
                             { "RequestMethod", "xGetAsset" },
-                            { "ID", id } 
+                            { "ID", id }
                     };
 
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -441,7 +441,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString());
                     return null;
                 }
-            
+
                 AssetBase asset = new AssetBase();
 
                 asset.ID = id;
@@ -475,7 +475,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 NameValueCollection requestArgs = new NameValueCollection
                     {
                             { "RequestMethod", "xGetAssetMetadata" },
-                            { "ID", id } 
+                            { "ID", id }
                     };
 
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -485,7 +485,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString());
                     return null;
                 }
-            
+
                 AssetMetadata metadata = new AssetMetadata();
                 metadata.ID = id;
                 metadata.ContentType = response["ContentType"].AsString();
@@ -620,7 +620,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         //     }
 
         //     string errorMessage = null;
-            
+
         //     // Build the remote storage request
         //     List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
         //     {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index a52dd6c..34bb274 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                              userID,response["Message"].AsString());
             return null;
         }
-        
+
         // <summary>
         // </summary>
         // <param name=""></param>
@@ -178,7 +178,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return success;
         }
-            
+
         // <summary>
         // </summary>
         // <param name=""></param>
@@ -219,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     appearance.AvatarHeight = (float)map["Height"].AsReal();
 
                     AvatarData avatar = new AvatarData(appearance);
-                    
+
                     // Get attachments
                     map = null;
                     try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; }
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         foreach (KeyValuePair<string, OSD> kvp in map)
                             avatar.Data[kvp.Key] = kvp.Value.AsString();
                     }
-                
+
                     return avatar;
                 }
                 else
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
index 764e71f..49bd9a4 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private bool m_enabled = true;
         private Scene m_scene;
         private String m_simianURL;
-        
+
 #region IRegionModule Members
 
         public string Name
@@ -65,10 +65,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource config)
         {
-            try 
+            try
             {
                 IConfig m_config;
-               
+
                 if ((m_config = config.Configs["SimianExternalCaps"]) != null)
                 {
                     m_enabled = m_config.GetBoolean("Enabled", m_enabled);
@@ -97,10 +97,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public void Close() { }
 
         public void AddRegion(Scene scene)
-        { 
+        {
             if (! m_enabled)
                 return;
-            
+
             m_scene = scene;
             m_scene.RegisterModuleInterface<IExternalCapsModule>(this);
         }
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             subs["%USR%"] = agentID.ToString();
             subs["%CAP%"] = cap.ToString();
             subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString();
-            
+
             caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs));
             return true;
         }
@@ -168,12 +168,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs)
         {
             String result = urlSkel;
-            
+
             foreach (KeyValuePair<String,String> kvp in subs)
             {
                 result = result.Replace(kvp.Key,kvp.Value);
             }
-            
+
             return result;
         }
     }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index a35d749..b29adb3 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -52,20 +52,20 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private IConfig m_config = null;
 
         private String m_simianURL;
-        
+
 #region IRegionModule Members
 
         public string Name
         {
             get { return this.GetType().Name; }
         }
-           
+
         public void Initialise(IConfigSource config)
         {
-            try 
+            try
             {
                 m_config = config.Configs["SimianGrid"];
-               
+
                 if (m_config != null)
                 {
                     m_simianURL = m_config.GetString("SimianServiceURL");
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         // m_log.DebugFormat("[SimianGrid] service URL is not defined");
                         return;
                     }
-                    
+
                     InitialiseSimCap();
                     SimulatorCapability = SimulatorCapability.Trim();
                     m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
@@ -100,7 +100,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         ///<summary>
         /// Try a variety of methods for finding the simian simulator capability; first check the
-        /// configuration itself, then look for a file that contains the cap, then finally look 
+        /// configuration itself, then look for a file that contains the cap, then finally look
         /// for an environment variable that contains it.
         ///</summary>
         private void InitialiseSimCap()
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 SimulatorCapability = m_config.GetString("SimulatorCapability");
                 return;
             }
-            
+
             if (m_config.Contains("SimulatorCapabilityFile"))
             {
                 String filename = m_config.GetString("SimulatorCapabilityFile");
@@ -120,7 +120,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     return;
                 }
             }
-            
+
             if (m_config.Contains("SimulatorCapabilityVariable"))
             {
                 String envname = m_config.GetString("SimulatorCapabilityVariable");
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability");
         }
-        
+
 #endregion
 
         public static String SimulatorCapability = UUID.Zero.ToString();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 8375c95..4896d09 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -65,14 +65,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private int m_refreshtime = 0;
         private int m_lastrefresh = 0;
         private System.Timers.Timer m_refreshTimer = new System.Timers.Timer();
-        
+
         #region ISharedRegionModule
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        public string Name { get { return "SimianGridMaptile"; } }        
+        public string Name { get { return "SimianGridMaptile"; } }
         public void RegionLoaded(Scene scene) { }
         public void Close() { }
-        
+
         ///<summary>
         ///
         ///</summary>
@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             IConfig config = source.Configs["SimianGridMaptiles"];
             if (config == null)
                 return;
-            
+
             if (! config.GetBoolean("Enabled", false))
                 return;
 
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                                 {
                                     uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize);
                                     uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize);
-                                    
+
                                     ConvertAndUploadMaptile(subMapTile, locX, locY);
                                 }
                             }
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             }
 
         }
-        
+
         ///<summary>
         ///
         ///</summary>
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     { "ContentType", "image/png" },
                     { "EncodedData", System.Convert.ToBase64String(pngData) }
                 };
-                            
+
             OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
             if (! response["Success"].AsBoolean())
             {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index bd35c6f..f8eebbe 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService");
                 throw new Exception("Grid connector init error");
             }
-            
+
             if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
                 serviceUrl = serviceUrl + '/';
             m_ServerURI = serviceUrl;
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             };
 
             // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString());
-            
+
             OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
@@ -308,7 +308,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             };
 
             //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString());
-            
+
 
             OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
@@ -413,7 +413,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return -1;
             }
         }
-        
+
         public Dictionary<string, object> GetExtraFeatures()
         {
             /// See SimulatorFeaturesModule - Need to get map, search and destination guide
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 3d35834..9eefd16 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -535,7 +535,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     allSuccess = false;
                 }
             }
-            
+
             return allSuccess;
         }
 
@@ -727,11 +727,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// that hold the given assetID.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="assetID"></param>
-        /// <returns>The permissions or 0 if no such asset is found in 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         public int GetAssetPermissions(UUID userID, UUID assetID)
         {
@@ -787,7 +787,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 if (item != null && item["Type"].AsString() == "Item")
                 {
                     InventoryItemBase invItem = new InventoryItemBase();
-                    
+
                     invItem.AssetID = item["AssetID"].AsUUID();
                     invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString());
                     invItem.CreationDate = item["CreationDate"].AsInteger();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 211b775..08efefb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
                         serviceUrl = serviceUrl + '/';
                     m_serverUrl = serviceUrl;
-                    m_activityDetector = new SimianActivityDetector(this); 
+                    m_activityDetector = new SimianActivityDetector(this);
                     m_Enabled = true;
                 }
             }
@@ -210,7 +210,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString());
                 return null;
             }
-            
+
             UUID userID = sessionResponse["UserID"].AsUUID();
             OSDMap userResponse = GetUserData(userID);
             if (userResponse == null)
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
                 return null;
             }
-            
+
             OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray;
             for (int i = 0; i < sessionList.Count; i++)
             {
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public GridUserInfo GetGridUserInfo(string user)
         {
-            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); 
+            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
 
             UUID userID = new UUID(user);
             OSDMap userResponse = GetUserData(userID);
@@ -421,7 +421,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return null;
         }
-        
+
         private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt)
         {
             return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}";
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index 17f4fc6..a388bcc 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private bool m_Enabled = false;
 
         #region INonSharedRegionModule
-        
+
         public Type ReplaceableInterface { get { return null; } }
         public void RegionLoaded(Scene scene) { }
         public void Close() { }
@@ -284,7 +284,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID)
         {
             m_log.DebugFormat("[SIMIAN PROFILES]: Request avatar properties for {0}",avatarID);
-            
+
             OSDMap user = FetchUserData(avatarID);
 
             ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish;
@@ -455,7 +455,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private OSDMap FetchUserData(UUID userID)
         {
             m_log.DebugFormat("[SIMIAN PROFILES]: Fetch information about {0}",userID);
-            
+
             NameValueCollection requestArgs = new NameValueCollection
             {
                 { "RequestMethod", "GetUser" },
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 6f613c1..115ae36 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -42,7 +42,7 @@ using OpenMetaverse.StructuredData;
 namespace OpenSim.Services.Connectors.SimianGrid
 {
     /// <summary>
-    /// Connects user account data (creating new users, looking up existing 
+    /// Connects user account data (creating new users, looking up existing
     /// users) to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianUserAccountServiceConnector")]
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             };
 
             OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
-            
+
             if (response["Success"].AsBoolean())
             {
                 m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name);
@@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             account.LocalToGrid = true;
             if (response.ContainsKey("LocalToGrid"))
                 account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false);
-                
+
             GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
 
             // Cache the user account info
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 8e1bf37..9f4d89a 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
         // we use this dictionary to track the pending updateagent requests, maps URI --> position update
         private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>();
-        
+
         //private GridRegion m_Region;
 
         public SimulationServiceConnector()
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors.Simulation
             m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI);
 
             string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
-            
+
             try
             {
                 OSDMap args = aCircuit.PackAgentCircuitData(ctx);
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation
                     myipaddress = data["your_ip"].AsString();
                     return success;
                 }
-              
+
                 // Try the old version, uncompressed
                 result = WebUtil.PostToService(uri, args, 30000, false);
 
@@ -155,10 +155,10 @@ namespace OpenSim.Services.Connectors.Simulation
                         return success;
                     }
                 }
-                
+
                 m_log.WarnFormat(
-                    "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", 
-                    aCircuit.firstname, aCircuit.lastname, destination.RegionName);                       
+                    "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}",
+                    aCircuit.firstname, aCircuit.lastname, destination.RegionName);
                 reason = result["Message"] != null ? result["Message"].AsString() : "error";
                 return false;
             }
@@ -202,8 +202,8 @@ namespace OpenSim.Services.Connectors.Simulation
             {
                 if (m_updateAgentQueue.ContainsKey(uri))
                 {
-                    // Another thread is already handling 
-                    // updates for this simulator, just update 
+                    // Another thread is already handling
+                    // updates for this simulator, just update
                     // the position and return, overwrites are
                     // not a problem since we only care about the
                     // last update anyway
@@ -304,7 +304,7 @@ namespace OpenSim.Services.Connectors.Simulation
             OSDMap request = new OSDMap();
             request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
             request.Add("position", OSD.FromString(position.ToString()));
-            // To those who still understad this field, we're telling them 
+            // To those who still understad this field, we're telling them
             // the lowest version just to be safe
             request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin)));
             // New simulation service negotiation
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.Simulation
                                 m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored");
                                 return true;
                             }
-    
+
                             reason = result["Message"];
                         }
                         else
@@ -410,7 +410,7 @@ namespace OpenSim.Services.Connectors.Simulation
             {
                 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString());
             }
-            
+
             return false;
         }
 
@@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.Simulation
             {
                 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString());
             }
-            
+
             return true;
         }
 
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 5bc7a1c..68ae7bb 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors
             accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported);
             if(multisuported)
                 return accs;
-            
+
             // service does not do multi accounts so need to do it one by one
 
             UUID uuid = UUID.Zero;
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors
 
             return SendAndGetReply(sendData);
         }
-        
+
         private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
         {
             string reply = string.Empty;
diff --git a/OpenSim/Services/EstateService/EstateDataService.cs b/OpenSim/Services/EstateService/EstateDataService.cs
index f6a8654..f051ffb 100644
--- a/OpenSim/Services/EstateService/EstateDataService.cs
+++ b/OpenSim/Services/EstateService/EstateDataService.cs
@@ -92,11 +92,11 @@ namespace OpenSim.Services.EstateService
         {
             return m_database.CreateNewEstate();
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
-            return m_database.LoadEstateSettingsAll();            
-        }        
+            return m_database.LoadEstateSettingsAll();
+        }
 
         public void StoreEstateSettings(EstateSettings es)
         {
@@ -107,7 +107,7 @@ namespace OpenSim.Services.EstateService
         {
             return m_database.GetEstates(search);
         }
-        
+
         public List<int> GetEstatesAll()
         {
             return m_database.GetEstatesAll();
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index cddd288..ca2f459 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Services.FSAssetService
             }
 
             IConfig assetConfig = config.Configs[configName];
-            
+
             if (assetConfig == null)
                 throw new Exception("No AssetService configuration");
 
@@ -128,12 +128,12 @@ namespace OpenSim.Services.FSAssetService
 
             // If not found above, fallback to Database defaults
             IConfig dbConfig = config.Configs["DatabaseService"];
-            
+
             if (dbConfig != null)
             {
                 if (dllName == String.Empty)
                     dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                
+
                 if (connectionString == String.Empty)
                     connectionString = dbConfig.GetString("ConnectionString", String.Empty);
             }
@@ -156,7 +156,7 @@ namespace OpenSim.Services.FSAssetService
 
             // Setup Fallback Service
             string str = assetConfig.GetString("FallbackService", string.Empty);
-            
+
             if (str != string.Empty)
             {
                 object[] args = new object[] { config };
@@ -204,7 +204,7 @@ namespace OpenSim.Services.FSAssetService
                                 Store(a, false);
                             });
                 }
-            
+
                 m_WriterThread = new Thread(Writer);
                 m_WriterThread.Start();
 
@@ -214,7 +214,7 @@ namespace OpenSim.Services.FSAssetService
                     m_StatsThread.Start();
                 }
             }
-            
+
             m_log.Info("[FSASSETS]: FS asset service enabled");
         }
 
@@ -223,7 +223,7 @@ namespace OpenSim.Services.FSAssetService
             while (true)
             {
                 Thread.Sleep(60000);
-                 
+
                 lock (m_statsLock)
                 {
                     if (m_readCount > 0)
@@ -723,7 +723,7 @@ namespace OpenSim.Services.FSAssetService
             AssetBase asset = Get(args[2], out hash);
 
             if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                 MainConsole.Instance.Output("Asset not found");
                 return;
             }
@@ -765,7 +765,7 @@ namespace OpenSim.Services.FSAssetService
             AssetBase asset = Get(args[2]);
 
             if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                 MainConsole.Instance.Output("Asset not found");
                 return;
             }
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 201e72f..970d682 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Services.FreeswitchService
                 response["str_response_string"] = String.Format(@"<?xml version=""1.0"" encoding=""utf-8""?>
                    <document type=""freeswitch/xml"">
                      <section name=""dialplan"">
-                     <context name=""{0}"">" + 
+                     <context name=""{0}"">" +
 
 /*                           <!-- dial via SIP uri -->
                             <extension name=""sip_uri"">
@@ -116,21 +116,21 @@ namespace OpenSim.Services.FreeswitchService
         {
             Hashtable response = new Hashtable();
             string domain = (string) request["domain"];
-            if (domain != m_freeSwitchRealm) 
+            if (domain != m_freeSwitchRealm)
             {
                 response["content_type"] = "text/xml";
                 response["keepalive"] = false;
                 response["int_response_code"] = 200;
                 response["str_response_string"] = "";
-            } 
-            else 
+            }
+            else
             {
 //                 m_log.DebugFormat("[FreeSwitchDirectory]: HandleDirectoryRequest called with {0}",request.ToString());
-            
+
                  // information in the request we might be interested in
-             
+
                  // Request 1 sip_auth for users account
-             
+
                  //Event-Calling-Function=sofia_reg_parse_auth
                  //Event-Calling-Line-Number=1494
                  //action=sip_auth
@@ -145,10 +145,10 @@ namespace OpenSim.Services.FreeswitchService
                  //user=xhZuXKmRpECyr2AARJYyGgg%3D%3D
                  //domain=9.20.151.43
                  //ip=9.167.220.137    // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
-             
+
 //                 foreach (DictionaryEntry item in request)
 //                    m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
-             
+
                  string eventCallingFunction = (string) request["Event-Calling-Function"];
                  if (eventCallingFunction == null)
                  {
@@ -159,15 +159,15 @@ namespace OpenSim.Services.FreeswitchService
                  {
                      eventCallingFunction = "sofia_reg_parse_auth";
                  }
-             
+
                  if (eventCallingFunction == "sofia_reg_parse_auth")
                  {
                      string sipAuthMethod = (string)request["sip_auth_method"];
-                 
+
                      if (sipAuthMethod == "REGISTER")
                      {
                          response = HandleRegister(m_freeSwitchContext, m_freeSwitchRealm, request);
-                     } 
+                     }
                      else if (sipAuthMethod == "INVITE")
                      {
                           response = HandleInvite(m_freeSwitchContext, m_freeSwitchRealm, request);
@@ -215,16 +215,16 @@ namespace OpenSim.Services.FreeswitchService
             }
             return response;
         }
-        
+
         private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
         {
             m_log.Info("[FreeSwitchDirectory]: HandleRegister called");
-            
+
             // TODO the password we return needs to match that sent in the request, this is hard coded for now
             string password = "1234";
             string domain = (string) request["domain"];
             string user = (string) request["user"];
-            
+
             Hashtable response = new Hashtable();
             response["content_type"] = "text/xml";
             response["keepalive"] = false;
@@ -249,20 +249,20 @@ namespace OpenSim.Services.FreeswitchService
                     "</section>\r\n" +
                 "</document>\r\n",
                 domain , user, password, Context);
-                
+
             return response;
         }
-        
+
         private Hashtable HandleInvite(string Context, string Realm, Hashtable request)
         {
             m_log.Info("[FreeSwitchDirectory]: HandleInvite called");
-            
+
             // TODO the password we return needs to match that sent in the request, this is hard coded for now
             string password = "1234";
             string domain = (string) request["domain"];
             string user = (string) request["user"];
             string sipRequestUser = (string) request["sip_request_user"];
-            
+
             Hashtable response = new Hashtable();
             response["content_type"] = "text/xml";
             response["keepalive"] = false;
@@ -296,18 +296,18 @@ namespace OpenSim.Services.FreeswitchService
                     "</section>\r\n" +
                 "</document>\r\n",
                 domain , user, password,sipRequestUser, Context);
-                
+
             return response;
         }
 
         private Hashtable HandleLocateUser(String Realm, Hashtable request)
         {
             m_log.Info("[FreeSwitchDirectory]: HandleLocateUser called");
-            
+
             // TODO the password we return needs to match that sent in the request, this is hard coded for now
             string domain = (string) request["domain"];
             string user = (string) request["user"];
-            
+
             Hashtable response = new Hashtable();
             response["content_type"] = "text/xml";
             response["keepalive"] = false;
@@ -330,17 +330,17 @@ namespace OpenSim.Services.FreeswitchService
                     "</section>\r\n" +
                 "</document>\r\n",
                 domain , user);
-            
+
             return response;
         }
-       
+
         private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request)
         {
             m_log.Info("[FreeSwitchDirectory]: HandleConfigSofia called.");
-            
+
             // TODO the password we return needs to match that sent in the request, this is hard coded for now
             string domain = (string) request["domain"];
-            
+
             Hashtable response = new Hashtable();
             response["content_type"] = "text/xml";
             response["keepalive"] = false;
@@ -381,9 +381,9 @@ namespace OpenSim.Services.FreeswitchService
                             "</variables>\r\n"+
                         "</domain>\r\n" +
                     "</section>\r\n" +
-                "</document>\r\n", 
-                domain, Context); 
-             
+                "</document>\r\n",
+                domain, Context);
+
             return response;
         }
 
diff --git a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
index d8ee971..bfeb388d 100644
--- a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.FreeswitchService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
index 5b97ac0..3e6447a 100644
--- a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.FriendsService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index aa13a67..6153f5e 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Services.GridService
             if (gridConfig != null)
             {
                 m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true);
-                
+
                 string authService = gridConfig.GetString("AuthenticationService", String.Empty);
 
                 if (authService != String.Empty)
@@ -200,7 +200,7 @@ namespace OpenSim.Services.GridService
             if (regionInfos.RegionLocY <= Constants.MaximumRegionSize)
                 return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
 
-            String reason = "Region overlaps another region";           
+            String reason = "Region overlaps another region";
 
             List<RegionData> rdatas = m_Database.Get(
                         regionInfos.RegionLocX,
@@ -272,7 +272,7 @@ namespace OpenSim.Services.GridService
                     {
                         if (d.RegionID != regionInfos.RegionID)
                         {
-                            m_log.WarnFormat("[GRID SERVICE]: Region tried to register using a duplicate name. New region: {0} ({1}), existing region: {2} ({3}).", 
+                            m_log.WarnFormat("[GRID SERVICE]: Region tried to register using a duplicate name. New region: {0} ({1}), existing region: {2} ({3}).",
                                 regionInfos.RegionName, regionInfos.RegionID, d.RegionName, d.RegionID);
                             return "Duplicate region name";
                         }
@@ -282,7 +282,7 @@ namespace OpenSim.Services.GridService
 
             // If there is an old record for us, delete it if it is elsewhere.
             region = m_Database.Get(regionInfos.RegionID, scopeID);
-            if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
+            if ((region != null) && (region.RegionID == regionInfos.RegionID) &&
                 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
             {
                 if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.NoMove) != 0)
@@ -308,7 +308,7 @@ namespace OpenSim.Services.GridService
             // Everything is ok, let's register
             RegionData rdata = RegionInfo2RegionData(regionInfos);
             rdata.ScopeID = scopeID;
-            
+
             if (region != null)
             {
                 int oldFlags = Convert.ToInt32(region.Data["flags"]);
@@ -346,9 +346,9 @@ namespace OpenSim.Services.GridService
             }
 
             m_log.DebugFormat
-                ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", 
-                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, 
-                regionInfos.RegionCoordX, regionInfos.RegionCoordY, 
+                ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}",
+                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY,
+                regionInfos.RegionCoordX, regionInfos.RegionCoordY,
                 (OpenSim.Framework.RegionFlags)flags);
 
             return String.Empty;
@@ -404,7 +404,7 @@ namespace OpenSim.Services.GridService
         {
             List<GridRegion> rinfos = new List<GridRegion>();
             RegionData region = m_Database.Get(regionID, scopeID);
-            
+
             if (region != null)
             {
                 List<RegionData> rdatas = m_Database.Get(
@@ -430,10 +430,10 @@ namespace OpenSim.Services.GridService
             else
             {
                 m_log.WarnFormat(
-                    "[GRID SERVICE]: GetNeighbours() called for scope {0}, region {1} but no such region found", 
+                    "[GRID SERVICE]: GetNeighbours() called for scope {0}, region {1} but no such region found",
                     scopeID, regionID);
             }
-            
+
             return rinfos;
         }
 
@@ -451,7 +451,7 @@ namespace OpenSim.Services.GridService
         //     be the base coordinate of the region.
         // The snapping is technically unnecessary but is harmless because regions are always
         //     multiples of the legacy region size (256).
-        
+
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
             uint regionX = Util.WorldToRegionLoc((uint)x);
@@ -505,7 +505,7 @@ namespace OpenSim.Services.GridService
                 string regionName = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName))
                     return null;
-            
+
                 string mapname;
                 bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI);
                 if(localGrid)
@@ -531,11 +531,11 @@ namespace OpenSim.Services.GridService
                                 rinfos.Add(RegionData2RegionInfo(rdata));
                             }
                         }
-                    }   
+                    }
                     if(haveMatch)
                         return rinfos;
                 }
-                
+
                 rdatas = m_Database.Get(Util.EscapeForLike(mapname)+ "%", scopeID);
                 if (rdatas != null && (rdatas.Count > 0))
                 {
@@ -554,7 +554,7 @@ namespace OpenSim.Services.GridService
                                 break;
                             }
                         }
-                    }   
+                    }
                     if(haveMatch)
                         return rinfos;
                 }
@@ -597,7 +597,7 @@ namespace OpenSim.Services.GridService
                 string regionName = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName))
                     return null;
-            
+
                 string mapname;
                 bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI);
                 if(localGrid)
@@ -666,7 +666,7 @@ namespace OpenSim.Services.GridService
             return rinfo;
         }
 
-        #endregion 
+        #endregion
 
         public List<GridRegion> GetDefaultRegions(UUID scopeID)
         {
@@ -705,7 +705,7 @@ namespace OpenSim.Services.GridService
             int normalDefaultRegionsFoundOnline = ret.Count - hgDefaultRegionsFoundOnline;
 
             m_log.DebugFormat(
-                "[GRID SERVICE]: GetDefaultHypergridRegions returning {0} hypergrid default and {1} normal default regions", 
+                "[GRID SERVICE]: GetDefaultHypergridRegions returning {0} hypergrid default and {1} normal default regions",
                 hgDefaultRegionsFoundOnline, normalDefaultRegionsFoundOnline);
 
             return ret;
@@ -742,7 +742,7 @@ namespace OpenSim.Services.GridService
             m_log.DebugFormat("[GRID SERVICE]: Hyperlinks returned {0} regions", ret.Count);
             return ret;
         }
-        
+
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             RegionData region = m_Database.Get(regionID, scopeID);
@@ -994,7 +994,7 @@ namespace OpenSim.Services.GridService
         }
 
         /// <summary>
-        /// Gets the grid extra service URls we wish for the region to send in OpenSimExtras to dynamically refresh 
+        /// Gets the grid extra service URls we wish for the region to send in OpenSimExtras to dynamically refresh
         /// parameters in the viewer used to access services like map, search and destination guides.
         /// <para>see "SimulatorFeaturesModule" </para>
         /// </summary>
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs
index 444f79b..7522e64 100644
--- a/OpenSim/Services/GridService/GridServiceBase.cs
+++ b/OpenSim/Services/GridService/GridServiceBase.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Services.GridService
                 connString = gridConfig.GetString("ConnectionString", connString);
                 realm = gridConfig.GetString("Realm", realm);
             }
-            
+
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index aa394ce..dabfd3b 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.GridService
         {
             return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason);
         }
-        
+
         public bool IsLocalGrid(string serverURI)
         {
             return serverURI == m_ThisGatekeeper;
@@ -240,7 +240,7 @@ namespace OpenSim.Services.GridService
 
         private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
         {
-            m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", 
+            m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>",
                 ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI),
                 remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc));
 
@@ -270,7 +270,7 @@ namespace OpenSim.Services.GridService
 
             if (remoteRegionName != string.Empty)
                 regInfo.RegionName = remoteRegionName;
-                
+
             regInfo.RegionLocX = xloc;
             regInfo.RegionLocY = yloc;
             regInfo.ScopeID = scopeID;
@@ -359,7 +359,7 @@ namespace OpenSim.Services.GridService
                 regInfo.RegionName = externalName;
 
             m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
-                
+
             // Get the map image
             regInfo.TerrainImage = GetMapImage(regionID, imageURL);
 
@@ -383,7 +383,7 @@ namespace OpenSim.Services.GridService
                 OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);
                 if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0)
                 {
-                    regInfo = new GridRegion(); 
+                    regInfo = new GridRegion();
                     regInfo.RegionID = regions[0].RegionID;
                     regInfo.ScopeID = m_ScopeID;
                 }
@@ -491,7 +491,7 @@ namespace OpenSim.Services.GridService
             {
                 MainConsole.Instance.Output(
                     String.Format("{0}\n{2,-32} {1}\n",
-                        r.RegionName, r.RegionID, 
+                        r.RegionName, r.RegionID,
                         String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
                                     Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY)
                         )
@@ -515,7 +515,7 @@ namespace OpenSim.Services.GridService
             RunHGCommand(command, cmdparams);
 
         }
-        
+
         private void RunLinkRegionCommand(string[] cmdparams)
         {
             int xloc, yloc;
@@ -573,7 +573,7 @@ namespace OpenSim.Services.GridService
                 if (cmdparams[2].StartsWith("http"))
                 {
                     RunLinkRegionCommand(cmdparams);
-                } 
+                }
                 else if (cmdparams[2].Contains(":"))
                 {
                     // New format
diff --git a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
index 40a29b3..69a3c44 100644
--- a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.GridService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 41e2b40..b80700f 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.HypergridService
                 // These are mandatory, the others aren't
                 if (gridService == string.Empty || presenceService == string.Empty)
                     throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
-                
+
                 string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
                 UUID.TryParse(scope, out m_ScopeID);
                 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
@@ -135,7 +135,7 @@ namespace OpenSim.Services.HypergridService
                 m_AllowedClients = Util.GetConfigVarFromSections<string>(
                         config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
                 m_DeniedClients = Util.GetConfigVarFromSections<string>(
-                        config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); 
+                        config, "DeniedClients", possibleAccessControlConfigSections, string.Empty);
                 m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true);
 
                 LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions);
@@ -219,11 +219,11 @@ namespace OpenSim.Services.HypergridService
             {
                 // Don't even check the given regionID
                 m_log.DebugFormat(
-                    "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", 
-                    m_DefaultGatewayRegion.RegionName, 
+                    "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.",
+                    m_DefaultGatewayRegion.RegionName,
                     m_DefaultGatewayRegion.RegionID,
                     m_DefaultGatewayRegion.ServerURI,
-                    agentID, 
+                    agentID,
                     agentHomeURI == null ? "" : " @ " + agentHomeURI);
 
                 message = "Teleporting to the default region.";
@@ -244,10 +244,10 @@ namespace OpenSim.Services.HypergridService
 
             m_log.DebugFormat(
                 "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.",
-                region.RegionName, 
+                region.RegionName,
                 region.RegionID,
                 region.ServerURI,
-                agentID, 
+                agentID,
                 agentHomeURI == null ? "" : " @ " + agentHomeURI);
 
             return region;
@@ -308,7 +308,7 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL);
-            
+
             //
             // Check for impersonations
             //
@@ -461,7 +461,7 @@ namespace OpenSim.Services.HypergridService
             EntityTransferContext ctx = new EntityTransferContext();
 
             if (!m_SimulationService.QueryAccess(
-                destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), 
+                destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(),
                 true, aCircuit.startpos, new List<UUID>(), ctx, out reason))
                 return false;
 
@@ -495,7 +495,7 @@ namespace OpenSim.Services.HypergridService
             }
             else
             {
-                IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
+                IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
 
                 try
                 {
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index b83fb1e..a66478e 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
-        #endregion 
+        #endregion
 
         protected void AdjustIdentifiers(AssetMetadata meta)
         {
diff --git a/OpenSim/Services/HypergridService/HGFSAssetService.cs b/OpenSim/Services/HypergridService/HGFSAssetService.cs
index 54e8ccb..2b30b3a 100644
--- a/OpenSim/Services/HypergridService/HGFSAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGFSAssetService.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
-        #endregion 
+        #endregion
 
         protected void AdjustIdentifiers(AssetMetadata meta)
         {
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index 6e35a88..d3b4f18 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Services.HypergridService
 
             List<UUID> localFriendsOnline = new List<UUID>();
 
-            m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status", 
+            m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status",
                 foreignUserID, friends.Count, (online ? "online" : "offline"));
 
             // First, let's double check that the reported friends are, indeed, friends of that user
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
index 32ca09a..d1739cf 100644
--- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs
+++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Services.HypergridService
                     else if (o is string)
                         url = (string)o;
 
-                    // We need to compare the current location with the previous 
+                    // We need to compare the current location with the previous
                     // or the recursive loop will never end because it will never try to lookup the agent again
                     if (!firstTime)
                     {
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index a0d25e3..f14593e 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.HypergridService
             //
             IConfig invConfig = config.Configs[m_ConfigName];
             if (invConfig != null)
-            {                
+            {
                 // realm = authConfig.GetString("Realm", realm);
                 string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
                 if (userAccountsDll == string.Empty)
@@ -82,7 +82,7 @@ namespace OpenSim.Services.HypergridService
                     throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
 
                 m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
-                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
+                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);
 
                 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
@@ -113,7 +113,7 @@ namespace OpenSim.Services.HypergridService
 
             if (folders.Length > 0)
                 return ConvertToOpenSim(folders[0]);
-            
+
             // make one
             XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase");
             return ConvertToOpenSim(suitcase);
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService
         {
             return new InventoryCollection[0];
         }
-        
+
         //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         //{
         //}
diff --git a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs
index a53435b..5e98af9 100644
--- a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
-        #endregion 
+        #endregion
 
         protected void AdjustIdentifiers(AssetMetadata meta)
         {
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 7f14e8e..d1f2e70 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Services.HypergridService
                     throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
 
 //                m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
-//                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
+//                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);
 
 //                m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
@@ -318,7 +318,7 @@ namespace OpenSim.Services.HypergridService
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner);
                 return false;
             }
-            
+
             if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner);
@@ -505,11 +505,11 @@ namespace OpenSim.Services.HypergridService
             // Warp! Root folder for travelers
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type" },
-                    new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); 
+                    new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() });
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
-            
+
             // check to see if we have the old Suitcase folder
             folders = m_Database.GetFolders(
                     new string[] { "agentID", "folderName", "parentFolderID" },
@@ -629,7 +629,7 @@ namespace OpenSim.Services.HypergridService
                 {
                     if (a.Wearables[i][j].ItemID == itemID)
                     {
-                        //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); 
+                        //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID);
                         return true;
                     }
                 }
@@ -638,7 +638,7 @@ namespace OpenSim.Services.HypergridService
             // Check attachments
             if (a.GetAttachmentForItem(itemID) != null)
             {
-                //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); 
+                //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID);
                 return true;
             }
 
diff --git a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
index df4751e..31b9f4e 100644
--- a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.HypergridService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
index 25ffb63..ae0f7ce 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -16,7 +16,7 @@ namespace OpenSim.Services.HypergridService
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private ExpiringCache<UUID, UserAccount> m_UUIDCache;
 
         private IUserAccountService m_UserAccountService;
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index e701ec6..ba3cb2f 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Services.HypergridService
 
         public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason)
         {
-            m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
+            m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}",
                 agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI);
 
             string gridName = gatekeeper.ServerURI;
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService
             agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
             TravelingAgentInfo old = null;
             TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old);
-            
+
             bool success = false;
             string myExternalIP = string.Empty;
 
@@ -288,7 +288,7 @@ namespace OpenSim.Services.HypergridService
 
             if (!success)
             {
-                m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", 
+                m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}",
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 if (old != null)
@@ -301,11 +301,11 @@ namespace OpenSim.Services.HypergridService
 
             // Everything is ok
 
-                        if (!fromLogin)
-                        {
-                                // Update the perceived IP Address of our grid 
-                                m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
-                        }
+            if (!fromLogin)
+            {
+                // Update the perceived IP Address of our grid
+                m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
+            }
 
             travel.MyIpAddress = myExternalIP;
 
@@ -376,7 +376,7 @@ namespace OpenSim.Services.HypergridService
             if (m_BypassClientVerification)
                 return true;
 
-            m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", 
+            m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.",
                 sessionID, reportedIP);
 
             HGTravelingData hgt = m_Database.Get(sessionID);
@@ -535,7 +535,7 @@ namespace OpenSim.Services.HypergridService
                     FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID);
                     foreach (FriendInfo finfo in friendInfos)
                     {
-                        if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && 
+                        if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) &&
                             (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1))
                         {
                             // great!
@@ -641,7 +641,7 @@ namespace OpenSim.Services.HypergridService
                 foreach (FriendInfo f in friends)
                     if (f.Friend.StartsWith(targetUserID.ToString()))
                     {
-                        // Let's remove the secret 
+                        // Let's remove the secret
                         UUID id; string tmp = string.Empty, secret = string.Empty;
                         if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret))
                             return f.Friend.Replace(secret, "0");
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
index ae2c5ac..af92326 100644
--- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
+++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Services.Interfaces
 {
     public class AgentPrefs
     {
-        public AgentPrefs(UUID principalID) 
+        public AgentPrefs(UUID principalID)
         {
             PrincipalID = principalID;
         }
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 28c3315..170dc97 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="id"></param>
         /// <returns></returns>
         AssetMetadata GetMetadata(string id);
-        
+
         /// <summary>
         /// Get an asset's data, ignoring the metadata.
         /// </summary>
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Interfaces
         AssetBase GetCached(string id);
 
         /// <summary>
-        /// Get an asset synchronously or asynchronously (depending on whether 
+        /// Get an asset synchronously or asynchronously (depending on whether
         /// it is locally cached) and fire a callback with the fetched asset
         /// </summary>
         /// <param name="id">The asset id</param>
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces
         /// </param>
         /// <returns>True if the id was parseable, false otherwise</returns>
         bool Get(string id, Object sender, AssetRetrieved handler);
-        
+
         /// <summary>
         /// Check if assets exist in the database.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index cdcfad9..1ff092f 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces
     // Generic Authentication service used for identifying
     // and authenticating principals.
     // Principals may be clients acting on users' behalf,
-    // or any other components that need 
+    // or any other components that need
     // verifiable identification.
     //
     public interface IAuthenticationService
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs
index e5c68f6..d4c697a 100644
--- a/OpenSim/Services/Interfaces/IAuthorizationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 namespace OpenSim.Services.Interfaces
 {
     // Generic Authorization service used for authorizing principals in a particular region
-    
+
     public interface IAuthorizationService
     {
         /// <summary>
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces
         bool IsAuthorizedForRegion(
             string userID, string firstName, string lastName, string regionID, out string message);
     }
-    
+
     public class AuthorizationRequest
     {
         private string m_userID;
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Interfaces
             m_userID = ID;
             m_regionID = RegionID;
         }
-        
+
         public AuthorizationRequest(
             string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID)
         {
@@ -80,44 +80,44 @@ namespace OpenSim.Services.Interfaces
             m_regionName = RegionName;
             m_regionID = RegionID;
         }
-        
+
         public string ID
         {
             get { return m_userID; }
             set { m_userID = value; }
         }
-        
+
         public string FirstName
         {
             get { return m_firstname; }
             set { m_firstname = value; }
         }
-        
+
         public string SurName
         {
             get { return m_surname; }
             set { m_surname = value; }
         }
-        
+
         public string Email
         {
             get { return m_email; }
             set { m_email = value; }
         }
-        
+
         public string RegionName
         {
             get { return m_regionName; }
             set { m_regionName = value; }
         }
-                        
+
         public string RegionID
         {
             get { return m_regionID; }
             set { m_regionID = value; }
         }
     }
-    
+
     public class AuthorizationResponse
     {
         private bool m_isAuthorized;
@@ -132,13 +132,13 @@ namespace OpenSim.Services.Interfaces
             m_isAuthorized = isAuthorized;
             m_message = message;
         }
-        
+
         public bool IsAuthorized
         {
             get { return m_isAuthorized; }
             set { m_isAuthorized = value; }
         }
-        
+
         public string Message
         {
             get { return m_message; }
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 99b71b9..b4dc511 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="appearance"></param>
         /// <returns></returns>
         bool SetAppearance(UUID userID, AvatarAppearance appearance);
-        
+
         /// <summary>
         /// Called by the login service
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces
         bool ResetAvatar(UUID userID);
 
         /// <summary>
-        /// These methods raison d'etre: 
+        /// These methods raison d'etre:
         /// No need to send the entire avatar data (SetAvatar) for changing attachments
         /// </summary>
         /// <param name="userID"></param>
@@ -291,8 +291,8 @@ namespace OpenSim.Services.Interfaces
                     byte[] binary = new byte[vps.Length];
 
                     for (int i = 0; i < vps.Length; i++)
-                        binary[i] = (byte)Convert.ToInt32(vps[i]);
-                    
+                        binary[i] = (byte)Convert.ToInt32(vps[i]);
+
                     appearance.VisualParams = binary;
                 }
 
diff --git a/OpenSim/Services/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs
index 719563d..9b64a39 100644
--- a/OpenSim/Services/Interfaces/IEstateDataService.cs
+++ b/OpenSim/Services/Interfaces/IEstateDataService.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="regionID"></param>
         /// <param name="create">If true, then an estate is created if one is not found.</param>
-        /// <returns></returns>        
+        /// <returns></returns>
         EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
+
         /// <summary>
         /// Load estate settings for an estate ID.
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         EstateSettings LoadEstateSettings(int estateID);
 
         /// <summary>
@@ -56,60 +56,60 @@ namespace OpenSim.Services.Interfaces
         /// A <see cref="EstateSettings"/>
         /// </returns>
         EstateSettings CreateNewEstate();
-        
+
         /// <summary>
         /// Load/Get all estate settings.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<EstateSettings> LoadEstateSettingsAll();
-        
+
         /// <summary>
         /// Store estate settings.
         /// </summary>
         /// <remarks>
         /// This is also called by EstateSettings.Save()</remarks>
-        /// <param name="es"></param>        
+        /// <param name="es"></param>
         void StoreEstateSettings(EstateSettings es);
-        
+
         /// <summary>
         /// Get estate IDs.
         /// </summary>
         /// <param name="search">Name of estate to search for.  This is the exact name, no parttern matching is done.</param>
-        /// <returns></returns>        
+        /// <returns></returns>
         List<int> GetEstates(string search);
-        
+
         /// <summary>
         /// Get the IDs of all estates owned by the given user.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesByOwner(UUID ownerID);        
-        
+        List<int> GetEstatesByOwner(UUID ownerID);
+
         /// <summary>
         /// Get the IDs of all estates.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesAll();
-            
+
         /// <summary>
         /// Link a region to an estate.
         /// </summary>
         /// <param name="regionID"></param>
         /// <param name="estateID"></param>
-        /// <returns>true if the link succeeded, false otherwise</returns>        
+        /// <returns>true if the link succeeded, false otherwise</returns>
         bool LinkRegion(UUID regionID, int estateID);
-        
+
         /// <summary>
         /// Get the UUIDs of all the regions in an estate.
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         List<UUID> GetRegions(int estateID);
-        
+
         /// <summary>
         /// Delete an estate
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns>true if the delete succeeded, false otherwise</returns>        
+        /// <returns>true if the delete succeeded, false otherwise</returns>
         bool DeleteEstate(int estateID);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 63c6e5f..66e5870 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces
         GridRegion GetRegionByName(UUID scopeID, string regionName);
 
         /// <summary>
-        /// Get information about regions starting with the provided name. 
+        /// Get information about regions starting with the provided name.
         /// </summary>
         /// <param name="name">
         /// The name to match against.
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces
         /// </param>
         /// <returns>
         /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the
-        /// grid-server couldn't be contacted or returned an error, return null. 
+        /// grid-server couldn't be contacted or returned an error, return null.
         /// </returns>
         List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber);
 
@@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces
 #pragma warning restore 414
 
         /// <summary>
-        /// The port by which http communication occurs with the region 
+        /// The port by which http communication occurs with the region
         /// </summary>
         public uint HttpPort { get; set; }
 
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         public string ServerURI
         {
-            get { 
+            get {
                 if (!String.IsNullOrEmpty(m_serverURI)) {
                     return m_serverURI;
                 } else {
@@ -158,7 +158,7 @@ namespace OpenSim.Services.Interfaces
                         return "http://" + m_externalHostName + ":" + HttpPort + "/";
                 }
             }
-            set { 
+            set {
                 if ( value == null)
                 {
                     m_serverURI = String.Empty;
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Interfaces
             RegionSecret = ConvertFrom.RegionSecret;
             EstateOwner = ConvertFrom.EstateOwner;
         }
-                
+
         public GridRegion(Dictionary<string, object> kvp)
         {
             if (kvp.ContainsKey("uuid"))
@@ -424,7 +424,7 @@ namespace OpenSim.Services.Interfaces
             // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
             //                         LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
         }
-                
+
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 2e7237e..6ad0f42 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces
     public class GridUserInfo
     {
         public string UserID;
-        
+
         public UUID HomeRegionID;
         public Vector3 HomePosition;
         public Vector3 HomeLookAt;
@@ -45,13 +45,13 @@ namespace OpenSim.Services.Interfaces
         public UUID LastRegionID;
         public Vector3 LastPosition;
         public Vector3 LastLookAt;
-        
+
         public bool Online;
         public DateTime Login;
         public DateTime Logout;
 
         public GridUserInfo() {}
-        
+
         public GridUserInfo(Dictionary<string, object> kvp)
         {
             if (kvp.ContainsKey("UserID"))
@@ -96,11 +96,11 @@ namespace OpenSim.Services.Interfaces
             result["Online"] = Online.ToString();
             result["Login"] = Login.ToString();
             result["Logout"] = Logout.ToString();
-            
+
             return result;
         }
     }
-    
+
     public interface IGridUserService
     {
         GridUserInfo LoggedIn(string userID);
@@ -115,7 +115,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="lastLookAt">Last normalized look direction for the user</param>
         /// <returns>True if the logout request was successfully processed, otherwise false</returns>
         bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
-        
+
         bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt);
 
         /// <summary>
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="lastLookAt">Normalized look direction</param>
         /// <returns>True if the user's last position was successfully updated, otherwise false</returns>
         bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
-        
+
         GridUserInfo GetGridUserInfo(string userID);
         GridUserInfo[] GetGridUserInfo(string[] userID);
     }
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 1815e6c..e0a63ca 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces
     public interface IGatekeeperService
     {
         bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY);
-        
+
         /// <summary>
         /// Returns the region a Hypergrid visitor should enter.
         /// </summary>
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces
     public interface IUserAgentService
     {
         bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
-        
+
         void LogoutAgent(UUID userID, UUID sessionID);
 
         /// <summary>
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Interfaces
         /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns>
         /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         string LocateUser(UUID userID);
-        
+
         /// <summary>
         /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index c0c9ba8..582ea90 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="folderIDs"></param>
         /// <returns>Inventory content.</returns>
         InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs);
-        
+
         /// <summary>
         /// Gets the items inside a folder
         /// </summary>
@@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// that hold the given assetID.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="assetID"></param>
-        /// <returns>The permissions or 0 if no such asset is found in 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         int GetAssetPermissions(UUID userID, UUID assetID);
     }
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs
index 588aaaf..db501fd 100644
--- a/OpenSim/Services/Interfaces/IOfflineIMService.cs
+++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Services.Interfaces
     public interface IOfflineIMService
     {
         List<GridInstantMessage> GetMessages(UUID principalID);
-        
+
         bool StoreMessage(GridInstantMessage im, out string reason);
-        
+
         /// <summary>
         /// Delete messages to or from this user (or group).
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index d89f6ff..a01897a 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="destination"></param>
         /// <param name="aCircuit"></param>
         /// <param name="flags"></param>
-        /// <param name="reason">Reason message in the event of a failure.</param>        
+        /// <param name="reason">Reason message in the event of a failure.</param>
         bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason);
 
         /// <summary>
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 121baa8..867c623 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -40,19 +40,19 @@ namespace OpenSim.Services.Interfaces
         bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result);
         bool ClassifiedDelete(UUID recordId);
         #endregion Classifieds
-        
+
         #region Picks
         OSD AvatarPicksRequest(UUID creatorId);
         bool PickInfoRequest(ref UserProfilePick pick, ref string result);
         bool PicksUpdate(ref UserProfilePick pick, ref string result);
         bool PicksDelete(UUID pickId);
         #endregion Picks
-        
+
         #region Notes
         bool AvatarNotesRequest(ref UserProfileNotes note);
         bool NotesUpdate(ref UserProfileNotes note, ref string result);
         #endregion Notes
-        
+
         #region Profile Properties
         bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
         bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces
         bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
         bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
         #endregion User Preferences
-        
+
         #region Interests
         bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
         #endregion Interests
diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs
index bda8151..8c4d14b 100644
--- a/OpenSim/Services/Interfaces/OpenProfileClient.cs
+++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserProfilesService
     public class OpenProfileClient
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private string m_serverURI;
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace OpenSim.Services.UserProfilesService
         {
             m_serverURI = serverURI;
         }
-               
+
         /// <summary>
         /// Gets an avatar's profile using the OpenProfile protocol.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
index 115afa2..6c683b4 100644
--- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.Interfaces")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
index 7295103..2e3fb3e 100644
--- a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.InventoryService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
index 3cfd125..2e4637c 100644
--- a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
+++ b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.InventoryService.Tests
     {
         private IInventoryService CreateXInventoryService()
         {
-            IConfigSource config = new IniConfigSource();            
+            IConfigSource config = new IniConfigSource();
             config.AddConfig("InventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
@@ -73,19 +73,19 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId = TestHelpers.ParseTail(0x30);
             int invType = (int)InventoryType.Animation;
             int assetType = (int)AssetType.Animation;
-            string itemName = "item1";           
+            string itemName = "item1";
 
             IInventoryService xis = CreateXInventoryService();
 
-            InventoryItemBase itemToStore 
-                = new InventoryItemBase(itemId, ownerId) 
-                { 
-                    CreatorIdentification = creatorId.ToString(), 
-                    AssetID = assetId, 
-                    Name = itemName,  
-                    Folder = folderId, 
-                    InvType = invType, 
-                    AssetType = assetType 
+            InventoryItemBase itemToStore
+                = new InventoryItemBase(itemId, ownerId)
+                {
+                    CreatorIdentification = creatorId.ToString(),
+                    AssetID = assetId,
+                    Name = itemName,
+                    Folder = folderId,
+                    InvType = invType,
+                    AssetType = assetType
                 };
 
             Assert.That(xis.AddItem(itemToStore), Is.True);
@@ -115,20 +115,20 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId = TestHelpers.ParseTail(0x30);
             int invType = (int)InventoryType.Animation;
             int assetType = (int)AssetType.Animation;
-            string itemName = "item1";           
+            string itemName = "item1";
             string itemName2 = "item2";
 
             IInventoryService xis = CreateXInventoryService();
 
-            InventoryItemBase itemToStore 
-                = new InventoryItemBase(itemId, ownerId) 
-                { 
-                    CreatorIdentification = creatorId.ToString(), 
-                    AssetID = assetId, 
-                    Name = itemName,  
-                    Folder = folderId, 
-                    InvType = invType, 
-                    AssetType = assetType 
+            InventoryItemBase itemToStore
+                = new InventoryItemBase(itemId, ownerId)
+                {
+                    CreatorIdentification = creatorId.ToString(),
+                    AssetID = assetId,
+                    Name = itemName,
+                    Folder = folderId,
+                    InvType = invType,
+                    AssetType = assetType
                 };
 
             Assert.That(xis.AddItem(itemToStore), Is.True);
@@ -149,7 +149,7 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId2 = TestHelpers.ParseTail(0x70);
             int invType2 = (int)InventoryType.CallingCard;
             int assetType2 = (int)AssetType.CallingCard;
-            string itemName3 = "item3"; 
+            string itemName3 = "item3";
 
             itemToStore.CreatorIdentification = creatorId2.ToString();
             itemToStore.Owner = ownerId2;
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 004c4bf..b8ed46c 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Services.InventoryService
         protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID, UUID rootID)
         {
 //            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID);
-            
+
             XInventoryFolder[] allFolders = m_Database.GetFolders(
                     new string[] { "agentID", "parentFolderID" },
                     new string[] { principalID.ToString(), rootID.ToString() });
@@ -192,7 +192,7 @@ namespace OpenSim.Services.InventoryService
 
 //            m_log.DebugFormat(
 //                "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID);
-            
+
             return sysFolders;
         }
 
@@ -234,7 +234,7 @@ namespace OpenSim.Services.InventoryService
                     break;
                 }
             }
-            
+
             if (root == null) // oops
                 root = folders[0];
 
@@ -255,7 +255,7 @@ namespace OpenSim.Services.InventoryService
 
                 return null;
             }
-            
+
             return GetSystemFolderForType(rootFolder, type);
         }
 
@@ -335,11 +335,11 @@ namespace OpenSim.Services.InventoryService
 
             return multiple;
         }
-        
+
         public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         {
 //            m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID);
-            
+
             // Since we probably don't get a valid principal here, either ...
             //
             List<InventoryItemBase> invItems = new List<InventoryItemBase>();
@@ -386,7 +386,7 @@ namespace OpenSim.Services.InventoryService
                         m_log.WarnFormat(
                             "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}",
                             folder.Type, folder.Name, folder.ParentID, folder.Owner);
-    
+
                         return false;
                     }
                 }
@@ -498,7 +498,7 @@ namespace OpenSim.Services.InventoryService
         {
 //            m_log.DebugFormat(
 //                "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner);
-            
+
             return m_Database.StoreItem(ConvertFromOpenSim(item));
         }
 
@@ -516,27 +516,27 @@ namespace OpenSim.Services.InventoryService
             if (retrievedItem == null)
             {
                 m_log.WarnFormat(
-                    "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.", 
+                    "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.",
                     item.Name, item.ID, item.Owner);
 
                 return false;
             }
 
             // Do not allow invariants to change.  Changes to folder ID occur in MoveItems()
-            if (retrievedItem.InvType != item.InvType 
+            if (retrievedItem.InvType != item.InvType
                 || retrievedItem.AssetType != item.AssetType
-                || retrievedItem.Folder != item.Folder 
-                || retrievedItem.CreatorIdentification != item.CreatorIdentification 
+                || retrievedItem.Folder != item.Folder
+                || retrievedItem.CreatorIdentification != item.CreatorIdentification
                 || retrievedItem.Owner != item.Owner)
             {
                 m_log.WarnFormat(
                     "[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})",
-                    retrievedItem.Name, 
-                    retrievedItem.ID, 
-                    retrievedItem.InvType, 
-                    retrievedItem.AssetType, 
-                    retrievedItem.Folder, 
-                    retrievedItem.CreatorIdentification, 
+                    retrievedItem.Name,
+                    retrievedItem.ID,
+                    retrievedItem.InvType,
+                    retrievedItem.AssetType,
+                    retrievedItem.Folder,
+                    retrievedItem.CreatorIdentification,
                     retrievedItem.Owner,
                     item.InvType,
                     item.AssetType,
@@ -639,7 +639,7 @@ namespace OpenSim.Services.InventoryService
                 return new List<InventoryItemBase>();
 
             List<InventoryItemBase> ret = new List<InventoryItemBase>();
-            
+
             foreach (XInventoryItem x in items)
                 ret.Add(ConvertToOpenSim(x));
 
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 0f57c2e..32e14a1 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Services.LLLoginService
 
         static LLFailedLoginResponse()
         {
-            UserProblem = new LLFailedLoginResponse("key", 
+            UserProblem = new LLFailedLoginResponse("key",
                 "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
                 "false");
             GridProblem = new LLFailedLoginResponse("key",
@@ -307,7 +307,7 @@ namespace OpenSim.Services.LLLoginService
                     {
                         DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
                     }
-                
+
                     break;
             }
         }
@@ -417,7 +417,7 @@ namespace OpenSim.Services.LLLoginService
 //            try
 //            {
 //                // First try to fetch DST from Pacific Standard Time, because this is
-//                // the one expected by the viewer. "US/Pacific" is the string to search 
+//                // the one expected by the viewer. "US/Pacific" is the string to search
 //                // on linux and mac, and should work also on Windows (to confirm)
 //                gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
 //            }
@@ -447,7 +447,7 @@ namespace OpenSim.Services.LLLoginService
             ErrorReason = "key";
             welcomeMessage = "Welcome to OpenSim!";
             seedCapability = String.Empty;
-            home = "{'region_handle':[" 
+            home = "{'region_handle':["
                     + "r" + Util.RegionToWorldLoc(1000).ToString()
                     + ","
                     + "r" + Util.RegionToWorldLoc(1000).ToString()
@@ -593,7 +593,7 @@ namespace OpenSim.Services.LLLoginService
                     // responseData["real_currency"] = currency;
                     responseData["currency"] = currency;
                 }
-                
+
                 if (ClassifiedFee != String.Empty)
                     responseData["classified_fee"] = ClassifiedFee;
 
@@ -1070,7 +1070,7 @@ namespace OpenSim.Services.LLLoginService
             get { return activeGestures; }
             set { activeGestures = value; }
         }
-                
+
         public string Home
         {
             get { return home; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 2941f51..fc45f86 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Services.LLLoginService
             m_AllowedClients = Util.GetConfigVarFromSections<string>(
                     config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
             m_DeniedClients = Util.GetConfigVarFromSections<string>(
-                    config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); 
+                    config, "DeniedClients", possibleAccessControlConfigSections, string.Empty);
 
             m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
             m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
@@ -180,13 +180,13 @@ namespace OpenSim.Services.LLLoginService
             string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
             if (hgInvServicePlugin != string.Empty)
             {
-                                // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release
+                // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release
                 string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
-                                if (hgInvServiceArg != String.Empty)
-                                {
-                                        m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax.");
-                                        hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin;
-                                }
+                if (hgInvServiceArg != String.Empty)
+                {
+                    m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax.");
+                    hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin;
+                }
                 m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args);
             }
 
@@ -270,7 +270,7 @@ namespace OpenSim.Services.LLLoginService
             return response;
         }
 
-        public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 
+        public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
             string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient)
         {
             bool success = false;
@@ -283,7 +283,7 @@ namespace OpenSim.Services.LLLoginService
 
             m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
                 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
-            
+
             try
             {
                 //
@@ -452,7 +452,7 @@ namespace OpenSim.Services.LLLoginService
                     guinfo = new GridUserInfo();
                     guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);
                 }
-                
+
                 //
                 // Find the destination region/grid
                 //
@@ -494,7 +494,7 @@ namespace OpenSim.Services.LLLoginService
                 //
                 string reason = string.Empty;
                 GridRegion dest;
-                AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, 
+                AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where,
                     clientVersion, channel, mac, id0, clientIP, flags, out where, out reason, out dest);
                 destination = dest;
                 if (aCircuit == null)
@@ -504,7 +504,7 @@ namespace OpenSim.Services.LLLoginService
                     return new LLFailedLoginResponse("key", reason, "false");
 
                 }
-                // Get Friends list 
+                // Get Friends list
                 FriendInfo[] friendsList = new FriendInfo[0];
                 if (m_FriendsService != null)
                 {
@@ -587,7 +587,7 @@ namespace OpenSim.Services.LLLoginService
                     lookAt = pinfo.HomeLookAt;
                     flags |= TeleportFlags.ViaHome;
                 }
-                
+
                 if (tryDefaults)
                 {
                     List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
@@ -648,7 +648,7 @@ namespace OpenSim.Services.LLLoginService
                     position = pinfo.LastPosition;
                     lookAt = pinfo.LastLookAt;
                 }
-                
+
                 return region;
             }
             else
@@ -684,7 +684,7 @@ namespace OpenSim.Services.LLLoginService
                                 regions = m_GridService.GetDefaultRegions(scopeID);
                                 if (regions != null && regions.Count > 0)
                                 {
-                                    where = "safe"; 
+                                    where = "safe";
                                     return regions[0];
                                 }
                                 else
@@ -719,7 +719,7 @@ namespace OpenSim.Services.LLLoginService
                                 return null;
                             }
                             // Valid specification of a remote grid
-                            
+
                             regionName = parts[0];
                             string domainLocator = parts[1];
                             parts = domainLocator.Split(new char[] {':'});
@@ -737,7 +737,7 @@ namespace OpenSim.Services.LLLoginService
                         List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
                         if (defaults != null && defaults.Count > 0)
                         {
-                            where = "safe"; 
+                            where = "safe";
                             return defaults[0];
                         }
                         else
@@ -798,7 +798,7 @@ namespace OpenSim.Services.LLLoginService
                 string homeURI = null;
                 if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI"))
                     homeURI = (string)account.ServiceURLs["HomeURI"];
-                
+
                 GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message);
                 return destination;
             }
@@ -917,8 +917,8 @@ namespace OpenSim.Services.LLLoginService
                 return null;
         }
 
-        private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, 
-            AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, 
+        private AgentCircuitData MakeAgent(GridRegion region, UserAccount account,
+            AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position,
             string ipaddress, string viewer, string channel, string mac, string id0)
         {
             AgentCircuitData aCircuit = new AgentCircuitData();
@@ -956,7 +956,7 @@ namespace OpenSim.Services.LLLoginService
             if (account.ServiceURLs == null)
                 return;
 
-            // Old style: get the service keys from the DB 
+            // Old style: get the service keys from the DB
             foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
             {
                 if (kvp.Value != null)
@@ -1053,7 +1053,7 @@ namespace OpenSim.Services.LLLoginService
             switch (subcommand)
             {
                 case "level":
-                    // Set the minimum level to allow login 
+                    // Set the minimum level to allow login
                     // Useful to allow grid update without worrying about users.
                     // or fixing critical issues
                     //
diff --git a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
index ee9c333..005ddd8 100644
--- a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.LLLoginService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 7249e70..c90f5bd 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -23,8 +23,8 @@
  * 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.
- * 
- * The design of this map service is based on SimianGrid's PHP-based 
+ *
+ * The design of this map service is based on SimianGrid's PHP-based
  * map service. See this URL for the original PHP version:
  * https://github.com/openmetaversefoundation/simiangrid/
  */
@@ -291,7 +291,7 @@ namespace OpenSim.Services.MapImageService
         {
             try
             {
-                if (File.Exists(fileName))                    
+                if (File.Exists(fileName))
                     return new Bitmap(fileName);
 
                 else
diff --git a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
index 53a33d6..8f4b9b9 100644
--- a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.MapImageService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 0fe0200..ae92919 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.PresenceService
             data.SessionID = sessionID;
             data.Data = new Dictionary<string, string>();
             data.Data["SecureSessionID"] = secureSessionID.ToString();
-            
+
             m_Database.Store(data);
 
             string prevUserStr = "";
@@ -80,7 +80,7 @@ namespace OpenSim.Services.PresenceService
 
             m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}",
                 data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr);
-            
+
             return true;
         }
 
@@ -92,7 +92,7 @@ namespace OpenSim.Services.PresenceService
                 sessionID,
                 (presence == null) ? null : presence.UserID,
                 (presence == null) ? null : presence.RegionID.ToString());
-            
+
             return m_Database.Delete("SessionID", sessionID.ToString());
         }
 
@@ -144,7 +144,7 @@ namespace OpenSim.Services.PresenceService
         public PresenceInfo GetAgent(UUID sessionID)
         {
             PresenceInfo ret = new PresenceInfo();
-            
+
             PresenceData data = m_Database.Get(sessionID);
             if (data == null)
                 return null;
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
index a4adb2f..7647865 100644
--- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs
+++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Services.PresenceService
                 connString = presenceConfig.GetString("ConnectionString", connString);
                 realm = presenceConfig.GetString("Realm", realm);
             }
-            
+
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
diff --git a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
index af6ec65..a79bc9f 100644
--- a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.PresenceService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
index 5013152..c473d4a 100644
--- a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
+++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Services.UserAccountService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public AgentPreferencesService(IConfigSource config) : base(config) 
+        public AgentPreferencesService(IConfigSource config) : base(config)
         {
             m_log.Debug("[AGENT PREFERENCES SERVICE]: Starting agent preferences service");
         }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index e4bcf15..3cb672e 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Services.UserAccountService
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Initialized;
 
-        public GridUserService(IConfigSource config) : base(config) 
+        public GridUserService(IConfigSource config) : base(config)
         {
             m_log.Debug("[GRID USER SERVICE]: Starting user grid service");
 
diff --git a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
index 8c5f5df..f9a7260 100644
--- a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
+++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.UserAccountService
                 connString = usersConfig.GetString("ConnectionString", connString);
                 realm = usersConfig.GetString("Realm", realm);
             }
-            
+
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
diff --git a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
index 77ca083..0c1464d 100644
--- a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Services.UserAccountService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 706d475..7120aeb 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -764,7 +764,7 @@ namespace OpenSim.Services.UserAccountService
             string[] modelSpecifiers = model.Split();
             if (modelSpecifiers.Length != 2)
             {
-                m_log.WarnFormat("[USER ACCOUNT SERVICE]: Invalid model name \'{0}\'. Falling back to Ruth for {1}", 
+                m_log.WarnFormat("[USER ACCOUNT SERVICE]: Invalid model name \'{0}\'. Falling back to Ruth for {1}",
                                  model, destinationAgent);
                 CreateDefaultAppearanceEntries(destinationAgent);
                 return;
@@ -774,7 +774,7 @@ namespace OpenSim.Services.UserAccountService
             UserAccount modelAccount = GetUserAccount(UUID.Zero, modelSpecifiers[0], modelSpecifiers[1]);
             if (modelAccount == null)
             {
-                m_log.WarnFormat("[USER ACCOUNT SERVICE]: Requested model \'{0}\' not found. Falling back to Ruth for {1}", 
+                m_log.WarnFormat("[USER ACCOUNT SERVICE]: Requested model \'{0}\' not found. Falling back to Ruth for {1}",
                                  model, destinationAgent);
                 CreateDefaultAppearanceEntries(destinationAgent);
                 return;
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 9a52e02..76aa093 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Services.ProfilesService
         static readonly ILog m_log =
             LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         IUserAccountService userAccounts;
 
         public UserProfilesService(IConfigSource config, string configName):
@@ -58,23 +58,23 @@ namespace OpenSim.Services.ProfilesService
                 return;
             }
             Object[] args = null;
-            
+
             args = new Object[] { config };
             string accountService = Config.GetString("UserAccountService", String.Empty);
             if (accountService != string.Empty)
                 userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
-            
+
             args = new Object[] { config };
         }
-        
+
         #region Classifieds
         public OSD AvatarClassifiedsRequest(UUID creatorId)
         {
             OSDArray records = ProfilesData.GetClassifiedRecords(creatorId);
-            
+
             return records;
         }
-        
+
         public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result)
         {
             if(!ProfilesData.UpdateClassifiedRecord(ad, ref result))
@@ -84,74 +84,74 @@ namespace OpenSim.Services.ProfilesService
             result = "success";
             return true;
         }
-        
+
         public bool ClassifiedDelete(UUID recordId)
         {
             if(ProfilesData.DeleteClassifiedRecord(recordId))
                 return true;
-            
+
             return false;
         }
-        
+
         public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result)
         {
             if(ProfilesData.GetClassifiedInfo(ref ad, ref result))
                 return true;
-            
+
             return false;
         }
         #endregion Classifieds
-        
+
         #region Picks
         public OSD AvatarPicksRequest(UUID creatorId)
         {
             OSDArray records = ProfilesData.GetAvatarPicks(creatorId);
-            
+
             return records;
         }
-        
+
         public bool PickInfoRequest(ref UserProfilePick pick, ref string result)
         {
             pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId);
             result = "OK";
             return true;
         }
-        
+
         public bool PicksUpdate(ref UserProfilePick pick, ref string result)
         {
             return ProfilesData.UpdatePicksRecord(pick);
         }
-        
+
         public bool PicksDelete(UUID pickId)
         {
             return ProfilesData.DeletePicksRecord(pickId);
         }
         #endregion Picks
-        
+
         #region Notes
         public bool AvatarNotesRequest(ref UserProfileNotes note)
         {
             return ProfilesData.GetAvatarNotes(ref note);
         }
-        
+
         public bool NotesUpdate(ref UserProfileNotes note, ref string result)
         {
             return ProfilesData.UpdateAvatarNotes(ref note, ref result);
         }
         #endregion Notes
-        
+
         #region Profile Properties
         public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result)
         {
             return ProfilesData.GetAvatarProperties(ref prop, ref result);
         }
-        
+
         public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result)
         {
             return ProfilesData.UpdateAvatarProperties(ref prop, ref result);
         }
         #endregion Profile Properties
-        
+
         #region Interests
         public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result)
         {
@@ -254,7 +254,7 @@ namespace OpenSim.Services.ProfilesService
         {
             return ProfilesData.GetUserAppData(ref prop, ref result);
         }
-        
+
         public bool SetUserAppData(UserAppData prop, ref string result)
         {
             return true;
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index c31578f..48b43a6 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Services.ProfilesService
                 if (string.IsNullOrEmpty(connString))
                     connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
-            
+
             IConfig ProfilesConfig = config.Configs[configName];
             if (ProfilesConfig != null)
             {
@@ -76,7 +76,7 @@ namespace OpenSim.Services.ProfilesService
                 connString = ProfilesConfig.GetString("ConnectionString", connString);
                 realm = ProfilesConfig.GetString("Realm", realm);
             }
-            
+
             ProfilesData = LoadPlugin<IProfilesData>(dllName, new Object[] { connString });
             if (ProfilesData == null)
                 throw new Exception("Could not find a storage interface in the given module");
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
index fed7a16..7d3aee3 100644
--- a/OpenSim/Tests/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Tests.Clients.GridClient
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public static void Main(string[] args)
         {
             ConsoleAppender consoleAppender = new ConsoleAppender();
@@ -62,7 +62,7 @@ namespace OpenSim.Tests.Clients.GridClient
             GridRegion r2 = CreateRegion("Test Region 2", 1001, 1000);
             GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000);
 
-            Console.WriteLine("[GRID CLIENT]: *** Registering region 1"); 
+            Console.WriteLine("[GRID CLIENT]: *** Registering region 1");
             string msg = m_Connector.RegisterRegion(UUID.Zero, r1);
             if (msg == String.Empty)
                 Console.WriteLine("[GRID CLIENT]: Successfully registered region 1");
@@ -149,7 +149,7 @@ namespace OpenSim.Tests.Clients.GridClient
                 Console.WriteLine("[GRID CLIENT]: GetRegionsByName returned " + regions.Count + " regions");
 
             Console.WriteLine("[GRID CLIENT]: *** GetRegionRange (this should return 2 regions)");
-            regions = m_Connector.GetRegionRange(UUID.Zero, 
+            regions = m_Connector.GetRegionRange(UUID.Zero,
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002),
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) );
             if (regions == null)
@@ -198,7 +198,7 @@ namespace OpenSim.Tests.Clients.GridClient
             region.ExternalHostName = "127.0.0.1";
             region.HttpPort = 9000;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
-          
+
             return region;
         }
     }
diff --git a/OpenSim/Tests/Common/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
index d027d59..d6a03cd 100644
--- a/OpenSim/Tests/Common/DatabaseTestAttribute.cs
+++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
@@ -32,13 +32,13 @@ using NUnit.Framework;
 
 namespace OpenSim.Tests.Common
 {
-    [AttributeUsage(AttributeTargets.All, 
-        AllowMultiple=false, 
+    [AttributeUsage(AttributeTargets.All,
+        AllowMultiple=false,
         Inherited=true)]
     public class DatabaseTestAttribute : LongRunningAttribute
     {
         public DatabaseTestAttribute() : base("Database")
-        { 
+        {
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 7af8bed..974da4c 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common
         {
             return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random());
         }
-        
+
 //        /// <summary>
 //        /// Create and store a notecard asset with a random uuid and dummy text.
 //        /// </summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Tests.Common
         {
             return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog);
         }
-                
+
         /// <summary>
         /// Create an asset from the given object.
         /// </summary>
@@ -102,12 +102,12 @@ namespace OpenSim.Tests.Common
         public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog)
         {
             return CreateAsset(
-                assetUuid, 
-                AssetType.Object, 
-                Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), 
+                assetUuid,
+                AssetType.Object,
+                Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)),
                 sog.OwnerID);
         }
-        
+
         /// <summary>
         /// Create an asset from the given scene object.
         /// </summary>
@@ -120,8 +120,8 @@ namespace OpenSim.Tests.Common
         public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa)
         {
             return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa);
-        } 
-        
+        }
+
         /// <summary>
         /// Create an asset from the given scene object.
         /// </summary>
@@ -131,12 +131,12 @@ namespace OpenSim.Tests.Common
         public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa)
         {
             return CreateAsset(
-                assetUuid, 
-                AssetType.Object, 
-                Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), 
+                assetUuid,
+                AssetType.Object,
+                Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)),
                 coa.CreatorId);
-        }         
-            
+        }
+
         /// <summary>
         /// Create an asset from the given data.
         /// </summary>
@@ -148,7 +148,7 @@ namespace OpenSim.Tests.Common
 
             return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID);
         }
-        
+
         /// <summary>
         /// Create an asset from the given data.
         /// </summary>
@@ -158,9 +158,9 @@ namespace OpenSim.Tests.Common
             asset.Data = data;
             return asset;
         }
-        
+
         public static string ReadAssetAsString(IAssetService assetService, UUID uuid)
-        {            
+        {
             byte[] assetData = assetService.GetData(uuid.ToString());
             return Encoding.ASCII.GetString(assetData);
         }
diff --git a/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs b/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs
index 82ecf9a..b27c719 100644
--- a/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Tests.Common
             Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null.");
             Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path.");
             Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url.");
- 
+
             Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params.");
             Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash.");
 
diff --git a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
index df9f6f2..753830f 100644
--- a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Tests.Common
     {
         public static ScenePresence AddChildClient(
             Scene scene, LLUDPServer udpServer, UUID agentId, UUID sessionId, uint circuitCode)
-        {           
+        {
             IPEndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999);
 
             UseCircuitCodePacket uccp = new UseCircuitCodePacket();
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 1f6233d..b0c9596 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name='tc'></param>
         /// <param name='neighbourTcs'>
-        /// A list that will be populated with any TestClients set up in response to 
+        /// A list that will be populated with any TestClients set up in response to
         /// being informed about a destination region.
         /// </param>
         public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate(
@@ -71,7 +71,7 @@ namespace OpenSim.Tests.Common
                 Util.RegionHandleToRegionLoc(neighbourHandle, out x, out y);
 
                 m_log.DebugFormat(
-                    "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", 
+                    "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}",
                     x, y, neighbourExternalEndPoint);
 
                 AgentCircuitData newAgent = tc.RequestClientInfo();
@@ -91,20 +91,20 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name='tc'></param>
         /// <param name='neighbourTcs'>
-        /// A list that will be populated with any TestClients set up in response to 
+        /// A list that will be populated with any TestClients set up in response to
         /// being informed about a destination region.
         /// </param>
         public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement(
             TestClient client, List<TestClient> destinationClients)
         {
-            client.OnTestClientSendRegionTeleport 
+            client.OnTestClientSendRegionTeleport
                 += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) =>
             {
                 uint x, y;
                 Util.RegionHandleToRegionLoc(regionHandle, out x, out y);
 
                 m_log.DebugFormat(
-                    "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", 
+                    "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}",
                     x, y, regionExternalEndPoint);
 
                 AgentCircuitData newAgent = client.RequestClientInfo();
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index f8485e0..fbd7e90 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Tests.Common
 
             m_physicsScene = StartPhysicsScene();
 
-            SimDataService 
+            SimDataService
                 = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
         }
 
@@ -146,7 +146,7 @@ namespace OpenSim.Tests.Common
 
             // We must set up a console otherwise setup of some modules may fail
             MainConsole.Instance = new MockConsole();
-            
+
             RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
             regInfo.RegionName = name;
             regInfo.RegionID = id;
@@ -199,13 +199,13 @@ namespace OpenSim.Tests.Common
             m_presenceService.AddRegion(testScene);
             m_presenceService.RegionLoaded(testScene);
             testScene.AddRegionModule(m_presenceService.Name, m_presenceService);
-            
-            
+
+
             testScene.SetModuleInterfaces();
 
             testScene.LandChannel = new TestLandChannel(testScene);
             testScene.LoadWorldMap();
-            
+
             testScene.LoginsEnabled = true;
             testScene.RegisterRegionWithGrid();
 
@@ -217,10 +217,10 @@ namespace OpenSim.Tests.Common
         private static LocalAssetServicesConnector StartAssetService(CoreAssetCache cache)
         {
             IConfigSource config = new IniConfigSource();
-            config.AddConfig("Modules");            
-            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");            
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
             config.AddConfig("AssetService");
-            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");            
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
@@ -235,7 +235,7 @@ namespace OpenSim.Tests.Common
 
                 cache.Initialise(cacheConfig);
             }
-            
+
             return assetService;
         }
 
@@ -257,7 +257,7 @@ namespace OpenSim.Tests.Common
 
         private static LocalInventoryServicesConnector StartInventoryService()
         {
-            IConfigSource config = new IniConfigSource();            
+            IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
@@ -266,8 +266,8 @@ namespace OpenSim.Tests.Common
 
             LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
             inventoryService.Initialise(config);
-            
-            return inventoryService;           
+
+            return inventoryService;
         }
 
         private static LocalGridServicesConnector StartGridService()
@@ -282,7 +282,7 @@ namespace OpenSim.Tests.Common
 
             LocalGridServicesConnector gridService = new LocalGridServicesConnector();
             gridService.Initialise(config);
-            
+
             return gridService;
         }
 
@@ -303,7 +303,7 @@ namespace OpenSim.Tests.Common
 
             LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector();
             userAccountService.Initialise(config);
-            
+
             return userAccountService;
         }
 
@@ -328,7 +328,7 @@ namespace OpenSim.Tests.Common
 
             LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector();
             presenceService.Initialise(config);
-            
+
             return presenceService;
         }
 
@@ -384,8 +384,8 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <remarks>
         /// If called directly, then all the modules must be shared modules.
-        /// 
-        /// We are emulating here the normal calls made to setup region modules 
+        ///
+        /// We are emulating here the normal calls made to setup region modules
         /// (Initialise(), PostInitialise(), AddRegion, RegionLoaded()).
         /// TODO: Need to reuse normal runtime module code.
         /// </remarks>
@@ -655,7 +655,7 @@ namespace OpenSim.Tests.Common
 
             return so;
         }
-        
+
         /// <summary>
         /// Create a scene object part.
         /// </summary>
@@ -664,10 +664,10 @@ namespace OpenSim.Tests.Common
         /// <param name="ownerId"></param>
         /// <returns></returns>
         public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId)
-        {            
+        {
             return new SceneObjectPart(
-                ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
-                    { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };            
+                ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
+                    { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
         }
 
         /// <summary>
@@ -682,10 +682,10 @@ namespace OpenSim.Tests.Common
         /// <param name="ownerId"></param>
         /// <returns></returns>
         public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
-        {            
+        {
             return CreateSceneObject(parts, ownerId, 0x1);
         }
-        
+
         /// <summary>
         /// Create a scene object but do not add it to the scene.
         /// </summary>
@@ -697,10 +697,10 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <returns></returns>
         public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail)
-        {            
+        {
             return CreateSceneObject(parts, ownerId, "", uuidTail);
-        }          
-        
+        }
+
         /// <summary>
         /// Create a scene object but do not add it to the scene.
         /// </summary>
@@ -718,22 +718,22 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <returns></returns>
         public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail)
-        {            
+        {
             string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail);
-            
-            SceneObjectGroup sog 
+
+            SceneObjectGroup sog
                 = new SceneObjectGroup(
                     CreateSceneObjectPart(string.Format("{0}Part1", partNamePrefix), new UUID(rawSogId), ownerId));
-            
+
             if (parts > 1)
                 for (int i = 2; i <= parts; i++)
                     sog.AddPart(
                         CreateSceneObjectPart(
-                            string.Format("{0}Part{1}", partNamePrefix, i), 
+                            string.Format("{0}Part{1}", partNamePrefix, i),
                             new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i - 1)),
                             ownerId));
-            
+
             return sog;
-        }        
+        }
     }
 }
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
index 3a3b33a..e3110f6 100644
--- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
@@ -78,12 +78,12 @@ namespace OpenSim.Tests.Common
                 = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero);
             assetService.Store(ncAsset);
 
-            TaskInventoryItem ncItem 
-                = new TaskInventoryItem 
+            TaskInventoryItem ncItem
+                = new TaskInventoryItem
                     { Name = itemName, AssetID = assetID, ItemID = itemID,
                       Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard };
-            part.Inventory.AddInventoryItem(ncItem, true); 
-            
+            part.Inventory.AddInventoryItem(ncItem, true);
+
             return ncItem;
         }
 
@@ -119,7 +119,7 @@ namespace OpenSim.Tests.Common
         {
             return AddScript(assetService, part, UUID.Random(), UUID.Random(), scriptName, scriptSource);
         }
-                
+
         /// <summary>
         /// Add a simple script to the given part.
         /// </summary>
@@ -145,7 +145,7 @@ namespace OpenSim.Tests.Common
                 = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero);
             assetService.Store(asset);
             TaskInventoryItem item
-                = new TaskInventoryItem 
+                = new TaskInventoryItem
             { Name = scriptName, AssetID = assetId, ItemID = itemId,
                 Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL };
             part.Inventory.AddInventoryItem(item, true);
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
index c62b58e..e6af34b 100644
--- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Tests.Common
 //        /// </param>
 //        /// <returns></returns>
 //        public static CachedUserInfo CreateUserWithInventory(
-//            CommunicationsManager commsManager, string firstName, string lastName, 
+//            CommunicationsManager commsManager, string firstName, string lastName,
 //            UUID userId, OnInventoryReceivedDelegate callback)
 //        {
 //            return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback);
@@ -147,7 +147,7 @@ namespace OpenSim.Tests.Common
             CreateUserWithInventory(scene, ua, pw);
             return ua;
         }
-        
+
         public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw)
         {
             // FIXME: This should really be set up by UserAccount itself
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index e7e145a..5a46201 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Tests.Common
             Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId)
         {
             return AddInventoryItem(
-                scene, itemName, itemId, itemType, asset, userId, 
+                scene, itemName, itemId, itemType, asset, userId,
                 scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name);
         }
 
@@ -128,7 +128,7 @@ namespace OpenSim.Tests.Common
             item.Owner = userId;
             item.AssetType = asset.Type;
             item.InvType = (int)itemType;
-            item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | 
+            item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All |
                 (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer);
             item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All |
                 (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer);
@@ -211,7 +211,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// If true, then folders in the path which already the same name are
-        /// used.  This applies to the terminal folder as well.  
+        /// used.  This applies to the terminal folder as well.
         /// If false, then all folders in the path are created, even if there is already a folder at a particular
         /// level with the same name.
         /// </param>
@@ -236,7 +236,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// If true, then folders in the path which already the same name are
-        /// used.  This applies to the terminal folder as well.  
+        /// used.  This applies to the terminal folder as well.
         /// If false, then all folders in the path are created, even if there is already a folder at a particular
         /// level with the same name.
         /// </param>
@@ -259,7 +259,7 @@ namespace OpenSim.Tests.Common
         /// Create inventory folders starting from a given parent folder
         /// </summary>
         /// <remarks>
-        /// If any stem of the path names folders that already exist then these are not recreated.  This includes the 
+        /// If any stem of the path names folders that already exist then these are not recreated.  This includes the
         /// final folder.
         /// TODO: May need to make it an option to create duplicate folders.
         /// </remarks>
@@ -271,7 +271,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// If true, then folders in the path which already the same name are
-        /// used.  This applies to the terminal folder as well.  
+        /// used.  This applies to the terminal folder as well.
         /// If false, then all folders in the path are created, even if there is already a folder at a particular
         /// level with the same name.
         /// </param>
@@ -299,10 +299,10 @@ namespace OpenSim.Tests.Common
                 else
                     folderIdForCreate = folderId;
 
-                folder 
+                folder
                     = new InventoryFolderBase(
                         folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
-                
+
                 inventoryService.AddFolder(folder);
             }
 //            else
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs
index 9831ea8..6013fcb 100644
--- a/OpenSim/Tests/Common/LongRunningAttribute.cs
+++ b/OpenSim/Tests/Common/LongRunningAttribute.cs
@@ -35,11 +35,11 @@ namespace OpenSim.Tests.Common
     [AttributeUsage(AttributeTargets.All,
         AllowMultiple = false,
         Inherited = true)]
-    public class LongRunningAttribute :  CategoryAttribute 
+    public class LongRunningAttribute :  CategoryAttribute
     {
         public LongRunningAttribute() : this("Long Running Test")
         {
-            
+
         }
 
         protected LongRunningAttribute(string category) : base(category)
diff --git a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
index cb4fb80..d0430ff 100644
--- a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
+++ b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common
     {
         protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();
 
-        public AssetBase FetchAsset(UUID uuid) 
+        public AssetBase FetchAsset(UUID uuid)
         {
             if (AssetsExist(new[] { uuid })[0])
                 return Assets[uuid];
@@ -44,17 +44,17 @@ namespace OpenSim.Tests.Common
                 return null;
         }
 
-        public void CreateAsset(AssetBase asset) 
+        public void CreateAsset(AssetBase asset)
         {
             Assets[asset.FullID] = asset;
         }
 
-        public void UpdateAsset(AssetBase asset) 
+        public void UpdateAsset(AssetBase asset)
         {
             CreateAsset(asset);
         }
 
-        public bool[] AssetsExist(UUID[] uuids) 
+        public bool[] AssetsExist(UUID[] uuids)
         {
             return Array.ConvertAll(uuids, id => Assets.ContainsKey(id));
         }
diff --git a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
index 7f530d0..e9deac7 100644
--- a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
+++ b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
@@ -85,8 +85,8 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        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)
         {
             XGroup group = new XGroup()
@@ -118,13 +118,13 @@ namespace OpenSim.Tests.Common
             }
         }
 
-        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)
         {
         }
 
-        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)
         {
         }
@@ -133,7 +133,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        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)
         {
         }
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Common
 
 
             if (group == null)
-                m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID);               
+                m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID);
 
             return group;
         }
@@ -152,7 +152,7 @@ namespace OpenSim.Tests.Common
         public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}",
                 groupID, groupName);
 
             XGroup xg = GetXGroup(groupID, groupName);
@@ -194,7 +194,7 @@ namespace OpenSim.Tests.Common
         public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}",
                 requestingAgentID, agentID, groupID, acceptNotices, listInProfile);
 
             XGroup group = GetXGroup(groupID, null);
@@ -228,7 +228,7 @@ namespace OpenSim.Tests.Common
         public void AddAgentToGroup(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}",
                 requestingAgentID, agentID, groupID, roleID);
 
             XGroup group = GetXGroup(groupID, null);
@@ -348,7 +348,7 @@ namespace OpenSim.Tests.Common
 
             return notices;
         }
-        
+
         public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID)
         {
             m_log.DebugFormat(
@@ -378,14 +378,14 @@ namespace OpenSim.Tests.Common
                     return gni;
                 }
             }
-           
+
             return null;
         }
-        
+
         public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}",
                 requestingAgentID, groupID, noticeID, fromName, subject, message, binaryBucket.Length);
 
             XGroup group = GetXGroup(groupID, null);
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 8daa19d..a73a0b8 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -174,15 +174,15 @@ namespace OpenSim.Data.Null
     public class NullDataStore : ISimulationDataStore
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>();
         protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>();
-        protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems 
+        protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems
             = new Dictionary<UUID, ICollection<TaskInventoryItem>>();
         protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>();
         protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>();
         protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>();
-        
+
         public void Initialise(string dbfile)
         {
             return;
@@ -196,14 +196,14 @@ namespace OpenSim.Data.Null
         {
             m_regionSettings[rs.RegionUUID] = rs;
         }
-        
+
         public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             //This connector doesn't support the windlight module yet
             //Return default LL windlight settings
             return new RegionLightShareData();
         }
-        
+
         public void RemoveRegionWindlightSettings(UUID regionID)
         {
         }
@@ -238,7 +238,7 @@ namespace OpenSim.Data.Null
 
             if (rs == null)
                 rs = new RegionSettings();
-            
+
             return rs;
         }
 
@@ -250,9 +250,9 @@ namespace OpenSim.Data.Null
             foreach (SceneObjectPart prim in obj.Parts)
             {
 //                m_log.DebugFormat(
-//                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 
+//                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}",
 //                    prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID);
-                            
+
                 m_sceneObjectParts[prim.UUID] = prim;
             }
         }
@@ -266,7 +266,7 @@ namespace OpenSim.Data.Null
                 if (part.ParentGroup.UUID == obj)
                 {
 //                    m_log.DebugFormat(
-//                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 
+//                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}",
 //                        part.Name, part.UUID, obj, regionUUID);
                     m_sceneObjectParts.Remove(part.UUID);
                 }
@@ -281,7 +281,7 @@ namespace OpenSim.Data.Null
         public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
-            
+
             // Create all of the SOGs from the root prims first
             foreach (SceneObjectPart prim in m_sceneObjectParts.Values)
             {
@@ -318,10 +318,10 @@ namespace OpenSim.Data.Null
                     }
                 }
             }
-            
+
             // TODO: Load items.  This is assymetric - we store items as a separate method but don't retrieve them that
             // way!
-            
+
             return new List<SceneObjectGroup>(objects.Values);
         }
 
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
index b6f5760..9d426f6 100644
--- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
+++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.ScriptEngine.Shared;
 namespace OpenSim.Tests.Common
 {
     public class MockScriptEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
-    {      
+    {
         public IConfigSource ConfigSource { get; private set; }
 
         public IConfig Config { get; private set; }
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public string Name { get { return "Mock Script Engine"; } }        
+        public string Name { get { return "Mock Script Engine"; } }
         public string ScriptEngineName { get { return Name; } }
 
         public Type ReplaceableInterface { get { return null; } }
@@ -200,7 +200,7 @@ namespace OpenSim.Tests.Common
         {
             throw new System.NotImplementedException ();
         }
-       
+
         public IScriptWorkItem QueueEventHandler(object parms)
         {
             throw new System.NotImplementedException ();
@@ -258,7 +258,7 @@ namespace OpenSim.Tests.Common
 
         public string[] ScriptReferencedAssemblies { get { throw new System.NotImplementedException (); } }
 
-        public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } }       
+        public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } }
 
         public void ClearPostedEvents()
         {
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index f407e5a..e2f57b5 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -321,7 +321,7 @@ namespace OpenSim.Tests.Common
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
 
         public event PlacesQuery OnPlacesQuery;
-        
+
         public event FindAgentUpdate OnFindAgent;
         public event TrackAgentUpdate OnTrackAgent;
         public event NewUserReport OnUserReport;
@@ -673,7 +673,7 @@ namespace OpenSim.Tests.Common
         {
             AgentCircuitData agentData = new AgentCircuitData();
             agentData.AgentID = AgentId;
-            agentData.SessionID = SessionId; 
+            agentData.SessionID = SessionId;
             agentData.SecureSessionID = UUID.Zero;
             agentData.circuitcode = m_circuitCode;
             agentData.child = false;
@@ -713,7 +713,7 @@ namespace OpenSim.Tests.Common
         public virtual void SendTeleportFailed(string reason)
         {
             m_log.DebugFormat(
-                "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}", 
+                "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}",
                 m_firstName, m_lastName, m_scene.Name, reason);
         }
 
@@ -781,7 +781,7 @@ namespace OpenSim.Tests.Common
         public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
                                                        List<InventoryItemBase> items,
                                                        List<InventoryFolderBase> folders,
-                                                       int version, 
+                                                       int version,
                                                        bool fetchFolders,
                                                        bool fetchItems)
         {
@@ -881,7 +881,7 @@ namespace OpenSim.Tests.Common
                 OnRegionHandShakeReply(this);
             }
         }
-        
+
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
         }
@@ -1314,7 +1314,7 @@ namespace OpenSim.Tests.Common
         public void SendMuteListUpdate(string filename)
         {
         }
-        
+
         public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled)
         {
         }
@@ -1334,7 +1334,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void Disconnect() 
+        public void Disconnect()
         {
         }
 
@@ -1343,19 +1343,19 @@ namespace OpenSim.Tests.Common
             if (OnReceivedSendRebakeAvatarTextures != null)
                 OnReceivedSendRebakeAvatarTextures(textureID);
         }
-        
+
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
-        
+
         public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
         {
         }
-        
+
         public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
         {
         }
-        
+
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index bc30945..3e00d82 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Tests.Common
 {
     public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule
     {
-        public class Event 
+        public class Event
         {
             public string Name { get; set; }
             public object[] Args { get; set; }
@@ -64,7 +64,7 @@ namespace OpenSim.Tests.Common
 
         public void Close() {}
 
-        public void AddRegion(Scene scene) 
+        public void AddRegion(Scene scene)
         {
             Events = new Dictionary<UUID, List<Event>>();
             scene.RegisterModuleInterface<IEventQueue>(this);
@@ -138,12 +138,12 @@ namespace OpenSim.Tests.Common
         }
 
         public void ChatterboxInvitation(
-            UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, 
-            byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, 
+            UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName,
+            byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl,
             UUID transactionID, bool fromGroup, byte[] binaryBucket)
         {
             AddEvent(
-                toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, 
+                toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog,
                 timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket);
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
index be437dc..7b20b8c 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
         /// Bodies of responses from the server.
         /// </summary>
         public string ResponseBody
-        { 
+        {
             get { return Encoding.UTF8.GetString(m_responseStream.ToArray()); }
         }
 
@@ -56,8 +56,8 @@ namespace OpenSim.Tests.Common
 
         public bool IsSecured { get; set; }
 
-        public bool Secured 
-        { 
+        public bool Secured
+        {
             get { return IsSecured; }
             set { IsSecured = value; }
         }
@@ -67,7 +67,7 @@ namespace OpenSim.Tests.Common
             Secured = secured;
         }
 
-        public void Disconnect(SocketError error) 
+        public void Disconnect(SocketError error)
         {
 //            Console.WriteLine("TestHttpClientContext.Disconnect Received disconnect with status {0}", error);
         }
@@ -76,18 +76,18 @@ namespace OpenSim.Tests.Common
         public void Respond(string httpVersion, HttpStatusCode statusCode, string reason) {Console.WriteLine("xx");}
         public void Respond(string body) { Console.WriteLine("xxx");}
 
-        public void Send(byte[] buffer) 
+        public void Send(byte[] buffer)
         {
             // Getting header data here
 //            Console.WriteLine("xxxx: Got {0}", Encoding.UTF8.GetString(buffer));
         }
 
-        public void Send(byte[] buffer, int offset, int size) 
+        public void Send(byte[] buffer, int offset, int size)
         {
 //            Util.PrintCallStack();
 //
 //            Console.WriteLine(
-//                "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}", 
+//                "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}",
 //                offset, size, Encoding.UTF8.GetString(buffer));
 
             m_responseStream.Write(buffer, offset, size);
diff --git a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
index d07287d..4c5ea4a 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
@@ -37,85 +37,85 @@ namespace OpenSim.Tests.Common
     public class TestHttpRequest: IHttpRequest
     {
         private string _uriPath;
-        public bool BodyIsComplete 
-        { 
-            get { return true; } 
+        public bool BodyIsComplete
+        {
+            get { return true; }
         }
-        public string[] AcceptTypes 
-        { 
+        public string[] AcceptTypes
+        {
             get {return _acceptTypes; }
         }
         private string[] _acceptTypes;
-        public Stream Body 
-        { 
-            get { return _body; } 
-            set { _body = value;} 
+        public Stream Body
+        {
+            get { return _body; }
+            set { _body = value;}
         }
         private Stream _body;
-        public ConnectionType Connection 
-        { 
+        public ConnectionType Connection
+        {
             get { return _connection; }
             set { _connection = value; }
         }
         private ConnectionType _connection;
-        public int ContentLength 
-        { 
+        public int ContentLength
+        {
             get { return _contentLength; }
             set { _contentLength = value; }
         }
         private int _contentLength;
-        public NameValueCollection Headers 
-        { 
+        public NameValueCollection Headers
+        {
             get { return _headers; }
         }
         private NameValueCollection _headers = new NameValueCollection();
 
         public string HttpVersion { get; set; }
 
-        public string Method 
-        { 
+        public string Method
+        {
             get { return _method; }
             set { _method = value; }
         }
         private string _method = null;
-        public HttpInput QueryString 
-        { 
+        public HttpInput QueryString
+        {
             get { return _queryString;  }
         }
         private HttpInput _queryString = null;
-        public Uri Uri 
-        { 
+        public Uri Uri
+        {
             get { return _uri; }
-            set { _uri = value; } 
+            set { _uri = value; }
         }
         private Uri _uri = null;
-        public string[] UriParts 
-        { 
+        public string[] UriParts
+        {
             get { return _uri.Segments; }
         }
-        public HttpParam Param 
-        { 
-            get { return null; } 
+        public HttpParam Param
+        {
+            get { return null; }
         }
-        public HttpForm Form 
-        { 
-            get { return null; } 
+        public HttpForm Form
+        {
+            get { return null; }
         }
-        public bool IsAjax 
-        { 
-            get { return false; } 
+        public bool IsAjax
+        {
+            get { return false; }
         }
-        public RequestCookies Cookies 
-        { 
-            get { return null; } 
+        public RequestCookies Cookies
+        {
+            get { return null; }
         }
 
-        public TestHttpRequest() 
+        public TestHttpRequest()
         {
             HttpVersion = "HTTP/1.1";
         }
 
-        public TestHttpRequest(string contentEncoding, string contentType, string userAgent, 
+        public TestHttpRequest(string contentEncoding, string contentType, string userAgent,
                                string remoteAddr, string remotePort, string[] acceptTypes,
                                ConnectionType connectionType, int contentLength, Uri uri) : base()
         {
@@ -137,7 +137,7 @@ namespace OpenSim.Tests.Common
         {
             _headers.Add(name, value);
         }
-        public int AddToBody(byte[] bytes, int offset, int length) 
+        public int AddToBody(byte[] bytes, int offset, int length)
         {
             return 0;
         }
@@ -168,7 +168,7 @@ namespace OpenSim.Tests.Common
             set
             {
                 _uriPath = value;
-               
+
             }
         }
     }
diff --git a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
index c344fb8..190f6d5 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common
 /*
     public class TestHttpResponse: IHttpResponse
     {
-        public Stream Body 
+        public Stream Body
         {
             get { return _body; }
 
@@ -44,14 +44,14 @@ namespace OpenSim.Tests.Common
         }
         private Stream _body;
 
-        public string ProtocolVersion 
-        { 
+        public string ProtocolVersion
+        {
             get { return _protocolVersion; }
             set { _protocolVersion = value; }
         }
         private string _protocolVersion;
 
-        public bool Chunked 
+        public bool Chunked
         {
             get { return _chunked; }
 
@@ -59,7 +59,7 @@ namespace OpenSim.Tests.Common
         }
         private bool _chunked;
 
-        public ConnectionType Connection 
+        public ConnectionType Connection
         {
             get { return _connection; }
 
@@ -67,7 +67,7 @@ namespace OpenSim.Tests.Common
         }
         private ConnectionType _connection;
 
-        public Encoding Encoding 
+        public Encoding Encoding
         {
             get { return _encoding; }
 
@@ -75,7 +75,7 @@ namespace OpenSim.Tests.Common
         }
         private Encoding _encoding;
 
-        public int KeepAlive 
+        public int KeepAlive
         {
             get { return _keepAlive; }
 
@@ -83,7 +83,7 @@ namespace OpenSim.Tests.Common
         }
         private int _keepAlive;
 
-        public HttpStatusCode Status 
+        public HttpStatusCode Status
         {
             get { return _status; }
 
@@ -91,7 +91,7 @@ namespace OpenSim.Tests.Common
         }
         private HttpStatusCode _status;
 
-        public string Reason 
+        public string Reason
         {
             get { return _reason; }
 
@@ -99,7 +99,7 @@ namespace OpenSim.Tests.Common
         }
         private string _reason;
 
-        public long ContentLength 
+        public long ContentLength
         {
             get { return _contentLength; }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Tests.Common
         }
         private long _contentLength;
 
-        public string ContentType 
+        public string ContentType
         {
             get { return _contentType; }
 
@@ -115,19 +115,19 @@ namespace OpenSim.Tests.Common
         }
         private string _contentType;
 
-        public bool HeadersSent 
+        public bool HeadersSent
         {
             get { return _headersSent; }
         }
         private bool _headersSent;
 
-        public bool Sent 
+        public bool Sent
         {
             get { return _sent; }
         }
         private bool _sent;
 
-        public ResponseCookies Cookies 
+        public ResponseCookies Cookies
         {
             get { return _cookies; }
         }
@@ -141,26 +141,26 @@ namespace OpenSim.Tests.Common
 
         public void AddHeader(string name, string value) {}
 
-        public void Send() 
+        public void Send()
         {
             if (!_headersSent) SendHeaders();
             if (_sent) throw new InvalidOperationException("stuff already sent");
             _sent = true;
         }
 
-        public void SendBody(byte[] buffer, int offset, int count) 
+        public void SendBody(byte[] buffer, int offset, int count)
         {
             if (!_headersSent) SendHeaders();
             _sent = true;
         }
 
-        public void SendBody(byte[] buffer) 
+        public void SendBody(byte[] buffer)
         {
             if (!_headersSent) SendHeaders();
             _sent = true;
         }
 
-        public void SendHeaders() 
+        public void SendHeaders()
         {
             if (_headersSent) throw new InvalidOperationException("headers already sent");
             _headersSent = true;
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index c97a765..0ff6f7f 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
     public class TestInventoryDataPlugin : IInventoryDataPlugin
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <value>
         /// Inventory folders
         /// </value>
@@ -85,9 +85,9 @@ namespace OpenSim.Tests.Common
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
 //            InventoryFolderBase folder = m_folders[folderID];
-            
+
 //            m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID);
-            
+
             List<InventoryItemBase> items = new List<InventoryItemBase>();
 
             foreach (InventoryItemBase item in m_items.Values)
@@ -98,7 +98,7 @@ namespace OpenSim.Tests.Common
                     items.Add(item);
                 }
             }
-            
+
             return items;
         }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Tests.Common
         public InventoryFolderBase getUserRootFolder(UUID user)
         {
 //            m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user);
-            
+
             InventoryFolderBase folder = null;
             m_rootFolders.TryGetValue(user, out folder);
 
@@ -117,9 +117,9 @@ namespace OpenSim.Tests.Common
         public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
 //            InventoryFolderBase parentFolder = m_folders[parentID];
-            
+
 //            m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID);
-            
+
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
 
             foreach (InventoryFolderBase folder in m_folders.Values)
@@ -127,9 +127,9 @@ namespace OpenSim.Tests.Common
                 if (folder.ParentID == parentID)
                 {
 //                    m_log.DebugFormat(
-//                        "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", 
+//                        "[MOCK INV DB]: Found folder {0} {1} in {2} {3}",
 //                        folder.Name, folder.ID, parentFolder.Name, parentFolder.ID);
-                    
+
                     folders.Add(folder);
                 }
             }
@@ -153,9 +153,9 @@ namespace OpenSim.Tests.Common
         public void addInventoryFolder(InventoryFolderBase folder)
         {
 //            m_log.DebugFormat(
-//                "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", 
+//                "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}",
 //                folder.Name, folder.ID, (AssetType)folder.Type);
-            
+
             m_folders[folder.ID] = folder;
 
             if (folder.ParentID == UUID.Zero)
@@ -183,30 +183,30 @@ namespace OpenSim.Tests.Common
                 m_folders.Remove(folderId);
         }
 
-        public void addInventoryItem(InventoryItemBase item) 
+        public void addInventoryItem(InventoryItemBase item)
         {
             InventoryFolderBase folder = m_folders[item.Folder];
-            
+
 //            m_log.DebugFormat(
 //                "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);
-            
+
             m_items[item.ID] = item;
         }
-        
+
         public void updateInventoryItem(InventoryItemBase item) { addInventoryItem(item); }
-        
-        public void deleteInventoryItem(UUID itemId) 
+
+        public void deleteInventoryItem(UUID itemId)
         {
             if (m_items.ContainsKey(itemId))
                 m_items.Remove(itemId);
         }
-        
-        public InventoryItemBase getInventoryItem(UUID itemId) 
+
+        public InventoryItemBase getInventoryItem(UUID itemId)
         {
             if (m_items.ContainsKey(itemId))
                 return m_items[itemId];
             else
-                return null; 
+                return null;
         }
 
         public InventoryItemBase queryInventoryItem(UUID item)
diff --git a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
index b2c6a8c..388b56b 100644
--- a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
+++ b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Tests.Common
 ////        /// The chunks of data to pass to the LLUDPServer when it calls EndReceive
 ////        /// </summary>
 ////        protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>();
-//        
+//
 ////        protected override void BeginReceive()
 ////        {
 ////            if (m_chunksToLoad.Count > 0 && m_chunksToLoad.Peek().BeginReceiveException)
@@ -83,29 +83,29 @@ namespace OpenSim.Tests.Common
 ////                throw new SocketException();
 ////            }
 ////        }
-//        
+//
 ////        protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
 ////        {
 ////            numBytes = 0;
 ////
 ////            //m_log.Debug("Queue size " + m_chunksToLoad.Count);
-////            
+////
 ////            if (m_chunksToLoad.Count <= 0)
 ////                return false;
-////            
+////
 ////            ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
 ////            RecvBuffer = tuple.Data;
 ////            numBytes   = tuple.Data.Length;
 ////            epSender   = tuple.Sender;
-////            
+////
 ////            return true;
 ////        }
-//        
+//
 ////        public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
 ////        {
 ////            // Don't do anything just yet
 ////        }
-//        
+//
 //        /// <summary>
 //        /// Signal that this chunk should throw an exception on Socket.BeginReceive()
 //        /// </summary>
@@ -116,7 +116,7 @@ namespace OpenSim.Tests.Common
 //            tuple.BeginReceiveException = true;
 //            m_chunksToLoad.Enqueue(tuple);
 //        }
-//        
+//
 //        /// <summary>
 //        /// Load some data to be received by the LLUDPServer on the next receive call
 //        /// </summary>
@@ -126,7 +126,7 @@ namespace OpenSim.Tests.Common
 //        {
 //            m_chunksToLoad.Enqueue(new ChunkSenderTuple(data, epSender));
 //        }
-//        
+//
 //        /// <summary>
 //        /// Load a packet to be received by the LLUDPServer on the next receive call
 //        /// </summary>
@@ -135,7 +135,7 @@ namespace OpenSim.Tests.Common
 //        {
 //            LoadReceive(packet.ToBytes(), epSender);
 //        }
-//        
+//
 //        /// <summary>
 //        /// Calls the protected asynchronous result method.  This fires out all data chunks currently queued for send
 //        /// </summary>
@@ -147,7 +147,7 @@ namespace OpenSim.Tests.Common
 ////                OnReceivedData(result);
 //        }
     }
-    
+
     /// <summary>
     /// Record the data and sender tuple
     /// </summary>
@@ -156,13 +156,13 @@ namespace OpenSim.Tests.Common
         public byte[] Data;
         public EndPoint Sender;
         public bool BeginReceiveException;
-        
+
         public ChunkSenderTuple(byte[] data, EndPoint sender)
         {
             Data = data;
             Sender = sender;
         }
-        
+
         public ChunkSenderTuple(EndPoint sender)
         {
             Sender = sender;
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 23258ad..3d44a33 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common
         {
             return m_parcels;
         }
-        
+
         public void Clear(bool setupDefaultParcel)
         {
             m_parcels.Clear();
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 1a93c9f..0b3d446 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Tests.Common
     public class TestScene : Scene
     {
         public TestScene(
-            RegionInfo regInfo, AgentCircuitManager authen, 
+            RegionInfo regInfo, AgentCircuitManager authen,
             ISimulationDataService simDataService, IEstateDataService estateDataService,
             IConfigSource config, string simulatorVersion)
             : base(regInfo, authen, simDataService, estateDataService,
@@ -54,7 +54,7 @@ namespace OpenSim.Tests.Common
             //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName);
             Console.WriteLine("TestScene destructor called");
         }
-        
+
         /// <summary>
         /// Temporarily override session authentication for tests (namely teleport).
         /// </summary>
@@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common
             reason = String.Empty;
             return true;
         }
-            
+
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {
             get { return m_asyncSceneObjectDeleter; }
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index 2b272e6..77f1793 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common
             m_allItems[item.inventoryID] = item.Clone();
 
 //            Console.WriteLine(
-//                "Added item {0} {1}, folder {2}, creator {3}, owner {4}", 
+//                "Added item {0} {1}, folder {2}, creator {3}, owner {4}",
 //                item.inventoryName, item.inventoryID, item.parentFolderID, item.creatorID, item.avatarID);
 
             return true;
@@ -123,8 +123,8 @@ namespace OpenSim.Tests.Common
 
         public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); }
 
-        public bool MoveFolder(string id, string newParent) 
-        { 
+        public bool MoveFolder(string id, string newParent)
+        {
             // Don't use GetFolders() here - it takes a clone!
             XInventoryFolder folder = m_allFolders[new UUID(id)];
 
@@ -133,11 +133,11 @@ namespace OpenSim.Tests.Common
 
             folder.parentFolderID = new UUID(newParent);
 
-//            XInventoryFolder[] newParentFolders 
+//            XInventoryFolder[] newParentFolders
 //                = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
 
 //            Console.WriteLine(
-//                "Moved folder {0} {1}, to {2} {3}", 
+//                "Moved folder {0} {1}, to {2} {3}",
 //                folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID);
 
             // TODO: Really need to implement folder version incrementing, though this should be common code anyway,
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index 6bf23f8..2b2af34 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -81,9 +81,9 @@ namespace OpenSim.Tests.Common
 
             return false;
         }
-        
+
         /// <summary>
-        /// A debugging method that can be used to print out which test method you are in 
+        /// A debugging method that can be used to print out which test method you are in
         /// </summary>
         public static void InMethod()
         {
@@ -129,7 +129,7 @@ namespace OpenSim.Tests.Common
         {
             string rawUuid = stem.PadRight(32, '0');
 
-            return UUID.Parse(rawUuid);           
+            return UUID.Parse(rawUuid);
         }
 
         /// <summary>
@@ -158,7 +158,7 @@ namespace OpenSim.Tests.Common
         {
             string rawUuid = stem.PadLeft(32, '0');
 
-            return UUID.Parse(rawUuid);           
+            return UUID.Parse(rawUuid);
         }
     }
 }
diff --git a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
index 671aca7..1549851 100644
--- a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
@@ -95,7 +95,7 @@ namespace Robust.Tests
             Assert.AreNotEqual(regions, null, "GetRegionsByName failed");
             Assert.AreEqual(regions.Count, 3, "GetRegionsByName should return 3");
 
-            regions = m_Connector.GetRegionRange(UUID.Zero, 
+            regions = m_Connector.GetRegionRange(UUID.Zero,
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002),
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) );
             Assert.AreNotEqual(regions, null, "GetRegionRange failed");
@@ -126,7 +126,7 @@ namespace Robust.Tests
             region.ExternalHostName = "127.0.0.1";
             region.HttpPort = 9000;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
-          
+
             return region;
         }
     }
diff --git a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
index d5c7dcb..fe46a4f 100644
--- a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
@@ -176,7 +176,7 @@ namespace Robust.Tests
             Assert.NotNull(items, "(Repeat) Failed to get multiple items");
             Assert.IsTrue(items.Length == 2, "(Repeat) Requested 2 items, but didn't receive 2 items");
 
-            // This item doesn't exist, but [0] does, and it's cached. 
+            // This item doesn't exist, but [0] does, and it's cached.
             uuids[1] = new UUID("bb000000-0000-0000-0000-0000000000bb");
             // Fetching should return 2 items, but [1] should be null
             items = m_Connector.GetMultipleItems(m_userID, uuids);
@@ -185,7 +185,7 @@ namespace Robust.Tests
             Assert.AreEqual("Test Notecard 1", items[0].Name, "(Three times) Wrong name for Notecard 1");
             Assert.IsNull(items[1], "(Three times) Expecting 2nd item to be null");
 
-            // Now both don't exist 
+            // Now both don't exist
             uuids[0] = new UUID("aa000000-0000-0000-0000-0000000000aa");
             items = m_Connector.GetMultipleItems(m_userID, uuids);
             Assert.Null(items[0], "Request to multiple non-existent items is supposed to return null [0]");
diff --git a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
index 0ab407e..5e6a638 100644
--- a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
+++ b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Tests.Stress
             public void Draw()
             {
                 SceneObjectGroup so = SceneHelpers.AddSceneObject(m_tests.Scene);
-                
+
                 while (Ready)
                 {
                     UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Stress
                         string.Format("PenColour BLACK; MoveTo 40,220; FontSize 32; Text {0};", text),
                         "",
                         0);
-    
+
                     Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
 
                     Pass++;
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs
index b010eaf..9270c96 100644
--- a/OpenSim/Tools/Compiler/Program.cs
+++ b/OpenSim/Tools/Compiler/Program.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Tools.LSL.Compiler
     class Program
     {
 //        Commented out because generated warning since m_positionMap could never be anything other than null
-//        private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; 
+//        private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
         private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
 
         static void Main(string[] args)
@@ -154,7 +154,7 @@ namespace OpenSim.Tools.LSL.Compiler
                                              lslPos.Key - 1, lslPos.Value - 1,
                                              CompErr.ErrorNumber, text, severity);
                 }
-                
+
                 disp = "Completed with errors";
 
                 if (!File.Exists(OutFile))
diff --git a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
index a7679ed..fe29f27 100644
--- a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Tools.lslc")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
index e6500f3..50ff5a4 100644
--- a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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.Tools.Configger")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Tools/Configger/Util.cs b/OpenSim/Tools/Configger/Util.cs
index 1a24034..d25b666 100644
--- a/OpenSim/Tools/Configger/Util.cs
+++ b/OpenSim/Tools/Configger/Util.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Tools.Configger
                     vol = vcomps[0];
                 }
             }
-            
+
             string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
 
             // Glob
diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index c1ba36b..f46948c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -37,7 +37,7 @@ namespace pCampBot
     public abstract class AbstractBehaviour : IBehaviour
     {
         /// <summary>
-        /// Abbreviated name of this behaviour. 
+        /// Abbreviated name of this behaviour.
         /// </summary>
         public string AbbreviatedName { get; protected set; }
 
@@ -56,7 +56,7 @@ namespace pCampBot
             Bot = bot;
         }
 
-        public virtual void Close() 
+        public virtual void Close()
         {
             Interrupt();
         }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
index 4d806fc..451cfcc 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
@@ -47,10 +47,10 @@ namespace pCampBot
 
         public const int m_regionCrossingTimeout = 1000 * 60;
 
-        public CrossBehaviour() 
-        { 
+        public CrossBehaviour()
+        {
             AbbreviatedName = "c";
-            Name = "Cross"; 
+            Name = "Cross";
         }
 
         public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 59f6244..b27ece8 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -42,10 +42,10 @@ namespace pCampBot
     /// </remarks>
     public class GrabbingBehaviour : AbstractBehaviour
     {
-        public GrabbingBehaviour() 
-        { 
+        public GrabbingBehaviour()
+        {
             AbbreviatedName = "g";
-            Name = "Grabbing"; 
+            Name = "Grabbing";
         }
 
         public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
index 521415c..e868fa9 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
@@ -45,8 +45,8 @@ namespace pCampBot
         private Stopwatch m_StopWatch = new Stopwatch();
         private List<UUID> m_processed = new List<UUID>();
 
-        public InventoryDownloadBehaviour() 
-        { 
+        public InventoryDownloadBehaviour()
+        {
             AbbreviatedName = "inv";
             Name = "Inventory";
         }
@@ -113,7 +113,7 @@ namespace pCampBot
 
         }
 
-        public override void Interrupt() 
+        public override void Interrupt()
         {
             m_interruptEvent.Set();
         }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
index 0d43781..b832d7e 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -38,10 +38,10 @@ namespace pCampBot
     /// </summary>
     public class NoneBehaviour : AbstractBehaviour
     {
-        public NoneBehaviour() 
-        { 
+        public NoneBehaviour()
+        {
             AbbreviatedName = "n";
-            Name = "None"; 
+            Name = "None";
         }
 
         public override void Action()
@@ -52,7 +52,7 @@ namespace pCampBot
             Bot.Client.Self.Movement.Stop = false;
         }
 
-        public override void Interrupt() 
+        public override void Interrupt()
         {
             m_interruptEvent.Set();
         }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 1ec2046..54782c1 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -45,10 +45,10 @@ namespace pCampBot
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public PhysicsBehaviour2() 
-        { 
+        public PhysicsBehaviour2()
+        {
             AbbreviatedName = "ph2";
-            Name = "Physics2"; 
+            Name = "Physics2";
         }
 
         private const int TIME_WALKING = 5 * 10; // 5 seconds
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index 81f250d..9611d72 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -43,10 +43,10 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public TeleportBehaviour() 
+        public TeleportBehaviour()
         {
             AbbreviatedName = "t";
-            Name = "Teleport"; 
+            Name = "Teleport";
         }
 
         public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
index 7b4639d..42dbc8f 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -38,7 +38,7 @@ namespace pCampBot
     /// <summary>
     /// This behavior is for the systematic study of some performance improvements made
     /// for OSCC'13.
-    /// Do nothing, but send AgentUpdate packets all the time that have only slightly 
+    /// Do nothing, but send AgentUpdate packets all the time that have only slightly
     /// different state. The delta of difference will be filtered by OpenSim early on
     /// in the packet processing pipeline. These filters did not exist before OSCC'13.
     /// </summary>
@@ -46,10 +46,10 @@ namespace pCampBot
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public TwitchyBehaviour() 
-        { 
+        public TwitchyBehaviour()
+        {
             AbbreviatedName = "tw";
-            Name = "Twitchy"; 
+            Name = "Twitchy";
         }
 
         private const float TWITCH = 0.0001f;
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 4f28733..a142527 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -57,10 +57,10 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public int PacketDebugLevel 
-        { 
+        public int PacketDebugLevel
+        {
             get { return m_packetDebugLevel; }
-            set 
+            set
             {
                 if (value == m_packetDebugLevel)
                     return;
@@ -217,7 +217,7 @@ namespace pCampBot
             Dictionary<string, IBehaviour> updatedBehaviours = new Dictionary<string, IBehaviour>(Behaviours);
 
             if (!updatedBehaviours.ContainsKey(behaviour.AbbreviatedName))
-            {                    
+            {
                 behaviour.Initialize(this);
                 updatedBehaviours.Add(behaviour.AbbreviatedName, behaviour);
                 Behaviours = updatedBehaviours;
@@ -313,7 +313,7 @@ namespace pCampBot
                 foreach (IBehaviour behaviour in Behaviours.Values)
                 {
 //                        Thread.Sleep(Random.Next(3000, 10000));
-                
+
                     // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
                     behaviour.Action();
                 }
@@ -329,7 +329,7 @@ namespace pCampBot
         public void Disconnect()
         {
             ConnectionState = ConnectionState.Disconnecting;
-              
+
             foreach (IBehaviour behaviour in Behaviours.Values)
                 behaviour.Close();
 
@@ -337,7 +337,7 @@ namespace pCampBot
         }
 
         public void Connect()
-        {            
+        {
             Thread connectThread = new Thread(ConnectInternal);
             connectThread.Name = Name;
             connectThread.IsBackground = true;
@@ -508,7 +508,7 @@ namespace pCampBot
                 InventoryFolder clothfolder = FindClothingFolder();
                 UUID transid = UUID.Random();
                 List<InventoryBase> listwearables = new List<InventoryBase>();
-                
+
                 for (int i = 0; i < clothing.Length; i++)
                 {
                     UUID assetID = UUID.Random();
@@ -707,7 +707,7 @@ namespace pCampBot
                 m_log.Warn(string.Format("Error requesting {0} {1}", texture ? "texture" : "mesh", assetID), e);
             }
         }
-        
+
         public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture)
         {
             if (state == TextureRequestState.Finished)
@@ -722,7 +722,7 @@ namespace pCampBot
             lock (Manager.AssetsReceived)
                 Manager.AssetsReceived[assetMesh.AssetID] = success;
         }
-        
+
         public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset)
         {
             lock (Manager.AssetsReceived)
@@ -733,7 +733,7 @@ namespace pCampBot
 //                SaveAsset((AssetWearable) asset);
 //            }
         }
-         
+
         private void PacketReceivedDebugHandler(object o, PacketReceivedEventArgs args)
         {
             Packet p = args.Packet;
@@ -741,7 +741,7 @@ namespace pCampBot
             Simulator s = args.Simulator;
 
             m_log.DebugFormat(
-                "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}", 
+                "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}",
                 Name, s.Name, p.Type, h.Sequence, h.Reliable, h.Resent);
         }
     }
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0af9592..37dc0d9 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -219,14 +219,14 @@ namespace pCampBot
                 HandleDisconnect);
 
             m_console.Commands.AddCommand(
-                "Bots", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", 
+                "Bots", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]",
                 "Add a behaviour to a bot",
                 "If no bot number is specified then behaviour is added to all bots.\n"
                     + "Can be performed on connected or disconnected bots.",
                 HandleAddBehaviour);
 
             m_console.Commands.AddCommand(
-                "Bots", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", 
+                "Bots", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]",
                 "Remove a behaviour from a bot",
                 "If no bot number is specified then behaviour is added to all bots.\n"
                     + "Can be performed on connected or disconnected bots.",
@@ -250,14 +250,14 @@ namespace pCampBot
                 "Bots", false, "show bots", "show bots", "Shows the status of all bots.", HandleShowBotsStatus);
 
             m_console.Commands.AddCommand(
-                "Bots", false, "show bot", "show bot <bot-number>", 
+                "Bots", false, "show bot", "show bot <bot-number>",
                 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
 
             m_console.Commands.AddCommand(
-                "Debug", 
-                false, 
-                "debug lludp packet", 
-                "debug lludp packet <level> <avatar-first-name> <avatar-last-name>", 
+                "Debug",
+                false,
+                "debug lludp packet",
+                "debug lludp packet <level> <avatar-first-name> <avatar-last-name>",
                 "Turn on received packet logging.",
                 "If level >  0 then all received packets that are not duplicates are logged.\n"
                 + "If level <= 0 then no received packets are logged.",
@@ -317,7 +317,7 @@ namespace pCampBot
             // We must give each bot its own list of instantiated behaviours since they store state.
             List<IBehaviour> behaviours = new List<IBehaviour>();
 
-            // Hard-coded for now    
+            // Hard-coded for now
             foreach (string abName in abbreviatedNames)
             {
                 IBehaviour newBehaviour = null;
@@ -534,7 +534,7 @@ namespace pCampBot
         }
 
         private void HandleConnect(string module, string[] cmd)
-        {           
+        {
             lock (m_bots)
             {
                 int botsToConnect;
@@ -607,7 +607,7 @@ namespace pCampBot
                 }
 
                 MainConsole.Instance.OutputFormat(
-                    "Added behaviours {0} to bot {1}", 
+                    "Added behaviours {0} to bot {1}",
                     string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
             }
         }
@@ -665,7 +665,7 @@ namespace pCampBot
                 }
 
                 MainConsole.Instance.OutputFormat(
-                    "Removed behaviours {0} from bot {1}", 
+                    "Removed behaviours {0} from bot {1}",
                     string.Join(", ", behavioursRemoved.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
             }
         }
@@ -779,7 +779,7 @@ namespace pCampBot
             string rawValue = cmd[3];
 
             if (key == "SEND_AGENT_UPDATES")
-            {   
+            {
                 bool newSendAgentUpdatesSetting;
 
                 if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newSendAgentUpdatesSetting))
@@ -873,10 +873,10 @@ namespace pCampBot
                     totals[bot.ConnectionState]++;
 
                     cdt.AddRow(
-                        bot.Name, 
-                        currentSim != null ? currentSim.Name : "(none)", 
-                        bot.ConnectionState, 
-                        bot.SimulatorsCount, 
+                        bot.Name,
+                        currentSim != null ? currentSim.Name : "(none)",
+                        bot.ConnectionState,
+                        bot.SimulatorsCount,
                         string.Join(",", bot.Behaviours.Keys.ToArray()));
                 }
             }
@@ -930,7 +930,7 @@ namespace pCampBot
             ConsoleDisplayList statusCdl = new ConsoleDisplayList();
 
             statusCdl.AddRow(
-                "Behaviours", 
+                "Behaviours",
                 string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll<string>(b => b.Name).ToArray()));
 
             GridClient botClient = bot.Client;
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 660c630..beb8413 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -32,7 +32,7 @@ namespace pCampBot.Interfaces
     public interface IBehaviour
     {
         /// <summary>
-        /// Abbreviated name of this behaviour. 
+        /// Abbreviated name of this behaviour.
         /// </summary>
         string AbbreviatedName { get; }
 
diff --git a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
index a33f689..8b96c92 100644
--- a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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("pCampBot")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [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)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 1fb0e03..f162f10 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -64,8 +64,8 @@ namespace pCampBot
                 Help();
             }
             else if (
-                commandLineConfig.Get("firstname") == null 
-                    ||  commandLineConfig.Get("lastname") == null 
+                commandLineConfig.Get("firstname") == null
+                    ||  commandLineConfig.Get("lastname") == null
                     || commandLineConfig.Get("password") == null)
             {
                 Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
@@ -93,7 +93,7 @@ namespace pCampBot
 
                     if (botConfig != null)
                     {
-                        bm.InitBotSendAgentUpdates 
+                        bm.InitBotSendAgentUpdates
                             = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
                         bm.InitBotRequestObjectTextures
                             = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);
diff --git a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
index f1938a2..cd3cea4 100644
--- a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
+++ b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -28,45 +28,45 @@ using System.Collections.Specialized;
 
 namespace Prebuild.Core.Attributes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple=true)]
-        public sealed class DataNodeAttribute : Attribute
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple=true)]
+    public sealed class DataNodeAttribute : Attribute
+    {
+        #region Fields
 
-                private string m_Name = "unknown";
+        private string m_Name = "unknown";
 
-                #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="DataNodeAttribute"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                public DataNodeAttribute(string name)
-                {
-                        m_Name = name;
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataNodeAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        public DataNodeAttribute(string name)
+        {
+            m_Name = name;
+        }
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
index 2d6a6a7..8ef97a1 100644
--- a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
+++ b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -27,45 +27,45 @@ using System;
 
 namespace Prebuild.Core.Attributes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Field)]
-        public sealed class OptionNodeAttribute : Attribute
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class OptionNodeAttribute : Attribute
+    {
+        #region Fields
 
-                private string m_NodeName;
+        private string m_NodeName;
 
-                #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="OptionNodeAttribute"/> class.
-                /// </summary>
-                /// <param name="nodeName">Name of the node.</param>
-                public OptionNodeAttribute(string nodeName)
-                {
-                        m_NodeName = nodeName;
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OptionNodeAttribute"/> class.
+        /// </summary>
+        /// <param name="nodeName">Name of the node.</param>
+        public OptionNodeAttribute(string nodeName)
+        {
+            m_NodeName = nodeName;
+        }
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                /// <summary>
-                /// Gets the name of the node.
-                /// </summary>
-                /// <value>The name of the node.</value>
-                public string NodeName
-                {
-                        get
-                        {
-                                return m_NodeName;
-                        }
-                }
+        /// <summary>
+        /// Gets the name of the node.
+        /// </summary>
+        /// <value>The name of the node.</value>
+        public string NodeName
+        {
+            get
+            {
+                return m_NodeName;
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Attributes/TargetAttribute.cs b/Prebuild/src/Core/Attributes/TargetAttribute.cs
index 5ad62ee..fb30914 100644
--- a/Prebuild/src/Core/Attributes/TargetAttribute.cs
+++ b/Prebuild/src/Core/Attributes/TargetAttribute.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -27,45 +27,45 @@ using System;
 
 namespace Prebuild.Core.Attributes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-        public sealed class TargetAttribute : Attribute
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+    public sealed class TargetAttribute : Attribute
+    {
+        #region Fields
 
-                private string m_Name;
+        private string m_Name;
 
-                #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="TargetAttribute"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                public TargetAttribute(string name)
-                {
-                        m_Name = name;
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        public TargetAttribute(string name)
+        {
+            m_Name = name;
+        }
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/FatalException.cs b/Prebuild/src/Core/FatalException.cs
index 3487905..751297a 100644
--- a/Prebuild/src/Core/FatalException.cs
+++ b/Prebuild/src/Core/FatalException.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -28,58 +28,58 @@ using System.Runtime.Serialization;
 
 namespace Prebuild.Core
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Serializable()]
-        public class FatalException : Exception
-        {
-                #region Constructors
+    /// <summary>
+    ///
+    /// </summary>
+    [Serializable()]
+    public class FatalException : Exception
+    {
+        #region Constructors
 
-                
-                /// <summary>
-                /// Initializes a new instance of the <see cref="FatalException"/> class.
-                /// </summary>
-                public FatalException()
-                {
-                }
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="FatalException"/> class.
-                /// </summary>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public FatalException(string format, params object[] args)
-                        : base(String.Format(format, args))
-                {
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FatalException"/> class.
+        /// </summary>
+        public FatalException()
+        {
+        }
 
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public FatalException(string message): base(message)
-                {
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FatalException"/> class.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <param name="args">The args.</param>
+        public FatalException(string format, params object[] args)
+            : base(String.Format(format, args))
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public FatalException(string message, Exception exception) : base(message, exception)
-                {
-                }
+        /// <summary>
+        /// Exception with specified string
+        /// </summary>
+        /// <param name="message">Exception message</param>
+        public FatalException(string message): base(message)
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected FatalException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="exception"></param>
+        public FatalException(string message, Exception exception) : base(message, exception)
+        {
+        }
 
-                #endregion
-        }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="context"></param>
+        protected FatalException(SerializationInfo info, StreamingContext context) : base( info, context )
+        {
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Interfaces/IDataNode.cs b/Prebuild/src/Core/Interfaces/IDataNode.cs
index 986dd2d..4917b18 100644
--- a/Prebuild/src/Core/Interfaces/IDataNode.cs
+++ b/Prebuild/src/Core/Interfaces/IDataNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -26,22 +26,22 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 using System;
 using System.Xml;
 
-namespace Prebuild.Core.Interfaces 
+namespace Prebuild.Core.Interfaces
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public interface IDataNode 
-        {
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                IDataNode Parent { get; set; }        
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                void Parse(XmlNode node);
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    public interface IDataNode
+    {
+        /// <summary>
+        /// Gets or sets the parent.
+        /// </summary>
+        /// <value>The parent.</value>
+        IDataNode Parent { get; set; }
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        void Parse(XmlNode node);
+    }
 }
diff --git a/Prebuild/src/Core/Interfaces/ITarget.cs b/Prebuild/src/Core/Interfaces/ITarget.cs
index 47115c6..e4c3ea4 100644
--- a/Prebuild/src/Core/Interfaces/ITarget.cs
+++ b/Prebuild/src/Core/Interfaces/ITarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -25,27 +25,27 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 
 using System;
 
-namespace Prebuild.Core.Interfaces 
+namespace Prebuild.Core.Interfaces
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public interface ITarget 
-        {
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                void Write(Kernel kern);
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                void Clean(Kernel kern);
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                string Name { get; }
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    public interface ITarget
+    {
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        void Write(Kernel kern);
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        void Clean(Kernel kern);
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        string Name { get; }
+    }
 }
\ No newline at end of file
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
index 761962e..454ff8b 100644
--- a/Prebuild/src/Core/Kernel.cs
+++ b/Prebuild/src/Core/Kernel.cs
@@ -49,202 +49,202 @@ using Prebuild.Core.Interfaces;
 using Prebuild.Core.Nodes;
 using Prebuild.Core.Utilities;
 
-namespace Prebuild.Core 
+namespace Prebuild.Core
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Kernel : IDisposable
-        {
-                #region Inner Classes
-
-                private struct NodeEntry
-                {
-                        public Type Type;
-                        public DataNodeAttribute Attribute;
-                }
-
-                #endregion
-
-                #region Fields
-
-                private static readonly Kernel m_Instance = new Kernel();
-
-                /// <summary>
-                /// This must match the version of the schema that is embeeded
-                /// </summary>
-                private const string m_SchemaVersion = "1.10";
-                private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
-                private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
-                bool disposed;
-                private Version m_Version;
-                private const string m_Revision = "";
-                private CommandLineCollection m_CommandLine;
-                private Log m_Log;
-                private CurrentDirectory m_CurrentWorkingDirectory;
-                private XmlSchemaCollection m_Schemas;
+    /// <summary>
+    ///
+    /// </summary>
+    public class Kernel : IDisposable
+    {
+        #region Inner Classes
+
+        private struct NodeEntry
+        {
+            public Type Type;
+            public DataNodeAttribute Attribute;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private static readonly Kernel m_Instance = new Kernel();
+
+        /// <summary>
+        /// This must match the version of the schema that is embeeded
+        /// </summary>
+        private const string m_SchemaVersion = "1.10";
+        private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
+        private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
+        bool disposed;
+        private Version m_Version;
+        private const string m_Revision = "";
+        private CommandLineCollection m_CommandLine;
+        private Log m_Log;
+        private CurrentDirectory m_CurrentWorkingDirectory;
+        private XmlSchemaCollection m_Schemas;
 
         private readonly Dictionary<string, ITarget> m_Targets = new Dictionary<string, ITarget>();
         private readonly Dictionary<string, NodeEntry> m_Nodes = new Dictionary<string, NodeEntry>();
 
-            readonly List<SolutionNode> m_Solutions = new List<SolutionNode>();        
-                string m_Target;
-                string m_Clean;
-                string[] m_RemoveDirectories;
-            XmlDocument m_CurrentDoc;
-                bool m_PauseAfterFinish;
-                string[] m_ProjectGroups;
-
-            #endregion
-
-                #region Constructors
-
-                private Kernel()
-                {
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets a value indicating whether [pause after finish].
-                /// </summary>
-                /// <value><c>true</c> if [pause after finish]; otherwise, <c>false</c>.</value>
-                public bool PauseAfterFinish 
-                {
-                        get
-                        { 
-                                return m_PauseAfterFinish; 
-                        } 
-                }
-
-                /// <summary>
-                /// Gets the instance.
-                /// </summary>
-                /// <value>The instance.</value>
-                public static Kernel Instance
-                {
-                        get
-                        {
-                                return m_Instance;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version
-                {
-                        get
-                        {
-                                return String.Format("{0}.{1}.{2}{3}", m_Version.Major, m_Version.Minor, m_Version.Build, m_Revision);
-                        }
-                }
-
-                /// <summary>
-                /// Gets the command line.
-                /// </summary>
-                /// <value>The command line.</value>
-                public CommandLineCollection CommandLine
-                {
-                        get
-                        {
-                                return m_CommandLine;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the targets.
-                /// </summary>
-                /// <value>The targets.</value>
-                public Dictionary<string, ITarget> Targets
-                {
-                        get
-                        {
-                                return m_Targets;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the log.
-                /// </summary>
-                /// <value>The log.</value>
-                public Log Log
-                {
-                        get
-                        {
-                                return m_Log;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the current working directory.
-                /// </summary>
-                /// <value>The current working directory.</value>
-                public CurrentDirectory CurrentWorkingDirectory
-                {
-                        get
-                        {
-                                return m_CurrentWorkingDirectory;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the solutions.
-                /// </summary>
-                /// <value>The solutions.</value>
-                public List<SolutionNode> Solutions
-                {
-                        get
-                        {
-                                return m_Solutions;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets the XmlDocument object representing the prebuild.xml
-                /// being processed
-                /// </summary>
-                /// <value>The XmlDocument object</value>
-                public XmlDocument CurrentDoc
-                {
-                        get
-                        {
-                                return m_CurrentDoc;
-                        }
-                }
-
-                #endregion
-
-                #region Private Methods
-
-                private static void RemoveDirectories(string rootDir, string[] dirNames) 
-                {
-                        foreach(string dir in Directory.GetDirectories(rootDir)) 
-                        {
-                                string simpleName = Path.GetFileName(dir);
-
-                                if(Array.IndexOf(dirNames, simpleName) != -1) 
-                                {
-                                        //delete if the name matches one of the directory names to delete
-                                        string fullDirPath = Path.GetFullPath(dir);
-                                        Directory.Delete(fullDirPath,true);
-                                } 
-                                else//not a match, so check children
-                                {
-                                        RemoveDirectories(dir,dirNames);
-                                        //recurse, checking children for them
-                                }
-                        }
-                }
-
-//              private void RemoveDirectoryMatches(string rootDir, string dirPattern) 
+        readonly List<SolutionNode> m_Solutions = new List<SolutionNode>();
+        string m_Target;
+        string m_Clean;
+        string[] m_RemoveDirectories;
+        XmlDocument m_CurrentDoc;
+        bool m_PauseAfterFinish;
+        string[] m_ProjectGroups;
+
+        #endregion
+
+        #region Constructors
+
+        private Kernel()
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets a value indicating whether [pause after finish].
+        /// </summary>
+        /// <value><c>true</c> if [pause after finish]; otherwise, <c>false</c>.</value>
+        public bool PauseAfterFinish
+        {
+            get
+            {
+                return m_PauseAfterFinish;
+            }
+        }
+
+        /// <summary>
+        /// Gets the instance.
+        /// </summary>
+        /// <value>The instance.</value>
+        public static Kernel Instance
+        {
+            get
+            {
+                return m_Instance;
+            }
+        }
+
+        /// <summary>
+        /// Gets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public string Version
+        {
+            get
+            {
+                return String.Format("{0}.{1}.{2}{3}", m_Version.Major, m_Version.Minor, m_Version.Build, m_Revision);
+            }
+        }
+
+        /// <summary>
+        /// Gets the command line.
+        /// </summary>
+        /// <value>The command line.</value>
+        public CommandLineCollection CommandLine
+        {
+            get
+            {
+                return m_CommandLine;
+            }
+        }
+
+        /// <summary>
+        /// Gets the targets.
+        /// </summary>
+        /// <value>The targets.</value>
+        public Dictionary<string, ITarget> Targets
+        {
+            get
+            {
+                return m_Targets;
+            }
+        }
+
+        /// <summary>
+        /// Gets the log.
+        /// </summary>
+        /// <value>The log.</value>
+        public Log Log
+        {
+            get
+            {
+                return m_Log;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current working directory.
+        /// </summary>
+        /// <value>The current working directory.</value>
+        public CurrentDirectory CurrentWorkingDirectory
+        {
+            get
+            {
+                return m_CurrentWorkingDirectory;
+            }
+        }
+
+        /// <summary>
+        /// Gets the solutions.
+        /// </summary>
+        /// <value>The solutions.</value>
+        public List<SolutionNode> Solutions
+        {
+            get
+            {
+                return m_Solutions;
+            }
+        }
+
+        /// <summary>
+        /// Gets the XmlDocument object representing the prebuild.xml
+        /// being processed
+        /// </summary>
+        /// <value>The XmlDocument object</value>
+        public XmlDocument CurrentDoc
+        {
+            get
+            {
+                return m_CurrentDoc;
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private static void RemoveDirectories(string rootDir, string[] dirNames)
+        {
+            foreach(string dir in Directory.GetDirectories(rootDir))
+            {
+                string simpleName = Path.GetFileName(dir);
+
+                if(Array.IndexOf(dirNames, simpleName) != -1)
+                {
+                    //delete if the name matches one of the directory names to delete
+                    string fullDirPath = Path.GetFullPath(dir);
+                    Directory.Delete(fullDirPath,true);
+                }
+                else//not a match, so check children
+                {
+                    RemoveDirectories(dir,dirNames);
+                    //recurse, checking children for them
+                }
+            }
+        }
+
+//              private void RemoveDirectoryMatches(string rootDir, string dirPattern)
 //              {
-//                      foreach(string dir in Directory.GetDirectories(rootDir)) 
+//                      foreach(string dir in Directory.GetDirectories(rootDir))
 //                      {
-//                              foreach(string match in Directory.GetDirectories(dir)) 
+//                              foreach(string match in Directory.GetDirectories(dir))
 //                              {//delete all child directories that match
 //                                      Directory.Delete(Path.GetFullPath(match),true);
 //                              }
@@ -253,56 +253,56 @@ namespace Prebuild.Core
 //                      }
 //              }
 
-                private void LoadSchema()
-                {
-                        Assembly assembly = GetType().Assembly;
-                        Stream stream = assembly.GetManifestResourceStream("Prebuild.data." + m_Schema);
-                        if(stream == null) 
-                        {
-                                //try without the default namespace prepending to it in case was compiled with SharpDevelop or MonoDevelop instead of Visual Studio .NET
-                                stream = assembly.GetManifestResourceStream(m_Schema);
-                                if(stream == null)
-                                {
-                                        throw new System.Reflection.TargetException(string.Format("Could not find the scheme embedded resource file '{0}'.", m_Schema));
-                                }
-                        }
-                        XmlReader schema = new XmlTextReader(stream);
-            
-                        m_Schemas = new XmlSchemaCollection();
-                        m_Schemas.Add(m_SchemaURI, schema);
-                }
-
-                private void CacheVersion() 
-                {
-                        m_Version = Assembly.GetEntryAssembly().GetName().Version;
-                }
-
-                private void CacheTargets(Assembly assm)
-                {
-                        foreach(Type t in assm.GetTypes())
-                        {
-                                TargetAttribute ta = (TargetAttribute)Helper.CheckType(t, typeof(TargetAttribute), typeof(ITarget));
-
-                                if(ta == null)
-                                        continue;
-                                
-                                if (t.IsAbstract)
-                                        continue;
-                                
-                                ITarget target = (ITarget)assm.CreateInstance(t.FullName);
-                                if (target == null)
-                                {
-                                        throw new MissingMethodException("Could not create ITarget instance");
-                                }
-
-                                m_Targets[ta.Name] = target;
-                        }
-                }
-
-                private void CacheNodeTypes(Assembly assm)
-                {
-                        foreach(Type t in assm.GetTypes())
-                        {
+        private void LoadSchema()
+        {
+            Assembly assembly = GetType().Assembly;
+            Stream stream = assembly.GetManifestResourceStream("Prebuild.data." + m_Schema);
+            if(stream == null)
+            {
+                //try without the default namespace prepending to it in case was compiled with SharpDevelop or MonoDevelop instead of Visual Studio .NET
+                stream = assembly.GetManifestResourceStream(m_Schema);
+                if(stream == null)
+                {
+                    throw new System.Reflection.TargetException(string.Format("Could not find the scheme embedded resource file '{0}'.", m_Schema));
+                }
+            }
+            XmlReader schema = new XmlTextReader(stream);
+
+            m_Schemas = new XmlSchemaCollection();
+            m_Schemas.Add(m_SchemaURI, schema);
+        }
+
+        private void CacheVersion()
+        {
+            m_Version = Assembly.GetEntryAssembly().GetName().Version;
+        }
+
+        private void CacheTargets(Assembly assm)
+        {
+            foreach(Type t in assm.GetTypes())
+            {
+                TargetAttribute ta = (TargetAttribute)Helper.CheckType(t, typeof(TargetAttribute), typeof(ITarget));
+
+                if(ta == null)
+                    continue;
+
+                if (t.IsAbstract)
+                    continue;
+
+                ITarget target = (ITarget)assm.CreateInstance(t.FullName);
+                if (target == null)
+                {
+                    throw new MissingMethodException("Could not create ITarget instance");
+                }
+
+                m_Targets[ta.Name] = target;
+            }
+        }
+
+        private void CacheNodeTypes(Assembly assm)
+        {
+            foreach(Type t in assm.GetTypes())
+            {
                 foreach (DataNodeAttribute dna in t.GetCustomAttributes(typeof(DataNodeAttribute), true))
                 {
                     NodeEntry ne = new NodeEntry();
@@ -310,11 +310,11 @@ namespace Prebuild.Core
                     ne.Attribute = dna;
                     m_Nodes[dna.Name] = ne;
                 }
-                        }
-                }
+            }
+        }
 
-                private void LogBanner()
-                {
+        private void LogBanner()
+        {
             m_Log.Write("Prebuild v" + Version);
             m_Log.Write("Copyright (c) 2004-2010");
             m_Log.Write("Matthew Holmes (matthew@wildfiregames.com),");
@@ -326,7 +326,7 @@ namespace Prebuild.Core
 
             m_Log.Write("See 'prebuild /usage' for help");
             m_Log.Write();
-                }
+        }
 
 
 
@@ -348,37 +348,37 @@ namespace Prebuild.Core
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="file"></param>
         /// <param name="solutions"></param>
         /// <returns></returns>
-                public void ProcessFile(string file, IList<SolutionNode> solutions)
-                {
-                        m_CurrentWorkingDirectory.Push();
-            
-                        string path = file;
-                        try
-                        {
-                                try
-                                {
-                                        path = Helper.ResolvePath(path);
-                                }
-                                catch(ArgumentException)
-                                {
-                                        m_Log.Write("Could not open Prebuild file: " + path);
-                                        m_CurrentWorkingDirectory.Pop();
-                                        return;
-                                }
-
-                            Helper.SetCurrentDir(Path.GetDirectoryName(path));
-                                
-                                XmlTextReader reader = new XmlTextReader(path);
+        public void ProcessFile(string file, IList<SolutionNode> solutions)
+        {
+            m_CurrentWorkingDirectory.Push();
+
+            string path = file;
+            try
+            {
+                try
+                {
+                    path = Helper.ResolvePath(path);
+                }
+                catch(ArgumentException)
+                {
+                    m_Log.Write("Could not open Prebuild file: " + path);
+                    m_CurrentWorkingDirectory.Pop();
+                    return;
+                }
+
+                Helper.SetCurrentDir(Path.GetDirectoryName(path));
+
+                XmlTextReader reader = new XmlTextReader(path);
 
                 Core.Parse.Preprocessor pre = new Core.Parse.Preprocessor();
 
                 //register command line arguments as XML variables
-                            IEnumerator<KeyValuePair<string, string>> dict = m_CommandLine.GetEnumerator();
+                IEnumerator<KeyValuePair<string, string>> dict = m_CommandLine.GetEnumerator();
                 while (dict.MoveNext())
                 {
                     string name = dict.Current.Key.Trim();
@@ -386,447 +386,447 @@ namespace Prebuild.Core
                         pre.RegisterVariable(name, dict.Current.Value);
                 }
 
-                                string xml = pre.Process(reader);//remove script and evaulate pre-proccessing to get schema-conforming XML
-
-                                // See if the user put into a pseudo target of "prebuild:preprocessed-input" to indicate they want to see the
-                                // output before the system processes it.
-                                if (m_CommandLine.WasPassed("ppi"))
-                                {
-                                        // Get the filename if there is one, otherwise use a default.
-                                        string ppiFile = m_CommandLine["ppi"];
-                                        if (ppiFile == null || ppiFile.Trim().Length == 0)
-                                        {
-                                                ppiFile = "preprocessed-input.xml";
-                                        }
-
-                                        // Write out the string to the given stream.
-                                        try
-                                        {
-                                                using (StreamWriter ppiWriter = new StreamWriter(ppiFile))
-                                                {
-                                                        ppiWriter.WriteLine(xml);
-                                                }
-                                        }
-                                        catch(IOException ex)
-                                        {
-                                                Console.WriteLine("Could not write PPI file '{0}': {1}", ppiFile, ex.Message);
-                                        }
-
-                                        // Finish processing this special tag.
-                                        return;
-                                }
-                                
-                                m_CurrentDoc = new XmlDocument();
-                                try
-                                {
+                string xml = pre.Process(reader);//remove script and evaulate pre-proccessing to get schema-conforming XML
+
+                // See if the user put into a pseudo target of "prebuild:preprocessed-input" to indicate they want to see the
+                // output before the system processes it.
+                if (m_CommandLine.WasPassed("ppi"))
+                {
+                    // Get the filename if there is one, otherwise use a default.
+                    string ppiFile = m_CommandLine["ppi"];
+                    if (ppiFile == null || ppiFile.Trim().Length == 0)
+                    {
+                        ppiFile = "preprocessed-input.xml";
+                    }
+
+                    // Write out the string to the given stream.
+                    try
+                    {
+                        using (StreamWriter ppiWriter = new StreamWriter(ppiFile))
+                        {
+                            ppiWriter.WriteLine(xml);
+                        }
+                    }
+                    catch(IOException ex)
+                    {
+                        Console.WriteLine("Could not write PPI file '{0}': {1}", ppiFile, ex.Message);
+                    }
+
+                    // Finish processing this special tag.
+                    return;
+                }
+
+                m_CurrentDoc = new XmlDocument();
+                try
+                {
 #if NO_VALIDATE
-                                        XmlReader validator = XmlReader.Create(new StringReader(xml));
-                                        m_CurrentDoc.Load(validator);
+                    XmlReader validator = XmlReader.Create(new StringReader(xml));
+                    m_CurrentDoc.Load(validator);
 #else
-                                        XmlValidatingReader validator = new XmlValidatingReader(new XmlTextReader(new StringReader(xml)));
-
-                                        //validate while reading from string into XmlDocument DOM structure in memory
-                                        foreach(XmlSchema schema in m_Schemas) 
-                                        {
-                                                validator.Schemas.Add(schema);
-                                        }
-                                        m_CurrentDoc.Load(validator);
+                    XmlValidatingReader validator = new XmlValidatingReader(new XmlTextReader(new StringReader(xml)));
+
+                    //validate while reading from string into XmlDocument DOM structure in memory
+                    foreach(XmlSchema schema in m_Schemas)
+                    {
+                        validator.Schemas.Add(schema);
+                    }
+                    m_CurrentDoc.Load(validator);
 #endif
-                                } 
-                                catch(XmlException e) 
-                                {
-                                        throw new XmlException(e.ToString());
-                                }
-
-                                //is there a purpose to writing it?  An syntax/schema problem would have been found during pre.Process() and reported with details
-                                if(m_CommandLine.WasPassed("ppo"))
-                                {
-                                        string ppoFile = m_CommandLine["ppo"];
-                                        if(ppoFile == null || ppoFile.Trim().Length < 1)
-                                        {
-                                                ppoFile = "preprocessed.xml";
-                                        }
-
-                                        StreamWriter writer = null;
-                                        try
-                                        {
-                                                writer = new StreamWriter(ppoFile);
-                                                writer.Write(xml);
-                                        }
-                                        catch(IOException ex)
-                                        {
-                                                Console.WriteLine("Could not write PPO file '{0}': {1}", ppoFile, ex.Message);
-                                        }
-                                        finally
-                                        {
-                                                if(writer != null)
-                                                {
-                                                        writer.Close();
-                                                }
-                                        }
-                                        return;
-                                }
-                                //start reading the xml config file
-                                XmlElement rootNode = m_CurrentDoc.DocumentElement;
-                                //string suggestedVersion = Helper.AttributeValue(rootNode,"version","1.0");
-                                Helper.CheckForOSVariables = Helper.ParseBoolean(rootNode,"checkOsVars",false);
-
-                                foreach(XmlNode node in rootNode.ChildNodes)//solutions or if pre-proc instructions
-                                {
-                                        IDataNode dataNode = ParseNode(node, null);
-                                        if(dataNode is ProcessNode)
-                                        {
-                                                ProcessNode proc = (ProcessNode)dataNode;
-                                                if(proc.IsValid)
-                                                {
-                                                        ProcessFile(proc.Path);
-                                                }
-                                        }
-                                        else if(dataNode is SolutionNode)
-                                        {
-                                                solutions.Add((SolutionNode)dataNode);
-                                        }
-                                }
-                        }
-                        catch(XmlSchemaException xse)
-                        {
-                                m_Log.Write("XML validation error at line {0} in {1}:\n\n{2}",
-                                        xse.LineNumber, path, xse.Message);
-                        }
-                        finally
-                        {
-                                m_CurrentWorkingDirectory.Pop();
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Allows the project.
-                /// </summary>
-                /// <param name="projectGroupsFlags">The project groups flags.</param>
-                /// <returns></returns>
-                public bool AllowProject(string projectGroupsFlags) 
-                {
-                        if(m_ProjectGroups != null && m_ProjectGroups.Length > 0) 
-                        {
-                                if(projectGroupsFlags != null && projectGroupsFlags.Length == 0) 
-                                {
-                                        foreach(string group in projectGroupsFlags.Split('|')) 
-                                        {
-                                                if(Array.IndexOf(m_ProjectGroups, group) != -1) //if included in the filter list
-                                                {
-                                                        return true;
-                                                }
-                                        }
-                                }
-                                return false;//not included in the list or no groups specified for the project
-                        }
-                        return true;//no filter specified in the command line args
-                }
-
-                /// <summary>
-                /// Gets the type of the node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <returns></returns>
-                public Type GetNodeType(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(!m_Nodes.ContainsKey(node.Name))
-                        {
-                                return null;
-                        }
-
-                        NodeEntry ne = m_Nodes[node.Name];
-                        return ne.Type;
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                /// <param name="parent"></param>
-                /// <returns></returns>
-                public IDataNode ParseNode(XmlNode node, IDataNode parent)
-                {
-                        return ParseNode(node, parent, null);
-                }
-
-                //Create an instance of the data node type that is mapped to the name of the xml DOM node
-                /// <summary>
-                /// Parses the node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="parent">The parent.</param>
-                /// <param name="preNode">The pre node.</param>
-                /// <returns></returns>
-                public IDataNode ParseNode(XmlNode node, IDataNode parent, IDataNode preNode)
-                {
-                        IDataNode dataNode;
-
-                        try
-                        {
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-                                if(preNode == null)
-                                {
-                                        if(!m_Nodes.ContainsKey(node.Name))
-                                        {
-                                                Console.WriteLine("WARNING: Unknown XML node: " + node.Name);
-                                                return null;
-                                        }
-
-                                        NodeEntry ne = m_Nodes[node.Name];
-                                        Type type = ne.Type;
-                                        //DataNodeAttribute dna = ne.Attribute;
-
-                                        dataNode = (IDataNode)type.Assembly.CreateInstance(type.FullName);
-                                        if(dataNode == null)
-                                        {
-                                                throw new System.Reflection.TargetException("Could not create new parser instance: " + type.FullName);
-                                        }
-                                }
-                                else
-                                        dataNode = preNode;
-
-                                dataNode.Parent = parent;
-                                dataNode.Parse(node);
-                        }
-                        catch(WarningException wex)
-                        {
-                                m_Log.Write(LogType.Warning, wex.Message);
-                                return null;
-                        }
-                        catch(FatalException fex)
-                        {
-                                m_Log.WriteException(LogType.Error, fex);
-                                throw;
-                        }
-                        catch(Exception ex)
-                        {
-                                m_Log.WriteException(LogType.Error, ex);
-                                throw;
-                        }
-
-                        return dataNode;
-                }
-
-                /// <summary>
-                /// Initializes the specified target.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="args">The args.</param>
-                public void Initialize(LogTargets target, string[] args)
-                {
-                        CacheTargets(GetType().Assembly);
-                        CacheNodeTypes(GetType().Assembly);
-                        CacheVersion();
-
-                        m_CommandLine = new CommandLineCollection(args);
-            
-                        string logFile = null;
-                        if(m_CommandLine.WasPassed("log")) 
-                        {
-                                logFile = m_CommandLine["log"];
-
-                                if(logFile != null && logFile.Length == 0)
-                                {
-                                        logFile = "Prebuild.log";
-                                }
-                        }
-                        else 
-                        {
-                                target = target & ~LogTargets.File;     //dont output to a file
-                        }
-            
-                        m_Log = new Log(target, logFile);
-                        LogBanner();
-
-                        m_CurrentWorkingDirectory = new CurrentDirectory();
-
-                        m_Target = m_CommandLine["target"];
-                        m_Clean = m_CommandLine["clean"];
-                        string removeDirs = m_CommandLine["removedir"];
-                        if(removeDirs != null && removeDirs.Length == 0) 
-                        {
-                                m_RemoveDirectories = removeDirs.Split('|');
-                        }
-
-                        string flags = m_CommandLine["allowedgroups"];//allows filtering by specifying a pipe-delimited list of groups to include
-                        if(flags != null && flags.Length == 0)
-                        {
-                                m_ProjectGroups = flags.Split('|');
-                        }
-                        m_PauseAfterFinish = m_CommandLine.WasPassed("pause");
-
-                        LoadSchema();
-                }
-
-                /// <summary>
-                /// Processes this instance.
-                /// </summary>
-                public void Process()
-                {
-                        bool perfomedOtherTask = false;
-                        if(m_RemoveDirectories != null && m_RemoveDirectories.Length > 0) 
-                        {
-                                try
-                                {
-                                        RemoveDirectories(".",m_RemoveDirectories);
-                                } 
-                                catch(IOException e) 
-                                {
-                                        m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
-                                        m_Log.WriteException(LogType.Error,e);
-                                }
-                                catch(UnauthorizedAccessException e) 
-                                {
-                                        m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
-                                        m_Log.WriteException(LogType.Error,e);
-                                }
-                                perfomedOtherTask = true;
-                        }
-
-                        if(m_Target != null && m_Clean != null)
-                        {
-                                m_Log.Write(LogType.Error, "The options /target and /clean cannot be passed together");
-                                return;
-                        }
-                    
+                }
+                catch(XmlException e)
+                {
+                    throw new XmlException(e.ToString());
+                }
+
+                //is there a purpose to writing it?  An syntax/schema problem would have been found during pre.Process() and reported with details
+                if(m_CommandLine.WasPassed("ppo"))
+                {
+                    string ppoFile = m_CommandLine["ppo"];
+                    if(ppoFile == null || ppoFile.Trim().Length < 1)
+                    {
+                        ppoFile = "preprocessed.xml";
+                    }
+
+                    StreamWriter writer = null;
+                    try
+                    {
+                        writer = new StreamWriter(ppoFile);
+                        writer.Write(xml);
+                    }
+                    catch(IOException ex)
+                    {
+                        Console.WriteLine("Could not write PPO file '{0}': {1}", ppoFile, ex.Message);
+                    }
+                    finally
+                    {
+                        if(writer != null)
+                        {
+                            writer.Close();
+                        }
+                    }
+                    return;
+                }
+                //start reading the xml config file
+                XmlElement rootNode = m_CurrentDoc.DocumentElement;
+                //string suggestedVersion = Helper.AttributeValue(rootNode,"version","1.0");
+                Helper.CheckForOSVariables = Helper.ParseBoolean(rootNode,"checkOsVars",false);
+
+                foreach(XmlNode node in rootNode.ChildNodes)//solutions or if pre-proc instructions
+                {
+                    IDataNode dataNode = ParseNode(node, null);
+                    if(dataNode is ProcessNode)
+                    {
+                        ProcessNode proc = (ProcessNode)dataNode;
+                        if(proc.IsValid)
+                        {
+                            ProcessFile(proc.Path);
+                        }
+                    }
+                    else if(dataNode is SolutionNode)
+                    {
+                        solutions.Add((SolutionNode)dataNode);
+                    }
+                }
+            }
+            catch(XmlSchemaException xse)
+            {
+                m_Log.Write("XML validation error at line {0} in {1}:\n\n{2}",
+                    xse.LineNumber, path, xse.Message);
+            }
+            finally
+            {
+                m_CurrentWorkingDirectory.Pop();
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Allows the project.
+        /// </summary>
+        /// <param name="projectGroupsFlags">The project groups flags.</param>
+        /// <returns></returns>
+        public bool AllowProject(string projectGroupsFlags)
+        {
+            if(m_ProjectGroups != null && m_ProjectGroups.Length > 0)
+            {
+                if(projectGroupsFlags != null && projectGroupsFlags.Length == 0)
+                {
+                    foreach(string group in projectGroupsFlags.Split('|'))
+                    {
+                        if(Array.IndexOf(m_ProjectGroups, group) != -1) //if included in the filter list
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;//not included in the list or no groups specified for the project
+            }
+            return true;//no filter specified in the command line args
+        }
+
+        /// <summary>
+        /// Gets the type of the node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        /// <returns></returns>
+        public Type GetNodeType(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+            if(!m_Nodes.ContainsKey(node.Name))
+            {
+                return null;
+            }
+
+            NodeEntry ne = m_Nodes[node.Name];
+            return ne.Type;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="parent"></param>
+        /// <returns></returns>
+        public IDataNode ParseNode(XmlNode node, IDataNode parent)
+        {
+            return ParseNode(node, parent, null);
+        }
+
+        //Create an instance of the data node type that is mapped to the name of the xml DOM node
+        /// <summary>
+        /// Parses the node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        /// <param name="parent">The parent.</param>
+        /// <param name="preNode">The pre node.</param>
+        /// <returns></returns>
+        public IDataNode ParseNode(XmlNode node, IDataNode parent, IDataNode preNode)
+        {
+            IDataNode dataNode;
+
+            try
+            {
+                if( node == null )
+                {
+                    throw new ArgumentNullException("node");
+                }
+                if(preNode == null)
+                {
+                    if(!m_Nodes.ContainsKey(node.Name))
+                    {
+                        Console.WriteLine("WARNING: Unknown XML node: " + node.Name);
+                        return null;
+                    }
+
+                    NodeEntry ne = m_Nodes[node.Name];
+                    Type type = ne.Type;
+                    //DataNodeAttribute dna = ne.Attribute;
+
+                    dataNode = (IDataNode)type.Assembly.CreateInstance(type.FullName);
+                    if(dataNode == null)
+                    {
+                        throw new System.Reflection.TargetException("Could not create new parser instance: " + type.FullName);
+                    }
+                }
+                else
+                    dataNode = preNode;
+
+                dataNode.Parent = parent;
+                dataNode.Parse(node);
+            }
+            catch(WarningException wex)
+            {
+                m_Log.Write(LogType.Warning, wex.Message);
+                return null;
+            }
+            catch(FatalException fex)
+            {
+                m_Log.WriteException(LogType.Error, fex);
+                throw;
+            }
+            catch(Exception ex)
+            {
+                m_Log.WriteException(LogType.Error, ex);
+                throw;
+            }
+
+            return dataNode;
+        }
+
+        /// <summary>
+        /// Initializes the specified target.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="args">The args.</param>
+        public void Initialize(LogTargets target, string[] args)
+        {
+            CacheTargets(GetType().Assembly);
+            CacheNodeTypes(GetType().Assembly);
+            CacheVersion();
+
+            m_CommandLine = new CommandLineCollection(args);
+
+            string logFile = null;
+            if(m_CommandLine.WasPassed("log"))
+            {
+                logFile = m_CommandLine["log"];
+
+                if(logFile != null && logFile.Length == 0)
+                {
+                    logFile = "Prebuild.log";
+                }
+            }
+            else
+            {
+                target = target & ~LogTargets.File;     //dont output to a file
+            }
+
+            m_Log = new Log(target, logFile);
+            LogBanner();
+
+            m_CurrentWorkingDirectory = new CurrentDirectory();
+
+            m_Target = m_CommandLine["target"];
+            m_Clean = m_CommandLine["clean"];
+            string removeDirs = m_CommandLine["removedir"];
+            if(removeDirs != null && removeDirs.Length == 0)
+            {
+                m_RemoveDirectories = removeDirs.Split('|');
+            }
+
+            string flags = m_CommandLine["allowedgroups"];//allows filtering by specifying a pipe-delimited list of groups to include
+            if(flags != null && flags.Length == 0)
+            {
+                m_ProjectGroups = flags.Split('|');
+            }
+            m_PauseAfterFinish = m_CommandLine.WasPassed("pause");
+
+            LoadSchema();
+        }
+
+        /// <summary>
+        /// Processes this instance.
+        /// </summary>
+        public void Process()
+        {
+            bool perfomedOtherTask = false;
+            if(m_RemoveDirectories != null && m_RemoveDirectories.Length > 0)
+            {
+                try
+                {
+                    RemoveDirectories(".",m_RemoveDirectories);
+                }
+                catch(IOException e)
+                {
+                    m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
+                    m_Log.WriteException(LogType.Error,e);
+                }
+                catch(UnauthorizedAccessException e)
+                {
+                    m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
+                    m_Log.WriteException(LogType.Error,e);
+                }
+                perfomedOtherTask = true;
+            }
+
+            if(m_Target != null && m_Clean != null)
+            {
+                m_Log.Write(LogType.Error, "The options /target and /clean cannot be passed together");
+                return;
+            }
+
             if(m_Target == null && m_Clean == null)
-                    {
-                        if(perfomedOtherTask) //finished
-                        {
-                            return;
-                        }
-                        m_Log.Write(LogType.Error, "Must pass either /target or /clean to process a Prebuild file");
-                        return;
-                    }
-
-                    string file = "./prebuild.xml";
-                        if(m_CommandLine.WasPassed("file"))
-                        {
-                                file = m_CommandLine["file"];
-                        }
-
-                        ProcessFile(file);
-
-                        string target = (m_Target != null ? m_Target.ToLower() : m_Clean.ToLower());
-                        bool clean = (m_Target == null);
-                        if(clean && target != null && target.Length == 0)
-                        {
-                                target = "all";
-                        }
-                        if(clean && target == "all")//default to all if no target was specified for clean
-                        {
+            {
+                if(perfomedOtherTask) //finished
+                {
+                    return;
+                }
+                m_Log.Write(LogType.Error, "Must pass either /target or /clean to process a Prebuild file");
+                return;
+            }
+
+            string file = "./prebuild.xml";
+            if(m_CommandLine.WasPassed("file"))
+            {
+                file = m_CommandLine["file"];
+            }
+
+            ProcessFile(file);
+
+            string target = (m_Target != null ? m_Target.ToLower() : m_Clean.ToLower());
+            bool clean = (m_Target == null);
+            if(clean && target != null && target.Length == 0)
+            {
+                target = "all";
+            }
+            if(clean && target == "all")//default to all if no target was specified for clean
+            {
                 //check if they passed yes
                 if (!m_CommandLine.WasPassed("yes"))
                 {
-                                    Console.WriteLine("WARNING: This operation will clean ALL project files for all targets, are you sure? (y/n):");
-                                    string ret = Console.ReadLine();
-                                    if(ret == null)
-                                    {
-                                            return;
-                                    }
-                                    ret = ret.Trim().ToLower();
-                                    if((ret.ToLower() != "y" && ret.ToLower() != "yes"))
-                                    {
-                                            return;
+                    Console.WriteLine("WARNING: This operation will clean ALL project files for all targets, are you sure? (y/n):");
+                    string ret = Console.ReadLine();
+                    if(ret == null)
+                    {
+                        return;
                     }
+                    ret = ret.Trim().ToLower();
+                    if((ret.ToLower() != "y" && ret.ToLower() != "yes"))
+                    {
+                        return;
+                    }
+                }
+                //clean all targets (just cleaning vs2002 target didn't clean nant)
+                foreach(ITarget targ in m_Targets.Values)
+                {
+                    targ.Clean(this);
                 }
-                                //clean all targets (just cleaning vs2002 target didn't clean nant)
-                                foreach(ITarget targ in m_Targets.Values)
-                                {
-                                        targ.Clean(this);
-                                }
-                        }
-                        else
-                        {
-                                if (!m_Targets.ContainsKey(target)) {
-                                        m_Log.Write(LogType.Error, "Unknown Target \"{0}\"", target);
-                                        return;
-                                }
-                                ITarget targ = m_Targets[target];
-
-                                if(clean)
-                                {
-                                        targ.Clean(this);
-                                }
-                                else
-                                {
-                                        targ.Write(this);
-                                }
-                        }
-
-                        m_Log.Flush();
-                }
-
-                #endregion        
-
-                #region IDisposable Members
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public void Dispose()
-                {
-                        Dispose(true);
-                        GC.SuppressFinalize(this);
-                }
-
-                /// <summary>
-                /// Dispose objects
-                /// </summary>
-                /// <param name="disposing">
-                /// If true, it will dispose close the handle
-                /// </param>
-                /// <remarks>
-                /// Will dispose managed and unmanaged resources.
-                /// </remarks>
-                protected virtual void Dispose(bool disposing)
-                {
-                        if (!disposed)
-                        {
-                                if (disposing)
-                                {
+            }
+            else
+            {
+                if (!m_Targets.ContainsKey(target)) {
+                    m_Log.Write(LogType.Error, "Unknown Target \"{0}\"", target);
+                    return;
+                }
+                ITarget targ = m_Targets[target];
+
+                if(clean)
+                {
+                    targ.Clean(this);
+                }
+                else
+                {
+                    targ.Write(this);
+                }
+            }
+
+            m_Log.Flush();
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        ///
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Dispose objects
+        /// </summary>
+        /// <param name="disposing">
+        /// If true, it will dispose close the handle
+        /// </param>
+        /// <remarks>
+        /// Will dispose managed and unmanaged resources.
+        /// </remarks>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
                     GC.SuppressFinalize(this);
-                                        if (m_Log != null)
-                                        {
-                                                m_Log.Close();
-                                                m_Log = null;
-                                        }
-                                }
-                        }
-                        disposed = true;
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                ~Kernel()
-                {
-                        Dispose(false);
-                }
-                
-                /// <summary>
-                /// Closes and destroys this object
-                /// </summary>
-                /// <remarks>
-                /// Same as Dispose(true)
-                /// </remarks>
-                public void Close() 
-                {
-                        Dispose();
-                }
-
-                #endregion
-        }
+                    if (m_Log != null)
+                    {
+                        m_Log.Close();
+                        m_Log = null;
+                    }
+                }
+            }
+            disposed = true;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        ~Kernel()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Closes and destroys this object
+        /// </summary>
+        /// <remarks>
+        /// Same as Dispose(true)
+        /// </remarks>
+        public void Close()
+        {
+            Dispose();
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/AuthorNode.cs b/Prebuild/src/Core/Nodes/AuthorNode.cs
index 4c415bb..e4b024f 100644
--- a/Prebuild/src/Core/Nodes/AuthorNode.cs
+++ b/Prebuild/src/Core/Nodes/AuthorNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,56 +32,56 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Author")]
-        public class AuthorNode : DataNode
-        {
-                #region Fields
-
-                private string m_Signature;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the signature.
-                /// </summary>
-                /// <value>The signature.</value>
-                public string Signature
-                {
-                        get
-                        {
-                                return m_Signature;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        m_Signature = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Signature == null)
-                        {
-                                m_Signature = "";
-                        }
-
-                        m_Signature = m_Signature.Trim();
-                }
-
-                #endregion
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Author")]
+    public class AuthorNode : DataNode
+    {
+        #region Fields
+
+        private string m_Signature;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the signature.
+        /// </summary>
+        /// <value>The signature.</value>
+        public string Signature
+        {
+            get
+            {
+                return m_Signature;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Signature = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+            if(m_Signature == null)
+            {
+                m_Signature = "";
+            }
+
+            m_Signature = m_Signature.Trim();
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/CleanFilesNode.cs b/Prebuild/src/Core/Nodes/CleanFilesNode.cs
index 71405f9..bd564d5 100644
--- a/Prebuild/src/Core/Nodes/CleanFilesNode.cs
+++ b/Prebuild/src/Core/Nodes/CleanFilesNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
diff --git a/Prebuild/src/Core/Nodes/CleanupNode.cs b/Prebuild/src/Core/Nodes/CleanupNode.cs
index b8131b0..f334ea3 100644
--- a/Prebuild/src/Core/Nodes/CleanupNode.cs
+++ b/Prebuild/src/Core/Nodes/CleanupNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -35,40 +35,40 @@ namespace Prebuild.Core.Nodes
     [DataNode("Cleanup")]
     public class CleanupNode : DataNode
     {
-                #region Fields
+        #region Fields
 
-                private List<CleanFilesNode> m_CleanFiles = new List<CleanFilesNode>();
+        private List<CleanFilesNode> m_CleanFiles = new List<CleanFilesNode>();
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                /// <summary>
-                /// Gets the signature.
-                /// </summary>
-                /// <value>The signature.</value>
+        /// <summary>
+        /// Gets the signature.
+        /// </summary>
+        /// <value>The signature.</value>
         public List<CleanFilesNode> CleanFiles
-                {
-                        get
-                        {
-                                return m_CleanFiles;
-                        }
-                }
+        {
+            get
+            {
+                return m_CleanFiles;
+            }
+        }
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
 
             foreach (XmlNode child in node.ChildNodes)
             {
@@ -78,8 +78,8 @@ namespace Prebuild.Core.Nodes
                     m_CleanFiles.Add((CleanFilesNode)dataNode);
                 }
             }
-                }
+        }
 
-                #endregion
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index cd2f740..a101799 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,185 +32,185 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Configuration")]
-        public class ConfigurationNode : DataNode, ICloneable, IComparable
-        {
-                #region Fields
-
-                private string m_Name = "unknown";
-                private string m_Platform = "AnyCPU";
-                private OptionsNode m_Options;
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
-                /// </summary>
-                public ConfigurationNode()
-                {
-                        m_Options = new OptionsNode();
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public override IDataNode Parent
-                {
-                        get
-                        {
-                                return base.Parent;
-                        }
-                        set
-                        {
-                                base.Parent = value;
-                                if(base.Parent is SolutionNode)
-                                {
-                                        SolutionNode node = (SolutionNode)base.Parent;
-                                        if(node != null && node.Options != null)
-                                        {
-                                                node.Options.CopyTo(m_Options);
-                                        }
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Identifies the platform for this specific configuration.
-                /// </summary>
-                public string Platform
-                {
-                        get
-                        {
-                                return m_Platform;
-                        }
-                        set
-                        {
-                                switch ((value + "").ToLower())
-                                {
-                                case "x86":
-                                case "x64":
-                                        m_Platform = value;
-                                        break;
-                                case "itanium":
-                                        m_Platform = "Itanium";
-                                        break;
-                                default:
-                                        m_Platform = "AnyCPU";
-                                        break;
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the name and platform for the configuration.
-                /// </summary>
-                /// <value>The name and platform.</value>
-                public string NameAndPlatform
-                {
-                        get
-                        {
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Configuration")]
+    public class ConfigurationNode : DataNode, ICloneable, IComparable
+    {
+        #region Fields
+
+        private string m_Name = "unknown";
+        private string m_Platform = "AnyCPU";
+        private OptionsNode m_Options;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
+        /// </summary>
+        public ConfigurationNode()
+        {
+            m_Options = new OptionsNode();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the parent.
+        /// </summary>
+        /// <value>The parent.</value>
+        public override IDataNode Parent
+        {
+            get
+            {
+                return base.Parent;
+            }
+            set
+            {
+                base.Parent = value;
+                if(base.Parent is SolutionNode)
+                {
+                    SolutionNode node = (SolutionNode)base.Parent;
+                    if(node != null && node.Options != null)
+                    {
+                        node.Options.CopyTo(m_Options);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Identifies the platform for this specific configuration.
+        /// </summary>
+        public string Platform
+        {
+            get
+            {
+                return m_Platform;
+            }
+            set
+            {
+                switch ((value + "").ToLower())
+                {
+                case "x86":
+                case "x64":
+                    m_Platform = value;
+                    break;
+                case "itanium":
+                    m_Platform = "Itanium";
+                    break;
+                default:
+                    m_Platform = "AnyCPU";
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name and platform for the configuration.
+        /// </summary>
+        /// <value>The name and platform.</value>
+        public string NameAndPlatform
+        {
+            get
+            {
                 string platform = m_Platform;
                 if (platform == "AnyCPU")
                     platform = "Any CPU";
 
-                                return String.Format("{0}|{1}", m_Name, platform);
-                        }
-                }
-
-                /// <summary>
-                /// Gets or sets the options.
-                /// </summary>
-                /// <value>The options.</value>
-                public OptionsNode Options
-                {
-                        get
-                        {
-                                return m_Options;
-                        }
-                        set
-                        {
-                                m_Options = value;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        Platform = Helper.AttributeValue(node, "platform", m_Platform);
-
-                        if (node == null)
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is OptionsNode)
-                                {
-                                        ((OptionsNode)dataNode).CopyTo(m_Options);
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Copies to.
-                /// </summary>
-                /// <param name="conf">The conf.</param>
-                public void CopyTo(ConfigurationNode conf)
-                {
-                        m_Options.CopyTo(conf.m_Options);
-                }
-
-                #endregion
-
-                #region ICloneable Members
-
-                /// <summary>
-                /// Creates a new object that is a copy of the current instance.
-                /// </summary>
-                /// <returns>
-                /// A new object that is a copy of this instance.
-                /// </returns>
-                public object Clone()
-                {
-                        ConfigurationNode ret = new ConfigurationNode();
-                        ret.m_Name = m_Name;
-                        ret.m_Platform = m_Platform;
-                        m_Options.CopyTo(ret.m_Options);
-                        return ret;
-                }
-
-                #endregion
+                return String.Format("{0}|{1}", m_Name, platform);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the options.
+        /// </summary>
+        /// <value>The options.</value>
+        public OptionsNode Options
+        {
+            get
+            {
+                return m_Options;
+            }
+            set
+            {
+                m_Options = value;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            m_Name = Helper.AttributeValue(node, "name", m_Name);
+            Platform = Helper.AttributeValue(node, "platform", m_Platform);
+
+            if (node == null)
+            {
+                throw new ArgumentNullException("node");
+            }
+            foreach(XmlNode child in node.ChildNodes)
+            {
+                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                if(dataNode is OptionsNode)
+                {
+                    ((OptionsNode)dataNode).CopyTo(m_Options);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copies to.
+        /// </summary>
+        /// <param name="conf">The conf.</param>
+        public void CopyTo(ConfigurationNode conf)
+        {
+            m_Options.CopyTo(conf.m_Options);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        /// <summary>
+        /// Creates a new object that is a copy of the current instance.
+        /// </summary>
+        /// <returns>
+        /// A new object that is a copy of this instance.
+        /// </returns>
+        public object Clone()
+        {
+            ConfigurationNode ret = new ConfigurationNode();
+            ret.m_Name = m_Name;
+            ret.m_Platform = m_Platform;
+            m_Options.CopyTo(ret.m_Options);
+            return ret;
+        }
+
+        #endregion
 
         #region IComparable Members
 
@@ -221,5 +221,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-        }
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs b/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs
index 1c38d9e..eba6550 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -27,45 +27,45 @@ using System.Collections.Generic;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// Implements a specialized list of configuration nodes which allows for lookup via
-        /// configuration name and platform.
-        /// </summary>
-        public class ConfigurationNodeCollection : List<ConfigurationNode>
-        {
-                #region Properties
+    /// <summary>
+    /// Implements a specialized list of configuration nodes which allows for lookup via
+    /// configuration name and platform.
+    /// </summary>
+    public class ConfigurationNodeCollection : List<ConfigurationNode>
+    {
+        #region Properties
 
-                public ConfigurationNode this[string nameAndPlatform]
-                {
-                        get
-                        {
-                                foreach (ConfigurationNode configurationNode in this)
-                                {
-                                        if (configurationNode.NameAndPlatform == nameAndPlatform)
-                                        {
-                                                return configurationNode;
-                                        }
-                                }
+        public ConfigurationNode this[string nameAndPlatform]
+        {
+            get
+            {
+                foreach (ConfigurationNode configurationNode in this)
+                {
+                    if (configurationNode.NameAndPlatform == nameAndPlatform)
+                    {
+                        return configurationNode;
+                    }
+                }
 
-                                return null;
-                        }
+                return null;
+            }
 
-                        set
-                        {
-                                // See if the node 
-                                ConfigurationNode configurationNode = this[nameAndPlatform];
+            set
+            {
+                // See if the node
+                ConfigurationNode configurationNode = this[nameAndPlatform];
 
-                                if (configurationNode != null)
-                                {
-                                        this[IndexOf(configurationNode)] = value;
-                                }
-                                else
-                                {
-                                        Add(value);
-                                }
-                        }
-                }
+                if (configurationNode != null)
+                {
+                    this[IndexOf(configurationNode)] = value;
+                }
+                else
+                {
+                    Add(value);
+                }
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/DataNode.cs b/Prebuild/src/Core/Nodes/DataNode.cs
index 318b13c..4f20588 100644
--- a/Prebuild/src/Core/Nodes/DataNode.cs
+++ b/Prebuild/src/Core/Nodes/DataNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,86 +32,86 @@ using System.IO;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public abstract class DataNode : IDataNode
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    public abstract class DataNode : IDataNode
+    {
+        #region Fields
 
-                private IDataNode parent;
-                string[] m_WebTypes = new string[] { "aspx", "ascx", "master", "ashx", "asmx" };
+        private IDataNode parent;
+        string[] m_WebTypes = new string[] { "aspx", "ascx", "master", "ashx", "asmx" };
 
-                #endregion
+        #endregion
 
-                #region IDataNode Members
+        #region IDataNode Members
 
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public virtual IDataNode Parent
-                {
-                        get
-                        {
-                                return parent;
-                        }
-                        set
-                        {
-                                parent = value;
-                        }
-                }
-                public string[] WebTypes
-                {
-                        get { return m_WebTypes; }
-                }
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public virtual void Parse(XmlNode node)
-                {
-                }
-                public BuildAction GetBuildActionByFileName(string fileName)
-                {
-                        string extension = Path.GetExtension(fileName).ToLower();
-                        foreach (string type in WebTypes)
-                        {
-                                if (extension == type)
-                                        return BuildAction.Content;
-                        }
-                        return BuildAction.Compile;
-                }
-                /// <summary>
-                /// Parses the file type to figure out what type it is
-                /// </summary>
-                /// <returns></returns>
-                public SubType GetSubTypeByFileName(string fileName)
-                {
-                        string extension = System.IO.Path.GetExtension(fileName).ToLower();
-                        string designer = String.Format(".designer{0}", extension);
-                        string path = fileName.ToLower();
-                        if (extension == ".resx")
-                        {
-                                return SubType.Designer;
-                        }
-                        else if (path.EndsWith(".settings"))
-                        {
-                                return SubType.Settings;
-                        }
-                        else
-                        {
-                                
-                                foreach (string type in WebTypes)
-                                {
+        /// <summary>
+        /// Gets or sets the parent.
+        /// </summary>
+        /// <value>The parent.</value>
+        public virtual IDataNode Parent
+        {
+            get
+            {
+                return parent;
+            }
+            set
+            {
+                parent = value;
+            }
+        }
+        public string[] WebTypes
+        {
+            get { return m_WebTypes; }
+        }
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public virtual void Parse(XmlNode node)
+        {
+        }
+        public BuildAction GetBuildActionByFileName(string fileName)
+        {
+            string extension = Path.GetExtension(fileName).ToLower();
+            foreach (string type in WebTypes)
+            {
+                if (extension == type)
+                    return BuildAction.Content;
+            }
+            return BuildAction.Compile;
+        }
+        /// <summary>
+        /// Parses the file type to figure out what type it is
+        /// </summary>
+        /// <returns></returns>
+        public SubType GetSubTypeByFileName(string fileName)
+        {
+            string extension = System.IO.Path.GetExtension(fileName).ToLower();
+            string designer = String.Format(".designer{0}", extension);
+            string path = fileName.ToLower();
+            if (extension == ".resx")
+            {
+                return SubType.Designer;
+            }
+            else if (path.EndsWith(".settings"))
+            {
+                return SubType.Settings;
+            }
+            else
+            {
+
+                foreach (string type in WebTypes)
+                {
                     if (path.EndsWith(type))
-                                        {
-                                                return SubType.CodeBehind;
-                                        }
-                                }
-                        }
-                        return SubType.Code;
-                }
-                #endregion
-        }
+                    {
+                        return SubType.CodeBehind;
+                    }
+                }
+            }
+            return SubType.Code;
+        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/DatabaseReferenceNode.cs b/Prebuild/src/Core/Nodes/DatabaseReferenceNode.cs
index 845db24..974b74e 100644
--- a/Prebuild/src/Core/Nodes/DatabaseReferenceNode.cs
+++ b/Prebuild/src/Core/Nodes/DatabaseReferenceNode.cs
@@ -43,18 +43,18 @@ namespace Prebuild.Core.Nodes
                         providerId = new Guid("7F041D59-D76A-44ed-9AA2-FBF6B0548B80"); break;
                     case "System.Data.OracleClient":
                         providerId = new Guid("8F5C5018-AE09-42cf-B2CC-2CCCC7CFC2BB"); break;
-                    case "System.Data.SqlClient": 
+                    case "System.Data.SqlClient":
                         providerId = new Guid("91510608-8809-4020-8897-FBA057E22D54"); break;
                     case "System.Data.Odbc":
                         providerId = new Guid("C3D4F4CE-2C48-4381-B4D6-34FA50C51C86"); break;
-                    
+
                     default:
                         throw new ArgumentOutOfRangeException("providerName", providerName, "Could not provider name to an id.");
                 }
             }
             else
                 providerId = new Guid(Helper.AttributeValue(node, "providerId", Guid.Empty.ToString("B")));
-            
+
             connectionString = Helper.AttributeValue(node, "connectionString", connectionString);
 
             base.Parse(node);
diff --git a/Prebuild/src/Core/Nodes/DescriptionNode.cs b/Prebuild/src/Core/Nodes/DescriptionNode.cs
index d1293a0..713b47c 100644
--- a/Prebuild/src/Core/Nodes/DescriptionNode.cs
+++ b/Prebuild/src/Core/Nodes/DescriptionNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,56 +32,56 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// The object representing the /Prebuild/Solution/Project/Description element
-        /// </summary>
-        [DataNode("Description")]
-        public class DescriptionNode : DataNode
-        {
-                #region Fields
-
-                private string m_Value;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the description Value.
-                /// </summary>
-                /// <value>The description Value.</value>
-                public string Value
-                {
-                        get
-                        {
-                                return m_Value;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        m_Value = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Value == null)
-                        {
-                                m_Value = "";
-                        }
-
-                        m_Value = m_Value.Trim();
-                }
-
-                #endregion
-        }
+    /// <summary>
+    /// The object representing the /Prebuild/Solution/Project/Description element
+    /// </summary>
+    [DataNode("Description")]
+    public class DescriptionNode : DataNode
+    {
+        #region Fields
+
+        private string m_Value;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the description Value.
+        /// </summary>
+        /// <value>The description Value.</value>
+        public string Value
+        {
+            get
+            {
+                return m_Value;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Value = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+            if(m_Value == null)
+            {
+                m_Value = "";
+            }
+
+            m_Value = m_Value.Trim();
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ExcludeNode.cs b/Prebuild/src/Core/Nodes/ExcludeNode.cs
index 7f04cba..addbdb4 100644
--- a/Prebuild/src/Core/Nodes/ExcludeNode.cs
+++ b/Prebuild/src/Core/Nodes/ExcludeNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,31 +32,31 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Exclude")]
-        public class ExcludeNode : DataNode
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Exclude")]
+    public class ExcludeNode : DataNode
+    {
+        #region Fields
 
         private string m_Pattern = "";
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Pattern;
-                        }
-                }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Pattern;
+            }
+        }
 
         /// <summary>
         /// Gets the pattern.
@@ -72,18 +72,18 @@ namespace Prebuild.Core.Nodes
 
         #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
             m_Pattern = Helper.AttributeValue( node, "name", m_Pattern );
             m_Pattern = Helper.AttributeValue(node, "pattern", m_Pattern );
-                }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/FileNode.cs b/Prebuild/src/Core/Nodes/FileNode.cs
index b313ffa..c66f123 100644
--- a/Prebuild/src/Core/Nodes/FileNode.cs
+++ b/Prebuild/src/Core/Nodes/FileNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,193 +34,193 @@ using Prebuild.Core.Targets;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum BuildAction
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Compile,
-                /// <summary>
-                /// 
-                /// </summary>
-                Content,
-                /// <summary>
-                /// 
-                /// </summary>
-                EmbeddedResource,
-                /// <summary>
-                /// 
-                /// </summary>
-                ApplicationDefinition,
-                /// <summary>
-                /// 
-                /// </summary>
-                Page,
+    /// <summary>
+    ///
+    /// </summary>
+    public enum BuildAction
+    {
         /// <summary>
-        /// 
+        ///
+        /// </summary>
+        None,
+        /// <summary>
+        ///
+        /// </summary>
+        Compile,
+        /// <summary>
+        ///
+        /// </summary>
+        Content,
+        /// <summary>
+        ///
+        /// </summary>
+        EmbeddedResource,
+        /// <summary>
+        ///
+        /// </summary>
+        ApplicationDefinition,
+        /// <summary>
+        ///
+        /// </summary>
+        Page,
+        /// <summary>
+        ///
         /// </summary>
         Copy
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum SubType
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                Code,
-                /// <summary>
-                /// 
-                /// </summary>
-                Component,
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    public enum SubType
+    {
         /// <summary>
-        /// 
+        ///
+        /// </summary>
+        Code,
+        /// <summary>
+        ///
+        /// </summary>
+        Component,
+        /// <summary>
+        ///
         /// </summary>
         Designer,
-                /// <summary>
-                /// 
-                /// </summary>
-                Form,
-                /// <summary>
-                /// 
-                /// </summary>
-                Settings,
-                /// <summary>
-                /// 
-                /// </summary>
-                UserControl,
-                /// <summary>
-                /// 
-                /// </summary>
-                CodeBehind,
-        }
-
-        public enum CopyToOutput
-        {
-                Never,
-                Always,
-                PreserveNewest
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("File")]
-        public class FileNode : DataNode
-        {
-                #region Fields
-
-                private string m_Path;
-                private string m_ResourceName = "";
-                private BuildAction? m_BuildAction;
-                private bool m_Valid;
-                private SubType? m_SubType;
-                private CopyToOutput m_CopyToOutput = CopyToOutput.Never;
-                private bool m_Link = false;
-                private string m_LinkPath = string.Empty;
+        /// <summary>
+        ///
+        /// </summary>
+        Form,
+        /// <summary>
+        ///
+        /// </summary>
+        Settings,
+        /// <summary>
+        ///
+        /// </summary>
+        UserControl,
+        /// <summary>
+        ///
+        /// </summary>
+        CodeBehind,
+    }
+
+    public enum CopyToOutput
+    {
+        Never,
+        Always,
+        PreserveNewest
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("File")]
+    public class FileNode : DataNode
+    {
+        #region Fields
+
+        private string m_Path;
+        private string m_ResourceName = "";
+        private BuildAction? m_BuildAction;
+        private bool m_Valid;
+        private SubType? m_SubType;
+        private CopyToOutput m_CopyToOutput = CopyToOutput.Never;
+        private bool m_Link = false;
+        private string m_LinkPath = string.Empty;
         private bool m_PreservePath = false;
 
 
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string ResourceName
-                {
-                        get
-                        {
-                                return m_ResourceName;
-                        }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public BuildAction BuildAction
-                {
-                        get
-                        {
-                                if (m_BuildAction != null)
-                                        return m_BuildAction.Value;
-                                else
-                                        return GetBuildActionByFileName(this.Path);
-
-                        }
-                }
-
-                public CopyToOutput CopyToOutput
-                {
-                        get
-                        {
-                                return this.m_CopyToOutput;
-                        }
-                }
-
-                public bool IsLink
-                {
-                        get
-                        {
-                                return this.m_Link;
-                        }
-                }
-
-                public string LinkPath
-                {
-                        get
-                        {
-                                return this.m_LinkPath;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public SubType SubType
-                {
-                        get
-                        {
-                                if (m_SubType != null)
-                                        return m_SubType.Value;
-                                else
-                                        return GetSubTypeByFileName(this.Path);
-                        }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool IsValid
-                {
-                        get
-                        {
-                                return m_Valid;
-                        }
-                }
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string ResourceName
+        {
+            get
+            {
+                return m_ResourceName;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public BuildAction BuildAction
+        {
+            get
+            {
+                if (m_BuildAction != null)
+                    return m_BuildAction.Value;
+                else
+                    return GetBuildActionByFileName(this.Path);
+
+            }
+        }
+
+        public CopyToOutput CopyToOutput
+        {
+            get
+            {
+                return this.m_CopyToOutput;
+            }
+        }
 
+        public bool IsLink
+        {
+            get
+            {
+                return this.m_Link;
+            }
+        }
+
+        public string LinkPath
+        {
+            get
+            {
+                return this.m_LinkPath;
+            }
+        }
         /// <summary>
-        /// 
+        ///
+        /// </summary>
+        public SubType SubType
+        {
+            get
+            {
+                if (m_SubType != null)
+                    return m_SubType.Value;
+                else
+                    return GetSubTypeByFileName(this.Path);
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool IsValid
+        {
+            get
+            {
+                return m_Valid;
+            }
+        }
+
+        /// <summary>
+        ///
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
@@ -232,61 +232,61 @@ namespace Prebuild.Core.Nodes
             }
         }
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                public override void Parse(XmlNode node)
-                {
-                        string buildAction = Helper.AttributeValue(node, "buildAction", String.Empty);
-                        if (buildAction != string.Empty)
-                                m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), buildAction);
-                        string subType = Helper.AttributeValue(node, "subType", string.Empty);
-                        if (subType != String.Empty)
-                                m_SubType = (SubType)Enum.Parse(typeof(SubType), subType);
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="node"></param>
+        public override void Parse(XmlNode node)
+        {
+            string buildAction = Helper.AttributeValue(node, "buildAction", String.Empty);
+            if (buildAction != string.Empty)
+                m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), buildAction);
+            string subType = Helper.AttributeValue(node, "subType", string.Empty);
+            if (subType != String.Empty)
+                m_SubType = (SubType)Enum.Parse(typeof(SubType), subType);
 
             Console.WriteLine("[FileNode]:BuildAction is {0}", buildAction);
 
 
-                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
-                        this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
-                        if ( this.m_Link == true )
-                        {
-                                this.m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
-                        }
-                        this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
+            m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
+            this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+            if ( this.m_Link == true )
+            {
+                this.m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
+            }
+            this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
             this.m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
 
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-
-                        m_Path = m_Path.Trim();
-                        m_Valid = true;
-                        if(!File.Exists(m_Path))
-                        {
-                                m_Valid = false;
-                                Kernel.Instance.Log.Write(LogType.Warning, "File does not exist: {0}", m_Path);
-                        }
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+            if(m_Path == null)
+            {
+                m_Path = "";
+            }
+
+            m_Path = m_Path.Trim();
+            m_Valid = true;
+            if(!File.Exists(m_Path))
+            {
+                m_Valid = false;
+                Kernel.Instance.Log.Write(LogType.Warning, "File does not exist: {0}", m_Path);
+            }
 
             if (System.IO.Path.GetExtension(m_Path) == ".settings")
             {
                 m_SubType = SubType.Settings;
                 m_BuildAction = BuildAction.None;
             }
-                }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
index 16658f3..58b54fb 100644
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,36 +34,36 @@ using System.IO;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Files")]
-        public class FilesNode : DataNode
-        {
-                #region Fields
-
-                private readonly List<string> m_Files = new List<string>();
-                private readonly Dictionary<string,BuildAction> m_BuildActions = new Dictionary<string, BuildAction>();
-                private readonly Dictionary<string, SubType> m_SubTypes = new Dictionary<string, SubType>();
-                private readonly Dictionary<string, string> m_ResourceNames = new Dictionary<string, string>();
-                private readonly Dictionary<string, CopyToOutput> m_CopyToOutputs = new Dictionary<string, CopyToOutput>();
-                private readonly Dictionary<string, bool> m_Links = new Dictionary<string, bool>();
-                private readonly Dictionary<string, string> m_LinkPaths = new Dictionary<string, string>();
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Files")]
+    public class FilesNode : DataNode
+    {
+        #region Fields
+
+        private readonly List<string> m_Files = new List<string>();
+        private readonly Dictionary<string,BuildAction> m_BuildActions = new Dictionary<string, BuildAction>();
+        private readonly Dictionary<string, SubType> m_SubTypes = new Dictionary<string, SubType>();
+        private readonly Dictionary<string, string> m_ResourceNames = new Dictionary<string, string>();
+        private readonly Dictionary<string, CopyToOutput> m_CopyToOutputs = new Dictionary<string, CopyToOutput>();
+        private readonly Dictionary<string, bool> m_Links = new Dictionary<string, bool>();
+        private readonly Dictionary<string, string> m_LinkPaths = new Dictionary<string, string>();
         private readonly Dictionary<string, bool> m_PreservePaths = new Dictionary<string, bool>();
         private readonly Dictionary<string, string> m_DestinationPath = new Dictionary<string, string>();
         private readonly NameValueCollection m_CopyFiles = new NameValueCollection();
 
-                #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
 
-                public int Count
-                {
-                        get
-                        {
-                                return m_Files.Count;
-                        }
-                }
+        public int Count
+        {
+            get
+            {
+                return m_Files.Count;
+            }
+        }
 
         public string[] Destinations
         {
@@ -75,19 +75,19 @@ namespace Prebuild.Core.Nodes
             get { return m_CopyFiles.Count; }
         }
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                public BuildAction GetBuildAction(string file)
-                {
-                        if(!m_BuildActions.ContainsKey(file))
-                        {
-                                return BuildAction.Compile;
-                        }
+        public BuildAction GetBuildAction(string file)
+        {
+            if(!m_BuildActions.ContainsKey(file))
+            {
+                return BuildAction.Compile;
+            }
 
-                        return m_BuildActions[file];
-                }
+            return m_BuildActions[file];
+        }
 
         public string GetDestinationPath(string file)
         {
@@ -103,57 +103,57 @@ namespace Prebuild.Core.Nodes
             return m_CopyFiles.GetValues(dest);
         }
 
-                public CopyToOutput GetCopyToOutput(string file)
-                {
-                        if (!m_CopyToOutputs.ContainsKey(file))
-                        {
-                                return CopyToOutput.Never;
-                        }
-                        return m_CopyToOutputs[file];
-                }
-
-                public bool GetIsLink(string file)
-                {
-                        if (!m_Links.ContainsKey(file))
-                        {
-                                return false;
-                        }
-                        return m_Links[file];
-                }
+        public CopyToOutput GetCopyToOutput(string file)
+        {
+            if (!m_CopyToOutputs.ContainsKey(file))
+            {
+                return CopyToOutput.Never;
+            }
+            return m_CopyToOutputs[file];
+        }
+
+        public bool GetIsLink(string file)
+        {
+            if (!m_Links.ContainsKey(file))
+            {
+                return false;
+            }
+            return m_Links[file];
+        }
 
         public bool Contains(string file)
         {
             return m_Files.Contains(file);
         }
 
-                public string GetLinkPath( string file )
-                {
-                        if ( !m_LinkPaths.ContainsKey( file ) )
-                        {
-                                return string.Empty;
-                        }
-                        return m_LinkPaths[ file ];
-                }
-
-                public SubType GetSubType(string file)
-                {
-                        if(!m_SubTypes.ContainsKey(file))
-                        {
-                                return SubType.Code;
-                        }
-
-                        return m_SubTypes[file];
-                }
-
-                public string GetResourceName(string file)
-                {
-                        if(!m_ResourceNames.ContainsKey(file))
-                        {
-                                return string.Empty;
-                        }
-
-                        return m_ResourceNames[file];
-                }
+        public string GetLinkPath( string file )
+        {
+            if ( !m_LinkPaths.ContainsKey( file ) )
+            {
+                return string.Empty;
+            }
+            return m_LinkPaths[ file ];
+        }
+
+        public SubType GetSubType(string file)
+        {
+            if(!m_SubTypes.ContainsKey(file))
+            {
+                return SubType.Code;
+            }
+
+            return m_SubTypes[file];
+        }
+
+        public string GetResourceName(string file)
+        {
+            if(!m_ResourceNames.ContainsKey(file))
+            {
+                return string.Empty;
+            }
+
+            return m_ResourceNames[file];
+        }
 
         public bool GetPreservePath( string file )
         {
@@ -165,45 +165,45 @@ namespace Prebuild.Core.Nodes
             return m_PreservePaths[ file ];
         }
 
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is FileNode)
-                                {
-                                        FileNode fileNode = (FileNode)dataNode;
-                                        if(fileNode.IsValid)
-                                        {
-                                                if (!m_Files.Contains(fileNode.Path))
-                                                {
-                                                        m_Files.Add(fileNode.Path);
-                                                        m_BuildActions[fileNode.Path] = fileNode.BuildAction;
-                                                        m_SubTypes[fileNode.Path] = fileNode.SubType;
-                                                        m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+            foreach(XmlNode child in node.ChildNodes)
+            {
+                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                if(dataNode is FileNode)
+                {
+                    FileNode fileNode = (FileNode)dataNode;
+                    if(fileNode.IsValid)
+                    {
+                        if (!m_Files.Contains(fileNode.Path))
+                        {
+                            m_Files.Add(fileNode.Path);
+                            m_BuildActions[fileNode.Path] = fileNode.BuildAction;
+                            m_SubTypes[fileNode.Path] = fileNode.SubType;
+                            m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
                             m_PreservePaths[ fileNode.Path ] = fileNode.PreservePath;
                             m_Links[ fileNode.Path ] = fileNode.IsLink;
-                                                        m_LinkPaths[ fileNode.Path ] = fileNode.LinkPath;
-                                                        m_CopyToOutputs[ fileNode.Path ] = fileNode.CopyToOutput;
-
-                                                }
-                                        }
-                                }
-                                else if(dataNode is MatchNode)
-                                {
-                                        foreach(string file in ((MatchNode)dataNode).Files)
-                                        {
+                            m_LinkPaths[ fileNode.Path ] = fileNode.LinkPath;
+                            m_CopyToOutputs[ fileNode.Path ] = fileNode.CopyToOutput;
+
+                        }
+                    }
+                }
+                else if(dataNode is MatchNode)
+                {
+                    foreach(string file in ((MatchNode)dataNode).Files)
+                    {
                         MatchNode matchNode = (MatchNode)dataNode;
-                                                if (!m_Files.Contains(file))
-                                                {
-                                                        m_Files.Add(file);
-                                                    if (matchNode.BuildAction == null)
+                        if (!m_Files.Contains(file))
+                        {
+                            m_Files.Add(file);
+                            if (matchNode.BuildAction == null)
                                 m_BuildActions[file] = GetBuildActionByFileName(file);
-                                                    else
+                            else
                                 m_BuildActions[file] = matchNode.BuildAction.Value;
 
                             if (matchNode.BuildAction == BuildAction.Copy)
@@ -212,27 +212,27 @@ namespace Prebuild.Core.Nodes
                                 m_DestinationPath[file] = matchNode.DestinationPath;
                             }
 
-                                                    m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value;
+                            m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value;
                             m_ResourceNames[ file ] = matchNode.ResourceName;
                             m_PreservePaths[ file ] = matchNode.PreservePath;
                             m_Links[ file ] = matchNode.IsLink;
-                                                        m_LinkPaths[ file ] = matchNode.LinkPath;
-                                                        m_CopyToOutputs[ file ] = matchNode.CopyToOutput;
-
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                // TODO: Check in to why StringCollection's enumerator doesn't implement
-                // IEnumerator?
-                public IEnumerator<string> GetEnumerator()
-                {
-                        return m_Files.GetEnumerator();
-                }
-
-                #endregion
+                            m_LinkPaths[ file ] = matchNode.LinkPath;
+                            m_CopyToOutputs[ file ] = matchNode.CopyToOutput;
+
+                        }
+                    }
+                }
+            }
+        }
+
+        // TODO: Check in to why StringCollection's enumerator doesn't implement
+        // IEnumerator?
+        public IEnumerator<string> GetEnumerator()
+        {
+            return m_Files.GetEnumerator();
+        }
+
+        #endregion
 
     }
 }
diff --git a/Prebuild/src/Core/Nodes/MatchNode.cs b/Prebuild/src/Core/Nodes/MatchNode.cs
index 000bde9..fe02277 100644
--- a/Prebuild/src/Core/Nodes/MatchNode.cs
+++ b/Prebuild/src/Core/Nodes/MatchNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -35,51 +35,51 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Match")]
-        public class MatchNode : DataNode
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Match")]
+    public class MatchNode : DataNode
+    {
+        #region Fields
 
         private readonly List<string> m_Files = new List<string>();
-                private Regex m_Regex;
-                private BuildAction? m_BuildAction;
-                private SubType? m_SubType;
-                string m_ResourceName = "";
-                private CopyToOutput m_CopyToOutput;
-                private bool m_Link;
-                private string m_LinkPath;
+        private Regex m_Regex;
+        private BuildAction? m_BuildAction;
+        private SubType? m_SubType;
+        string m_ResourceName = "";
+        private CopyToOutput m_CopyToOutput;
+        private bool m_Link;
+        private string m_LinkPath;
         private bool m_PreservePath;
         private string m_Destination = "";
         private readonly List<ExcludeNode> m_Exclusions = new List<ExcludeNode>();
 
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public IEnumerable<string> Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public BuildAction? BuildAction
-                {
-                        get
-                        {
-                                return m_BuildAction;
-                        }
-                }
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        ///
+        /// </summary>
+        public IEnumerable<string> Files
+        {
+            get
+            {
+                return m_Files;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public BuildAction? BuildAction
+        {
+            get
+            {
+                return m_BuildAction;
+            }
+        }
 
         public string DestinationPath
         {
@@ -88,50 +88,50 @@ namespace Prebuild.Core.Nodes
                 return m_Destination;
             }
         }
-                /// <summary>
-                /// 
-                /// </summary>
-                public SubType? SubType
-                {
-                        get
-                        {
-                                return m_SubType;
-                        }
-                }
-
-                public CopyToOutput CopyToOutput
-                {
-                        get
-                        {
-                                return m_CopyToOutput;
-                        }
-                }
-
-                public bool IsLink
-                {
-                        get
-                        {
-                                return m_Link;
-                        }
-                }
-
-                public string LinkPath
-                {
-                        get
-                        {
-                                return m_LinkPath;
-                        }
-                }
-                /// <summary>
-                /// 
-                /// </summary>
-                public string ResourceName
-                {
-                        get
-                        {
-                                return m_ResourceName;
-                        }
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        public SubType? SubType
+        {
+            get
+            {
+                return m_SubType;
+            }
+        }
+
+        public CopyToOutput CopyToOutput
+        {
+            get
+            {
+                return m_CopyToOutput;
+            }
+        }
+
+        public bool IsLink
+        {
+            get
+            {
+                return m_Link;
+            }
+        }
+
+        public string LinkPath
+        {
+            get
+            {
+                return m_LinkPath;
+            }
+        }
+        /// <summary>
+        ///
+        /// </summary>
+        public string ResourceName
+        {
+            get
+            {
+                return m_ResourceName;
+            }
+        }
 
         public bool PreservePath
         {
@@ -141,27 +141,27 @@ namespace Prebuild.Core.Nodes
             }
         }
 
-                #endregion
-
-                #region Private Methods
-
-                /// <summary>
-                /// Recurses the directories.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="pattern">The pattern.</param>
-                /// <param name="recurse">if set to <c>true</c> [recurse].</param>
-                /// <param name="useRegex">if set to <c>true</c> [use regex].</param>
-                private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex, List<ExcludeNode> exclusions)
-                {
-                        Match match;
-                    try
-                        {
-                                string[] files;
-
-                            Boolean excludeFile;
-                            if(!useRegex)
-                                {
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Recurses the directories.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="recurse">if set to <c>true</c> [recurse].</param>
+        /// <param name="useRegex">if set to <c>true</c> [use regex].</param>
+        private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex, List<ExcludeNode> exclusions)
+        {
+            Match match;
+            try
+            {
+                string[] files;
+
+                Boolean excludeFile;
+                if(!useRegex)
+                {
                     try
                     {
                         files = Directory.GetFiles(path, pattern);
@@ -169,7 +169,7 @@ namespace Prebuild.Core.Nodes
                     catch (IOException)
                     {
                         // swallow weird IOException error when running in a virtual box
-                        // guest OS on a network share when the host OS is not Windows.  
+                        // guest OS on a network share when the host OS is not Windows.
                         // This seems to happen on network shares
                         // when no files match, and may be related to this report:
                         // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=254546
@@ -177,20 +177,20 @@ namespace Prebuild.Core.Nodes
                         files = null;
                     }
 
-                                        if(files != null)
-                                        {
-                                            foreach (string file in files)
-                                                {
+                    if(files != null)
+                    {
+                        foreach (string file in files)
+                        {
                             excludeFile = false;
-                                                    string fileTemp;
-                                                    if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
-                                                        {
-                                                                fileTemp = file.Substring(2);
-                                                        }
-                                                        else
-                                                        {
-                                                                fileTemp = file;
-                                                        }
+                            string fileTemp;
+                            if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
+                            {
+                                fileTemp = file.Substring(2);
+                            }
+                            else
+                            {
+                                fileTemp = file;
+                            }
 
                             // Check all excludions and set flag if there are any hits.
                             foreach ( ExcludeNode exclude in exclusions )
@@ -205,18 +205,18 @@ namespace Prebuild.Core.Nodes
                                 m_Files.Add( fileTemp );
                             }
 
-                                                }
-                                        }
+                        }
+                    }
 
                     // don't call return here, because we may need to recursively search directories below
                     // this one, even if no matches were found in this directory.
-                                }
-                                else
-                                {
-                                        try
-                                        {
-                                                files = Directory.GetFiles(path);
-                                        }
+                }
+                else
+                {
+                    try
+                     {
+                        files = Directory.GetFiles(path);
+                    }
                     catch (IOException)
                     {
                         // swallow weird IOException error when running in a virtual box
@@ -248,12 +248,12 @@ namespace Prebuild.Core.Nodes
                             }
                         }
                     }
-                                }
-                
-                                if(recurse)
-                                {
-                                        string[] dirs = Directory.GetDirectories(path);
-                                        if(dirs != null && dirs.Length > 0)
+                }
+
+                if(recurse)
+                {
+                    string[] dirs = Directory.GetDirectories(path);
+                    if(dirs != null && dirs.Length > 0)
                     {
                         foreach (string str in dirs)
                         {
@@ -265,96 +265,96 @@ namespace Prebuild.Core.Nodes
                             RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex, exclusions);
                         }
                     }
-                                }
-                        }
-                        catch(DirectoryNotFoundException)
-                        {
-                                return;
-                        }
-                        catch(ArgumentException)
-                        {
-                                return;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        string path = Helper.AttributeValue(node, "path", ".");
-                        string pattern = Helper.AttributeValue(node, "pattern", "*");
+                }
+            }
+            catch(DirectoryNotFoundException)
+            {
+                return;
+            }
+            catch(ArgumentException)
+            {
+                return;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="node"></param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+            string path = Helper.AttributeValue(node, "path", ".");
+            string pattern = Helper.AttributeValue(node, "pattern", "*");
             string destination = Helper.AttributeValue(node, "destination", string.Empty);
-                        bool recurse = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "recurse", "false"));
-                        bool useRegex = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "useRegex", "false"));
-                        string buildAction = Helper.AttributeValue(node, "buildAction", String.Empty);
-                        if (buildAction != string.Empty)
-                                m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), buildAction);
-
-
-                        //TODO: Figure out where the subtype node is being assigned
-                        //string subType = Helper.AttributeValue(node, "subType", string.Empty);
-                        //if (subType != String.Empty)
-                        //    m_SubType = (SubType)Enum.Parse(typeof(SubType), subType);
-                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName);
-                        m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", m_CopyToOutput.ToString()));
-                        m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
-                        if ( m_Link )
-                        {
-                                m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
-                        }
+            bool recurse = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "recurse", "false"));
+            bool useRegex = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "useRegex", "false"));
+            string buildAction = Helper.AttributeValue(node, "buildAction", String.Empty);
+            if (buildAction != string.Empty)
+                m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), buildAction);
+
+
+            //TODO: Figure out where the subtype node is being assigned
+            //string subType = Helper.AttributeValue(node, "subType", string.Empty);
+            //if (subType != String.Empty)
+            //    m_SubType = (SubType)Enum.Parse(typeof(SubType), subType);
+            m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName);
+            m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", m_CopyToOutput.ToString()));
+            m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+            if ( m_Link )
+            {
+                m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
+            }
             m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
 
             if ( buildAction == "Copy")
                 m_Destination = destination;
 
-                        if(path != null && path.Length == 0)
-                                path = ".";//use current directory
-            
-                        //throw new WarningException("Match must have a 'path' attribute");
-
-                        if(pattern == null)
-                        {
-                                throw new WarningException("Match must have a 'pattern' attribute");
-                        }
-
-                        path = Helper.NormalizePath(path);
-                        if(!Directory.Exists(path))
-                        {
-                                throw new WarningException("Match path does not exist: {0}", path);
-                        }
-
-                        try
-                        {
-                                if(useRegex)
-                                {
-                                        m_Regex = new Regex(pattern);
-                                }
-                        }
-                        catch(ArgumentException ex)
-                        {
-                                throw new WarningException("Could not compile regex pattern: {0}", ex.Message);
-                        }
-
-
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is ExcludeNode)
-                                {
-                                        ExcludeNode excludeNode = (ExcludeNode)dataNode;
+            if(path != null && path.Length == 0)
+                path = ".";//use current directory
+
+            //throw new WarningException("Match must have a 'path' attribute");
+
+            if(pattern == null)
+            {
+                throw new WarningException("Match must have a 'pattern' attribute");
+            }
+
+            path = Helper.NormalizePath(path);
+            if(!Directory.Exists(path))
+            {
+                throw new WarningException("Match path does not exist: {0}", path);
+            }
+
+            try
+            {
+                if(useRegex)
+                {
+                    m_Regex = new Regex(pattern);
+                }
+            }
+            catch(ArgumentException ex)
+            {
+                throw new WarningException("Could not compile regex pattern: {0}", ex.Message);
+            }
+
+
+            foreach(XmlNode child in node.ChildNodes)
+            {
+                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                if(dataNode is ExcludeNode)
+                {
+                    ExcludeNode excludeNode = (ExcludeNode)dataNode;
                     m_Exclusions.Add( excludeNode );
-                                }
-                        }
+                }
+            }
 
             RecurseDirectories( path, pattern, recurse, useRegex, m_Exclusions );
 
@@ -371,8 +371,8 @@ namespace Prebuild.Core.Nodes
                 throw new WarningException("Match" + projectName + " returned no files: {0}{1}", Helper.EndPath(path), pattern);
             }
             m_Regex = null;
-                }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs
index 577de71..d45bd34 100644
--- a/Prebuild/src/Core/Nodes/OptionsNode.cs
+++ b/Prebuild/src/Core/Nodes/OptionsNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,273 +34,273 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Options")]
-        public class OptionsNode : DataNode
-        {
-                #region Fields
-
-                private static readonly Dictionary<string,FieldInfo> m_OptionFields = new Dictionary<string, FieldInfo>();
-
-                [OptionNode("CompilerDefines")]
-                private string m_CompilerDefines = "";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string CompilerDefines
-                {
-                        get
-                        {
-                                return m_CompilerDefines;
-                        }
-                        set
-                        {
-                                m_CompilerDefines = value;
-                        }
-                }
-        
-                [OptionNode("OptimizeCode")]
-                private bool m_OptimizeCode;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool OptimizeCode
-                {
-                        get
-                        {
-                                return m_OptimizeCode;
-                        }
-                        set
-                        {
-                                m_OptimizeCode = value;
-                        }
-                }
-        
-                [OptionNode("CheckUnderflowOverflow")]
-                private bool m_CheckUnderflowOverflow;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool CheckUnderflowOverflow
-                {
-                        get
-                        {
-                                return m_CheckUnderflowOverflow;
-                        }
-                        set
-                        {
-                                m_CheckUnderflowOverflow = value;
-                        }
-                }
-        
-                [OptionNode("AllowUnsafe")]
-                private bool m_AllowUnsafe;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool AllowUnsafe
-                {
-                        get
-                        {
-                                return m_AllowUnsafe;
-                        }
-                        set
-                        {
-                                m_AllowUnsafe = value;
-                        }
-                }
-                
-                [OptionNode("PreBuildEvent")]
-                private string m_PreBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PreBuildEvent 
-                {
-                        get 
-                        {
-                                return m_PreBuildEvent;
-                        }
-                        set 
-                        {
-                                m_PreBuildEvent = value;
-                        }
-                }
-                
-                [OptionNode("PostBuildEvent")]
-                private string m_PostBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PostBuildEvent 
-                {
-                        get 
-                        {
-                                return m_PostBuildEvent;
-                        }
-                        set 
-                        {
-                                m_PostBuildEvent = value;
-                        }
-                }
-                        
-                [OptionNode("PreBuildEventArgs")]
-                private string m_PreBuildEventArgs;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PreBuildEventArgs
-                {
-                        get 
-                        {
-                                return m_PreBuildEventArgs;
-                        }
-                        set 
-                        {
-                                m_PreBuildEventArgs = value;
-                        }
-                }
-                
-                [OptionNode("PostBuildEventArgs")]
-                private string m_PostBuildEventArgs;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string PostBuildEventArgs
-                {
-                        get 
-                        {
-                                return m_PostBuildEventArgs;
-                        }
-                        set 
-                        {
-                                m_PostBuildEventArgs = value;
-                        }
-                }
-                
-                [OptionNode("RunPostBuildEvent")]
-                private string m_RunPostBuildEvent;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string RunPostBuildEvent 
-                {
-                        get 
-                        {
-                                return m_RunPostBuildEvent;
-                        }
-                        set 
-                        {
-                                m_RunPostBuildEvent = value;
-                        }
-                }
-                
-                [OptionNode("RunScript")]
-                private string m_RunScript;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public string RunScript 
-                {
-                        get 
-                        {
-                                return m_RunScript;
-                        }
-                        set 
-                        {
-                                m_RunScript = value;
-                        }
-                }
-        
-                [OptionNode("WarningLevel")]
-                private int m_WarningLevel = 4;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public int WarningLevel
-                {
-                        get
-                        {
-                                return m_WarningLevel;
-                        }
-                        set
-                        {
-                                m_WarningLevel = value;
-                        }
-                }
-        
-                [OptionNode("WarningsAsErrors")]
-                private bool m_WarningsAsErrors;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool WarningsAsErrors
-                {
-                        get
-                        {
-                                return m_WarningsAsErrors;
-                        }
-                        set
-                        {
-                                m_WarningsAsErrors = value;
-                        }
-                }
-
-                [OptionNode("SuppressWarnings")]
-                private string m_SuppressWarnings = "";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string SuppressWarnings
-                {
-                        get
-                        {
-                                return m_SuppressWarnings;
-                        }
-                        set
-                        {
-                                m_SuppressWarnings = value;
-                        }
-                }
-        
-                [OptionNode("OutputPath")]
-                private string m_OutputPath = "bin/";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string OutputPath
-                {
-                        get
-                        {
-                                return m_OutputPath;
-                        }
-                        set
-                        {
-                                m_OutputPath = value;
-                        }
-                }
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Options")]
+    public class OptionsNode : DataNode
+    {
+        #region Fields
+
+        private static readonly Dictionary<string,FieldInfo> m_OptionFields = new Dictionary<string, FieldInfo>();
+
+        [OptionNode("CompilerDefines")]
+        private string m_CompilerDefines = "";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string CompilerDefines
+        {
+            get
+            {
+                return m_CompilerDefines;
+            }
+            set
+            {
+                m_CompilerDefines = value;
+            }
+        }
+
+        [OptionNode("OptimizeCode")]
+        private bool m_OptimizeCode;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool OptimizeCode
+        {
+            get
+            {
+                return m_OptimizeCode;
+            }
+            set
+            {
+                m_OptimizeCode = value;
+            }
+        }
+
+        [OptionNode("CheckUnderflowOverflow")]
+        private bool m_CheckUnderflowOverflow;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool CheckUnderflowOverflow
+        {
+            get
+            {
+                return m_CheckUnderflowOverflow;
+            }
+            set
+            {
+                m_CheckUnderflowOverflow = value;
+            }
+        }
+
+        [OptionNode("AllowUnsafe")]
+        private bool m_AllowUnsafe;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool AllowUnsafe
+        {
+            get
+            {
+                return m_AllowUnsafe;
+            }
+            set
+            {
+                m_AllowUnsafe = value;
+            }
+        }
+
+        [OptionNode("PreBuildEvent")]
+        private string m_PreBuildEvent;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string PreBuildEvent
+        {
+            get
+            {
+                return m_PreBuildEvent;
+            }
+            set
+            {
+                m_PreBuildEvent = value;
+            }
+        }
+
+        [OptionNode("PostBuildEvent")]
+        private string m_PostBuildEvent;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string PostBuildEvent
+        {
+            get
+            {
+                return m_PostBuildEvent;
+            }
+            set
+            {
+                m_PostBuildEvent = value;
+            }
+        }
+
+        [OptionNode("PreBuildEventArgs")]
+        private string m_PreBuildEventArgs;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string PreBuildEventArgs
+        {
+            get
+            {
+                return m_PreBuildEventArgs;
+            }
+            set
+            {
+                m_PreBuildEventArgs = value;
+            }
+        }
+
+        [OptionNode("PostBuildEventArgs")]
+        private string m_PostBuildEventArgs;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string PostBuildEventArgs
+        {
+            get
+            {
+                return m_PostBuildEventArgs;
+            }
+            set
+            {
+                m_PostBuildEventArgs = value;
+            }
+        }
+
+        [OptionNode("RunPostBuildEvent")]
+        private string m_RunPostBuildEvent;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string RunPostBuildEvent
+        {
+            get
+            {
+                return m_RunPostBuildEvent;
+            }
+            set
+            {
+                m_RunPostBuildEvent = value;
+            }
+        }
+
+        [OptionNode("RunScript")]
+        private string m_RunScript;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string RunScript
+        {
+            get
+            {
+                return m_RunScript;
+            }
+            set
+            {
+                m_RunScript = value;
+            }
+        }
+
+        [OptionNode("WarningLevel")]
+        private int m_WarningLevel = 4;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public int WarningLevel
+        {
+            get
+            {
+                return m_WarningLevel;
+            }
+            set
+            {
+                m_WarningLevel = value;
+            }
+        }
+
+        [OptionNode("WarningsAsErrors")]
+        private bool m_WarningsAsErrors;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool WarningsAsErrors
+        {
+            get
+            {
+                return m_WarningsAsErrors;
+            }
+            set
+            {
+                m_WarningsAsErrors = value;
+            }
+        }
+
+        [OptionNode("SuppressWarnings")]
+        private string m_SuppressWarnings = "";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string SuppressWarnings
+        {
+            get
+            {
+                return m_SuppressWarnings;
+            }
+            set
+            {
+                m_SuppressWarnings = value;
+            }
+        }
+
+        [OptionNode("OutputPath")]
+        private string m_OutputPath = "bin/";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string OutputPath
+        {
+            get
+            {
+                return m_OutputPath;
+            }
+            set
+            {
+                m_OutputPath = value;
+            }
+        }
 
         [OptionNode("GenerateDocumentation")]
         private bool m_GenerateDocumentation;
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public bool GenerateDocumentation
         {
@@ -314,321 +314,321 @@ namespace Prebuild.Core.Nodes
             }
         }
 
-                [OptionNode("GenerateXmlDocFile")]
-                private bool m_GenerateXmlDocFile;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool GenerateXmlDocFile
-                {
-                        get
-                        {
-                                return m_GenerateXmlDocFile;
-                        }
-                        set
-                        {
-                                m_GenerateXmlDocFile = value;
-                        }
-                }
-        
-                [OptionNode("XmlDocFile")]
-                private string m_XmlDocFile = "";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string XmlDocFile
-                {
-                        get
-                        {
-                                return m_XmlDocFile;
-                        }
-                        set
-                        {
-                                m_XmlDocFile = value;
-                        }
-                }
-
-                [OptionNode("KeyFile")]
-                private string m_KeyFile = "";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string KeyFile
-                {
-                        get
-                        {
-                                return m_KeyFile;
-                        }
-                        set
-                        {
-                                m_KeyFile = value;
-                        }
-                }
-        
-                [OptionNode("DebugInformation")]
-                private bool m_DebugInformation;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool DebugInformation
-                {
-                        get
-                        {
-                                return m_DebugInformation;
-                        }
-                        set
-                        {
-                                m_DebugInformation = value;
-                        }
-                }
-        
-                [OptionNode("RegisterComInterop")]
-                private bool m_RegisterComInterop;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool RegisterComInterop
-                {
-                        get
-                        {
-                                return m_RegisterComInterop;
-                        }
-                        set
-                        {
-                                m_RegisterComInterop = value;
-                        }
-                }
-
-                [OptionNode("RemoveIntegerChecks")]
-                private bool m_RemoveIntegerChecks;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool RemoveIntegerChecks
-                {
-                        get
-                        {
-                                return m_RemoveIntegerChecks;
-                        }
-                        set
-                        {
-                                m_RemoveIntegerChecks = value;
-                        }
-                }
-        
-                [OptionNode("IncrementalBuild")]
-                private bool m_IncrementalBuild;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool IncrementalBuild
-                {
-                        get
-                        {
-                                return m_IncrementalBuild;
-                        }
-                        set
-                        {
-                                m_IncrementalBuild = value;
-                        }
-                }
-        
-                [OptionNode("BaseAddress")]
-                private string m_BaseAddress = "285212672";
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string BaseAddress
-                {
-                        get
-                        {
-                                return m_BaseAddress;
-                        }
-                        set
-                        {
-                                m_BaseAddress = value;
-                        }
-                }
-        
-                [OptionNode("FileAlignment")]
-                private int m_FileAlignment = 4096;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public int FileAlignment
-                {
-                        get
-                        {
-                                return m_FileAlignment;
-                        }
-                        set
-                        {
-                                m_FileAlignment = value;
-                        }
-                }
-        
-                [OptionNode("NoStdLib")]
-                private bool m_NoStdLib;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool NoStdLib
-                {
-                        get
-                        {
-                                return m_NoStdLib;
-                        }
-                        set
-                        {
-                                m_NoStdLib = value;
-                        }
-                }
-
-                private readonly List<string> m_FieldsDefined = new List<string>();
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes the <see cref="OptionsNode"/> class.
-                /// </summary>
-                static OptionsNode()
-                {
-                        Type t = typeof(OptionsNode);
-            
-                        foreach(FieldInfo f in t.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
-                        {
-                                object[] attrs = f.GetCustomAttributes(typeof(OptionNodeAttribute), false);
-                                if(attrs == null || attrs.Length < 1)
-                                {
-                                        continue;
-                                }
-
-                                OptionNodeAttribute ona = (OptionNodeAttribute)attrs[0];
-                                m_OptionFields[ona.NodeName] = f;
-                        }
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the <see cref="Object"/> at the specified index.
-                /// </summary>
-                /// <value></value>
-                public object this[string index]
-                {
-                        get
-                        {
-                                if(!m_OptionFields.ContainsKey(index))
-                                {
-                                        return null;
-                                }
-
-                                FieldInfo f = m_OptionFields[index];
-                                return f.GetValue(this);
-                        }
-                }
-                
-                /// <summary>
-                /// Gets the <see cref="Object"/> at the specified index.
-                /// </summary>
-                /// <value></value>
-                public object this[string index, object defaultValue]
-                {
-                        get
-                        {
-                                object valueObject = this[index];
-                                if(valueObject !=  null && valueObject is string && ((string)valueObject).Length == 0) 
-                                {
-                                        return defaultValue;
-                                }
-                                return valueObject;
-                        }
-                }
-
-
-                #endregion
-
-                #region Private Methods
-
-                private void FlagDefined(string name)
-                {
-                        if(!m_FieldsDefined.Contains(name))
-                        {
-                                m_FieldsDefined.Add(name);
-                        }
-                }
-
-                private void SetOption(string nodeName, string val)
-                {
-                        lock(m_OptionFields)
-                        {
-                                if(!m_OptionFields.ContainsKey(nodeName))
-                                {
-                                        return;
-                                }
-
-                                FieldInfo f = m_OptionFields[nodeName];
-                                f.SetValue(this, Helper.TranslateValue(f.FieldType, val));
-                                FlagDefined(f.Name);
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                SetOption(child.Name, Helper.InterpolateForEnvironmentVariables(child.InnerText));
-                        }
-                }
-
-                /// <summary>
-                /// Copies to.
-                /// </summary>
-                /// <param name="opt">The opt.</param>
-                public void CopyTo(OptionsNode opt)
-                {
-                        if(opt == null)
-                        {
-                                return;
-                        }
-
-                        foreach(FieldInfo f in m_OptionFields.Values)
-                        {
-                                if(m_FieldsDefined.Contains(f.Name))
-                                {
-                                        f.SetValue(opt, f.GetValue(this));
-                                        opt.m_FieldsDefined.Add(f.Name);
-                                }
-                        }
-                }
-
-                #endregion        
-        }
+        [OptionNode("GenerateXmlDocFile")]
+        private bool m_GenerateXmlDocFile;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool GenerateXmlDocFile
+        {
+            get
+            {
+                return m_GenerateXmlDocFile;
+            }
+            set
+            {
+                m_GenerateXmlDocFile = value;
+            }
+        }
+
+        [OptionNode("XmlDocFile")]
+        private string m_XmlDocFile = "";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string XmlDocFile
+        {
+            get
+            {
+                return m_XmlDocFile;
+            }
+            set
+            {
+                m_XmlDocFile = value;
+            }
+        }
+
+        [OptionNode("KeyFile")]
+        private string m_KeyFile = "";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string KeyFile
+        {
+            get
+            {
+                return m_KeyFile;
+            }
+            set
+            {
+                m_KeyFile = value;
+            }
+        }
+
+        [OptionNode("DebugInformation")]
+        private bool m_DebugInformation;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool DebugInformation
+        {
+            get
+            {
+                return m_DebugInformation;
+            }
+            set
+            {
+                m_DebugInformation = value;
+            }
+        }
+
+        [OptionNode("RegisterComInterop")]
+        private bool m_RegisterComInterop;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool RegisterComInterop
+        {
+            get
+            {
+                return m_RegisterComInterop;
+            }
+            set
+            {
+                m_RegisterComInterop = value;
+            }
+        }
+
+        [OptionNode("RemoveIntegerChecks")]
+        private bool m_RemoveIntegerChecks;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool RemoveIntegerChecks
+        {
+            get
+            {
+                return m_RemoveIntegerChecks;
+            }
+            set
+            {
+                m_RemoveIntegerChecks = value;
+            }
+        }
+
+        [OptionNode("IncrementalBuild")]
+        private bool m_IncrementalBuild;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool IncrementalBuild
+        {
+            get
+            {
+                return m_IncrementalBuild;
+            }
+            set
+            {
+                m_IncrementalBuild = value;
+            }
+        }
+
+        [OptionNode("BaseAddress")]
+        private string m_BaseAddress = "285212672";
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string BaseAddress
+        {
+            get
+            {
+                return m_BaseAddress;
+            }
+            set
+            {
+                m_BaseAddress = value;
+            }
+        }
+
+        [OptionNode("FileAlignment")]
+        private int m_FileAlignment = 4096;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public int FileAlignment
+        {
+            get
+            {
+                return m_FileAlignment;
+            }
+            set
+            {
+                m_FileAlignment = value;
+            }
+        }
+
+        [OptionNode("NoStdLib")]
+        private bool m_NoStdLib;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool NoStdLib
+        {
+            get
+            {
+                return m_NoStdLib;
+            }
+            set
+            {
+                m_NoStdLib = value;
+            }
+        }
+
+        private readonly List<string> m_FieldsDefined = new List<string>();
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes the <see cref="OptionsNode"/> class.
+        /// </summary>
+        static OptionsNode()
+        {
+            Type t = typeof(OptionsNode);
+
+            foreach(FieldInfo f in t.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
+            {
+                object[] attrs = f.GetCustomAttributes(typeof(OptionNodeAttribute), false);
+                if(attrs == null || attrs.Length < 1)
+                {
+                    continue;
+                }
+
+                OptionNodeAttribute ona = (OptionNodeAttribute)attrs[0];
+                m_OptionFields[ona.NodeName] = f;
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the <see cref="Object"/> at the specified index.
+        /// </summary>
+        /// <value></value>
+        public object this[string index]
+        {
+            get
+            {
+                if(!m_OptionFields.ContainsKey(index))
+                {
+                    return null;
+                }
+
+                FieldInfo f = m_OptionFields[index];
+                return f.GetValue(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Object"/> at the specified index.
+        /// </summary>
+        /// <value></value>
+        public object this[string index, object defaultValue]
+        {
+            get
+            {
+                object valueObject = this[index];
+                if(valueObject !=  null && valueObject is string && ((string)valueObject).Length == 0)
+                {
+                    return defaultValue;
+                }
+                return valueObject;
+            }
+        }
+
+
+        #endregion
+
+        #region Private Methods
+
+        private void FlagDefined(string name)
+        {
+            if(!m_FieldsDefined.Contains(name))
+            {
+                m_FieldsDefined.Add(name);
+            }
+        }
+
+        private void SetOption(string nodeName, string val)
+        {
+            lock(m_OptionFields)
+            {
+                if(!m_OptionFields.ContainsKey(nodeName))
+                {
+                    return;
+                }
+
+                FieldInfo f = m_OptionFields[nodeName];
+                f.SetValue(this, Helper.TranslateValue(f.FieldType, val));
+                FlagDefined(f.Name);
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            foreach(XmlNode child in node.ChildNodes)
+            {
+                SetOption(child.Name, Helper.InterpolateForEnvironmentVariables(child.InnerText));
+            }
+        }
+
+        /// <summary>
+        /// Copies to.
+        /// </summary>
+        /// <param name="opt">The opt.</param>
+        public void CopyTo(OptionsNode opt)
+        {
+            if(opt == null)
+            {
+                return;
+            }
+
+            foreach(FieldInfo f in m_OptionFields.Values)
+            {
+                if(m_FieldsDefined.Contains(f.Name))
+                {
+                    f.SetValue(opt, f.GetValue(this));
+                    opt.m_FieldsDefined.Add(f.Name);
+                }
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ProcessNode.cs b/Prebuild/src/Core/Nodes/ProcessNode.cs
index 8ca8e49..b05ffc6 100644
--- a/Prebuild/src/Core/Nodes/ProcessNode.cs
+++ b/Prebuild/src/Core/Nodes/ProcessNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,77 +32,77 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Process")]
-        public class ProcessNode : DataNode
-        {
-                #region Fields
-
-                private string m_Path;
-                private bool m_IsValid = true;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-
-                /// <summary>
-                /// Gets a value indicating whether this instance is valid.
-                /// </summary>
-                /// <value><c>true</c> if this instance is valid; otherwise, <c>false</c>.</value>
-                public bool IsValid
-                {
-                        get
-                        {
-                                return m_IsValid;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-
-                        try
-                        {
-                                m_Path = Helper.ResolvePath(m_Path);
-                        }
-                        catch(ArgumentException)
-                        {
-                                Kernel.Instance.Log.Write(LogType.Warning, "Could not find prebuild file for processing: {0}", m_Path);
-                                m_IsValid = false;
-                        }
-                }
-
-                #endregion
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Process")]
+    public class ProcessNode : DataNode
+    {
+        #region Fields
+
+        private string m_Path;
+        private bool m_IsValid = true;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is valid.
+        /// </summary>
+        /// <value><c>true</c> if this instance is valid; otherwise, <c>false</c>.</value>
+        public bool IsValid
+        {
+            get
+            {
+                return m_IsValid;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+            if(m_Path == null)
+            {
+                m_Path = "";
+            }
+
+            try
+            {
+                m_Path = Helper.ResolvePath(m_Path);
+            }
+            catch(ArgumentException)
+            {
+                Kernel.Instance.Log.Write(LogType.Warning, "Could not find prebuild file for processing: {0}", m_Path);
+                m_IsValid = false;
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index a822704..e02b11b 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,65 +34,65 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// A set of values that the Project's type can be
-        /// </summary>
-        public enum ProjectType
-        {
-                /// <summary>
-                /// The project is a console executable
-                /// </summary>
-                Exe,
-                /// <summary>
-                /// The project is a windows executable
-                /// </summary>
-                WinExe,
-                /// <summary>
-                /// The project is a library
-                /// </summary>
-                Library,
-        /// <summary>
-                /// The project is a website
-                /// </summary>
-                Web,
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum ClrRuntime
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                Microsoft,
-                /// <summary>
-                /// 
-                /// </summary>
-                Mono
-        }
-        /// <summary>
-        /// The version of the .NET framework to use (Required for VS2008)
-        /// <remarks>We don't need .NET 1.1 in here, it'll default when using vs2003.</remarks>
-        /// </summary>
-        public enum FrameworkVersion
-        {
-                /// <summary>
-                /// .NET 2.0
-                /// </summary>
-                v2_0,
-                /// <summary>
-                /// .NET 3.0
-                /// </summary>
-                v3_0,
-                /// <summary>
-                /// .NET 3.5
-                /// </summary>
-                v3_5,
-                /// <summary>
-                /// .NET 4.0
-                /// </summary>
-                v4_0,
+    /// <summary>
+    /// A set of values that the Project's type can be
+    /// </summary>
+    public enum ProjectType
+    {
+        /// <summary>
+        /// The project is a console executable
+        /// </summary>
+        Exe,
+        /// <summary>
+        /// The project is a windows executable
+        /// </summary>
+        WinExe,
+        /// <summary>
+        /// The project is a library
+        /// </summary>
+        Library,
+        /// <summary>
+        /// The project is a website
+        /// </summary>
+        Web,
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    public enum ClrRuntime
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        Microsoft,
+        /// <summary>
+        ///
+        /// </summary>
+        Mono
+    }
+    /// <summary>
+    /// The version of the .NET framework to use (Required for VS2008)
+    /// <remarks>We don't need .NET 1.1 in here, it'll default when using vs2003.</remarks>
+    /// </summary>
+    public enum FrameworkVersion
+    {
+        /// <summary>
+        /// .NET 2.0
+        /// </summary>
+        v2_0,
+        /// <summary>
+        /// .NET 3.0
+        /// </summary>
+        v3_0,
+        /// <summary>
+        /// .NET 3.5
+        /// </summary>
+        v3_5,
+        /// <summary>
+        /// .NET 4.0
+        /// </summary>
+        v4_0,
         /// <summary>
         /// .NET 4.5
         /// </summary>
@@ -102,477 +102,477 @@ namespace Prebuild.Core.Nodes
         /// </summary>
         v4_5_1
     }
-        /// <summary>
-        /// The Node object representing /Prebuild/Solution/Project elements
-        /// </summary>
-        [DataNode("Project")]
-        public class ProjectNode : DataNode, IComparable
-        {
-                #region Fields
-
-                private string m_Name = "unknown";
-                private string m_Path = "";
-                private string m_FullPath = "";
-                private string m_AssemblyName;
-                private string m_AppIcon = "";
+    /// <summary>
+    /// The Node object representing /Prebuild/Solution/Project elements
+    /// </summary>
+    [DataNode("Project")]
+    public class ProjectNode : DataNode, IComparable
+    {
+        #region Fields
+
+        private string m_Name = "unknown";
+        private string m_Path = "";
+        private string m_FullPath = "";
+        private string m_AssemblyName;
+        private string m_AppIcon = "";
         private string m_ConfigFile = "";
-                private string m_DesignerFolder = "";
-                private string m_Language = "C#";
-                private ProjectType m_Type = ProjectType.Exe;
-                private ClrRuntime m_Runtime = ClrRuntime.Microsoft;
+        private string m_DesignerFolder = "";
+        private string m_Language = "C#";
+        private ProjectType m_Type = ProjectType.Exe;
+        private ClrRuntime m_Runtime = ClrRuntime.Microsoft;
         private FrameworkVersion m_Framework = FrameworkVersion.v2_0;
-                private string m_StartupObject = "";
-                private string m_RootNamespace;
-                private string m_FilterGroups = "";
-                private string m_Version = "";
-                private Guid m_Guid;
+        private string m_StartupObject = "";
+        private string m_RootNamespace;
+        private string m_FilterGroups = "";
+        private string m_Version = "";
+        private Guid m_Guid;
         private string m_DebugStartParameters;
 
         private readonly Dictionary<string, ConfigurationNode> m_Configurations = new Dictionary<string, ConfigurationNode>();
         private readonly List<ReferencePathNode> m_ReferencePaths = new List<ReferencePathNode>();
-                private readonly List<ReferenceNode> m_References = new List<ReferenceNode>();
+        private readonly List<ReferenceNode> m_References = new List<ReferenceNode>();
         private readonly List<AuthorNode> m_Authors = new List<AuthorNode>();
-                private FilesNode m_Files;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                            return m_Name;
-                        }
-                }
-                /// <summary>
-                /// The version of the .NET Framework to compile under
-                /// </summary>
-                public FrameworkVersion FrameworkVersion
-                {
-                        get
-                        {
-                            return m_Framework;
-                        }
-                }
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the filter groups.
-                /// </summary>
-                /// <value>The filter groups.</value>
-                public string FilterGroups 
-                { 
-                        get 
-                        { 
-                                return m_FilterGroups; 
-                        } 
-                }
-
-                /// <summary>
-                /// Gets the project's version
-                /// </summary>
-                /// <value>The project's version.</value>
-                public string Version 
-                { 
-                        get 
-                        { 
-                                return m_Version; 
-                        } 
-                }               
-
-                /// <summary>
-                /// Gets the full path.
-                /// </summary>
-                /// <value>The full path.</value>
-                public string FullPath
-                {
-                        get
-                        {
-                                return m_FullPath;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the name of the assembly.
-                /// </summary>
-                /// <value>The name of the assembly.</value>
-                public string AssemblyName
-                {
-                        get
-                        {
-                                return m_AssemblyName;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the app icon.
-                /// </summary>
-                /// <value>The app icon.</value>
-                public string AppIcon 
-                {
-                        get 
-                        {
-                                return m_AppIcon;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the app icon.
-                /// </summary>
-                /// <value>The app icon.</value>
-                public string ConfigFile
-                {
-                    get
-                    {
-                        return m_ConfigFile;
-                    }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public string DesignerFolder 
-                {
-                        get 
-                        {
-                                return m_DesignerFolder;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the language.
-                /// </summary>
-                /// <value>The language.</value>
-                public string Language
-                {
-                        get
-                        {
-                                return m_Language;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the type.
-                /// </summary>
-                /// <value>The type.</value>
-                public ProjectType Type
-                {
-                        get
-                        {
-                                return m_Type;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the runtime.
-                /// </summary>
-                /// <value>The runtime.</value>
-                public ClrRuntime Runtime
-                {
-                        get
-                        {
-                                return m_Runtime;
-                        }
-                }
-
-                private bool m_GenerateAssemblyInfoFile;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public bool GenerateAssemblyInfoFile
-                {
-                        get
-                        {
-                            return m_GenerateAssemblyInfoFile;
-                        }
-                        set
-                        {
-                            m_GenerateAssemblyInfoFile = value;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the startup object.
-                /// </summary>
-                /// <value>The startup object.</value>
-                public string StartupObject
-                {
-                        get
-                        {
-                                return m_StartupObject;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the root namespace.
-                /// </summary>
-                /// <value>The root namespace.</value>
-                public string RootNamespace
-                {
-                        get
-                        {
-                                return m_RootNamespace;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the configurations.
-                /// </summary>
-                /// <value>The configurations.</value>
+        private FilesNode m_Files;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
+        /// <summary>
+        /// The version of the .NET Framework to compile under
+        /// </summary>
+        public FrameworkVersion FrameworkVersion
+        {
+            get
+            {
+                return m_Framework;
+            }
+        }
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets the filter groups.
+        /// </summary>
+        /// <value>The filter groups.</value>
+        public string FilterGroups
+        {
+            get
+            {
+                return m_FilterGroups;
+            }
+        }
+
+        /// <summary>
+        /// Gets the project's version
+        /// </summary>
+        /// <value>The project's version.</value>
+        public string Version
+        {
+            get
+            {
+                return m_Version;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path.
+        /// </summary>
+        /// <value>The full path.</value>
+        public string FullPath
+        {
+            get
+            {
+                return m_FullPath;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the assembly.
+        /// </summary>
+        /// <value>The name of the assembly.</value>
+        public string AssemblyName
+        {
+            get
+            {
+                return m_AssemblyName;
+            }
+        }
+
+        /// <summary>
+        /// Gets the app icon.
+        /// </summary>
+        /// <value>The app icon.</value>
+        public string AppIcon
+        {
+            get
+            {
+                return m_AppIcon;
+            }
+        }
+
+        /// <summary>
+        /// Gets the app icon.
+        /// </summary>
+        /// <value>The app icon.</value>
+        public string ConfigFile
+        {
+            get
+            {
+                return m_ConfigFile;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string DesignerFolder
+        {
+            get
+            {
+                return m_DesignerFolder;
+            }
+        }
+
+        /// <summary>
+        /// Gets the language.
+        /// </summary>
+        /// <value>The language.</value>
+        public string Language
+        {
+            get
+            {
+                return m_Language;
+            }
+        }
+
+        /// <summary>
+        /// Gets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public ProjectType Type
+        {
+            get
+            {
+                return m_Type;
+            }
+        }
+
+        /// <summary>
+        /// Gets the runtime.
+        /// </summary>
+        /// <value>The runtime.</value>
+        public ClrRuntime Runtime
+        {
+            get
+            {
+                return m_Runtime;
+            }
+        }
+
+        private bool m_GenerateAssemblyInfoFile;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public bool GenerateAssemblyInfoFile
+        {
+            get
+            {
+                return m_GenerateAssemblyInfoFile;
+            }
+            set
+            {
+                m_GenerateAssemblyInfoFile = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the startup object.
+        /// </summary>
+        /// <value>The startup object.</value>
+        public string StartupObject
+        {
+            get
+            {
+                return m_StartupObject;
+            }
+        }
+
+        /// <summary>
+        /// Gets the root namespace.
+        /// </summary>
+        /// <value>The root namespace.</value>
+        public string RootNamespace
+        {
+            get
+            {
+                return m_RootNamespace;
+            }
+        }
+
+        /// <summary>
+        /// Gets the configurations.
+        /// </summary>
+        /// <value>The configurations.</value>
         public List<ConfigurationNode> Configurations
-                {
-                        get
-                        {
-                            List<ConfigurationNode> tmp = new List<ConfigurationNode>(ConfigurationsTable.Values);
+        {
+            get
+            {
+                List<ConfigurationNode> tmp = new List<ConfigurationNode>(ConfigurationsTable.Values);
                 tmp.Sort();
                 return tmp;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the configurations table.
-                /// </summary>
-                /// <value>The configurations table.</value>
-                public Dictionary<string, ConfigurationNode> ConfigurationsTable
-                {
-                        get
-                        {
-                                return m_Configurations;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the reference paths.
-                /// </summary>
-                /// <value>The reference paths.</value>
-                public List<ReferencePathNode> ReferencePaths
-                {
-                        get
-                        {
+            }
+        }
+
+        /// <summary>
+        /// Gets the configurations table.
+        /// </summary>
+        /// <value>The configurations table.</value>
+        public Dictionary<string, ConfigurationNode> ConfigurationsTable
+        {
+            get
+            {
+                return m_Configurations;
+            }
+        }
+
+        /// <summary>
+        /// Gets the reference paths.
+        /// </summary>
+        /// <value>The reference paths.</value>
+        public List<ReferencePathNode> ReferencePaths
+        {
+            get
+            {
                 List<ReferencePathNode> tmp = new List<ReferencePathNode>(m_ReferencePaths);
                 tmp.Sort();
                 return tmp;
-                        }
-                }
+            }
+        }
 
-                /// <summary>
-                /// Gets the references.
-                /// </summary>
-                /// <value>The references.</value>
+        /// <summary>
+        /// Gets the references.
+        /// </summary>
+        /// <value>The references.</value>
         public List<ReferenceNode> References
-                {
-                        get
-                        {
+        {
+            get
+            {
                 List<ReferenceNode> tmp = new List<ReferenceNode>(m_References);
                 tmp.Sort();
                 return tmp;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets the Authors list.
-                /// </summary>
-                /// <value>The list of the project's authors.</value>
-                public List<AuthorNode> Authors
-                {
-                        get
-                        {
-                                return m_Authors;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the files.
-                /// </summary>
-                /// <value>The files.</value>
-                public FilesNode Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public override IDataNode Parent
-                {
-                        get
-                        {
-                                return base.Parent;
-                        }
-                        set
-                        {
-                                base.Parent = value;
-                                if(base.Parent is SolutionNode && m_Configurations.Count < 1)
-                                {
-                                        SolutionNode parent = (SolutionNode)base.Parent;
-                                        foreach(ConfigurationNode conf in parent.Configurations)
-                                        {
-                                                m_Configurations[conf.NameAndPlatform] = (ConfigurationNode) conf.Clone();
-                                        }
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Gets the GUID.
-                /// </summary>
-                /// <value>The GUID.</value>
-                public Guid Guid
-                {
-                        get
-                        {
-                                return m_Guid;
-                        }
-                }
-
-            public string DebugStartParameters
-            {
+            }
+        }
+
+        /// <summary>
+        /// Gets the Authors list.
+        /// </summary>
+        /// <value>The list of the project's authors.</value>
+        public List<AuthorNode> Authors
+        {
+            get
+            {
+                return m_Authors;
+            }
+        }
+
+        /// <summary>
+        /// Gets the files.
+        /// </summary>
+        /// <value>The files.</value>
+        public FilesNode Files
+        {
+            get
+            {
+                return m_Files;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parent.
+        /// </summary>
+        /// <value>The parent.</value>
+        public override IDataNode Parent
+        {
+            get
+            {
+                return base.Parent;
+            }
+            set
+            {
+                base.Parent = value;
+                if(base.Parent is SolutionNode && m_Configurations.Count < 1)
+                {
+                    SolutionNode parent = (SolutionNode)base.Parent;
+                    foreach(ConfigurationNode conf in parent.Configurations)
+                    {
+                        m_Configurations[conf.NameAndPlatform] = (ConfigurationNode) conf.Clone();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the GUID.
+        /// </summary>
+        /// <value>The GUID.</value>
+        public Guid Guid
+        {
+            get
+            {
+                return m_Guid;
+            }
+        }
+
+        public string DebugStartParameters
+        {
             get
             {
                 return m_DebugStartParameters;
             }
-            }
-
-            #endregion
-
-                #region Private Methods
-
-                private void HandleConfiguration(ConfigurationNode conf)
-                {
-                        if(String.Compare(conf.Name, "all", true) == 0) //apply changes to all, this may not always be applied first,
-                                //so it *may* override changes to the same properties for configurations defines at the project level
-                        {
-                                foreach(ConfigurationNode confNode in m_Configurations.Values) 
-                                {
-                                        conf.CopyTo(confNode);//update the config templates defines at the project level with the overrides
-                                }
-                        }
-                        if(m_Configurations.ContainsKey(conf.NameAndPlatform))
-                        {
-                                ConfigurationNode parentConf = m_Configurations[conf.NameAndPlatform];
-                                conf.CopyTo(parentConf);//update the config templates defines at the project level with the overrides
-                        } 
-                        else
-                        {
-                                m_Configurations[conf.NameAndPlatform] = conf;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_FilterGroups = Helper.AttributeValue(node, "filterGroups", m_FilterGroups);
-                        m_Version = Helper.AttributeValue(node, "version", m_Version);
-                        m_AppIcon = Helper.AttributeValue(node, "icon", m_AppIcon);
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void HandleConfiguration(ConfigurationNode conf)
+        {
+            if(String.Compare(conf.Name, "all", true) == 0) //apply changes to all, this may not always be applied first,
+                //so it *may* override changes to the same properties for configurations defines at the project level
+            {
+                foreach(ConfigurationNode confNode in m_Configurations.Values)
+                {
+                    conf.CopyTo(confNode);//update the config templates defines at the project level with the overrides
+                }
+            }
+            if(m_Configurations.ContainsKey(conf.NameAndPlatform))
+            {
+                ConfigurationNode parentConf = m_Configurations[conf.NameAndPlatform];
+                conf.CopyTo(parentConf);//update the config templates defines at the project level with the overrides
+            }
+            else
+            {
+                m_Configurations[conf.NameAndPlatform] = conf;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            m_Name = Helper.AttributeValue(node, "name", m_Name);
+            m_Path = Helper.AttributeValue(node, "path", m_Path);
+            m_FilterGroups = Helper.AttributeValue(node, "filterGroups", m_FilterGroups);
+            m_Version = Helper.AttributeValue(node, "version", m_Version);
+            m_AppIcon = Helper.AttributeValue(node, "icon", m_AppIcon);
             m_ConfigFile = Helper.AttributeValue(node, "configFile", m_ConfigFile);
-                        m_DesignerFolder = Helper.AttributeValue(node, "designerFolder", m_DesignerFolder);
-                        m_AssemblyName = Helper.AttributeValue(node, "assemblyName", m_AssemblyName);
-                        m_Language = Helper.AttributeValue(node, "language", m_Language);
-                        m_Type = (ProjectType)Helper.EnumAttributeValue(node, "type", typeof(ProjectType), m_Type);
-                        m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
+            m_DesignerFolder = Helper.AttributeValue(node, "designerFolder", m_DesignerFolder);
+            m_AssemblyName = Helper.AttributeValue(node, "assemblyName", m_AssemblyName);
+            m_Language = Helper.AttributeValue(node, "language", m_Language);
+            m_Type = (ProjectType)Helper.EnumAttributeValue(node, "type", typeof(ProjectType), m_Type);
+            m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
             m_Framework = (FrameworkVersion)Helper.EnumAttributeValue(node, "frameworkVersion", typeof(FrameworkVersion), m_Framework);
-                        m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
-                        m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
-                        
+            m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
+            m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
+
             int hash = m_Name.GetHashCode();
-                        Guid guidByHash = new Guid(hash, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-                        string guid = Helper.AttributeValue(node, "guid", guidByHash.ToString());
-                        m_Guid = new Guid(guid);
+             Guid guidByHash = new Guid(hash, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            string guid = Helper.AttributeValue(node, "guid", guidByHash.ToString());
+            m_Guid = new Guid(guid);
 
             m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
-                    m_DebugStartParameters = Helper.AttributeValue(node, "debugStartParameters", string.Empty);
-            
-                        if(string.IsNullOrEmpty(m_AssemblyName))
-                        {
-                                m_AssemblyName = m_Name;
-                        }
-
-                        if(string.IsNullOrEmpty(m_RootNamespace))
-                        {
-                                m_RootNamespace = m_Name;
-                        }
-
-                        m_FullPath = m_Path;
-                        try
-                        {
-                                m_FullPath = Helper.ResolvePath(m_FullPath);
-                        }
-                        catch
-                        {
-                                throw new WarningException("Could not resolve Solution path: {0}", m_Path);
-                        }
-
-                        Kernel.Instance.CurrentWorkingDirectory.Push();
-                        try
-                        {
-                                Helper.SetCurrentDir(m_FullPath);
-
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-
-                                foreach(XmlNode child in node.ChildNodes)
-                                {
-                                        IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                        if(dataNode is ConfigurationNode)
-                                        {
-                                                HandleConfiguration((ConfigurationNode)dataNode);
-                                        }
-                                        else if(dataNode is ReferencePathNode)
-                                        {
+            m_DebugStartParameters = Helper.AttributeValue(node, "debugStartParameters", string.Empty);
+
+            if(string.IsNullOrEmpty(m_AssemblyName))
+            {
+                m_AssemblyName = m_Name;
+            }
+
+            if(string.IsNullOrEmpty(m_RootNamespace))
+            {
+                m_RootNamespace = m_Name;
+            }
+
+            m_FullPath = m_Path;
+            try
+            {
+                m_FullPath = Helper.ResolvePath(m_FullPath);
+            }
+            catch
+            {
+                throw new WarningException("Could not resolve Solution path: {0}", m_Path);
+            }
+
+            Kernel.Instance.CurrentWorkingDirectory.Push();
+            try
+            {
+                Helper.SetCurrentDir(m_FullPath);
+
+                if( node == null )
+                {
+                    throw new ArgumentNullException("node");
+                }
+
+                foreach(XmlNode child in node.ChildNodes)
+                {
+                    IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                    if(dataNode is ConfigurationNode)
+                    {
+                        HandleConfiguration((ConfigurationNode)dataNode);
+                    }
+                    else if(dataNode is ReferencePathNode)
+                    {
                         m_ReferencePaths.Add((ReferencePathNode)dataNode);
-                                        }
-                                        else if(dataNode is ReferenceNode)
-                                        {
+                    }
+                    else if(dataNode is ReferenceNode)
+                    {
                         m_References.Add((ReferenceNode)dataNode);
-                                        }
-                                        else if(dataNode is AuthorNode)
-                                        {
+                    }
+                    else if(dataNode is AuthorNode)
+                    {
                         m_Authors.Add((AuthorNode)dataNode);
-                                        }
-                                        else if(dataNode is FilesNode)
-                                        {
-                                                m_Files = (FilesNode)dataNode;
-                                        }
-                                }
-                        }
-                        finally
-                        {
-                                Kernel.Instance.CurrentWorkingDirectory.Pop();
-                        }
-                }
-
-                #endregion
+                    }
+                    else if(dataNode is FilesNode)
+                    {
+                        m_Files = (FilesNode)dataNode;
+                    }
+                }
+            }
+            finally
+            {
+                Kernel.Instance.CurrentWorkingDirectory.Pop();
+            }
+        }
+
+        #endregion
 
         #region IComparable Members
 
@@ -582,6 +582,6 @@ namespace Prebuild.Core.Nodes
             return m_Name.CompareTo(that.m_Name);
         }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
index 9c5d1a3..9afb512 100644
--- a/Prebuild/src/Core/Nodes/ReferenceNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,104 +32,104 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Reference")]
-        public class ReferenceNode : DataNode, IComparable
-        {
-                #region Fields
-
-                private string m_Name = "unknown";
-                private string m_Path;
-                private string m_LocalCopy;
-                private string m_Version;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-
-                /// <summary>
-                /// Gets a value indicating whether [local copy specified].
-                /// </summary>
-                /// <value><c>true</c> if [local copy specified]; otherwise, <c>false</c>.</value>
-                public bool LocalCopySpecified 
-                {
-                        get 
-                        {
-                                return ( m_LocalCopy != null && m_LocalCopy.Length == 0);
-                        }
-                }
-
-                /// <summary>
-                /// Gets a value indicating whether [local copy].
-                /// </summary>
-                /// <value><c>true</c> if [local copy]; otherwise, <c>false</c>.</value>
-                public bool LocalCopy
-                {
-                        get
-                        {
-                                if( m_LocalCopy == null)
-                                {
-                                        return false;
-                                }
-                                return bool.Parse(m_LocalCopy);
-                        }
-                }
-
-                /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version
-                {
-                        get
-                        {
-                                return m_Version;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_LocalCopy = Helper.AttributeValue(node, "localCopy", m_LocalCopy);
-                        m_Version = Helper.AttributeValue(node, "version", m_Version);
-                }
-
-                #endregion
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Reference")]
+    public class ReferenceNode : DataNode, IComparable
+    {
+        #region Fields
+
+        private string m_Name = "unknown";
+        private string m_Path;
+        private string m_LocalCopy;
+        private string m_Version;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether [local copy specified].
+        /// </summary>
+        /// <value><c>true</c> if [local copy specified]; otherwise, <c>false</c>.</value>
+        public bool LocalCopySpecified
+        {
+            get
+            {
+                return ( m_LocalCopy != null && m_LocalCopy.Length == 0);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether [local copy].
+        /// </summary>
+        /// <value><c>true</c> if [local copy]; otherwise, <c>false</c>.</value>
+        public bool LocalCopy
+        {
+            get
+            {
+                if( m_LocalCopy == null)
+                {
+                    return false;
+                }
+                return bool.Parse(m_LocalCopy);
+            }
+        }
+
+        /// <summary>
+        /// Gets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public string Version
+        {
+            get
+            {
+                return m_Version;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            m_Name = Helper.AttributeValue(node, "name", m_Name);
+            m_Path = Helper.AttributeValue(node, "path", m_Path);
+            m_LocalCopy = Helper.AttributeValue(node, "localCopy", m_LocalCopy);
+            m_Version = Helper.AttributeValue(node, "version", m_Version);
+        }
+
+        #endregion
 
         #region IComparable Members
 
@@ -140,5 +140,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-        }
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
index 7331cd7..29c63c5 100644
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -32,57 +32,57 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("ReferencePath")]
-        public class ReferencePathNode : DataNode, IComparable
-        {
-                #region Fields
-
-                private string m_Path;
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path
-                {
-                        get
-                        {
-                                return m_Path;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-
-                        m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
-                        if(m_Path == null)
-                        {
-                                m_Path = "";
-                        }
-
-                        m_Path = m_Path.Trim();
-                }
-
-                #endregion
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("ReferencePath")]
+    public class ReferencePathNode : DataNode, IComparable
+    {
+        #region Fields
+
+        private string m_Path;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+            if(m_Path == null)
+            {
+                m_Path = "";
+            }
+
+            m_Path = m_Path.Trim();
+        }
+
+        #endregion
 
         #region IComparable Members
 
@@ -93,5 +93,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-        }
+    }
 }
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
index 10c0223..e1d5b3b 100644
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,35 +34,35 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Solution")]
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Solution")]
     [DataNode("EmbeddedSolution")]
     [DebuggerDisplay("{Name}")]
-        public class SolutionNode : DataNode
-        {
-                #region Fields
+    public class SolutionNode : DataNode
+    {
+        #region Fields
 
         private Guid m_Guid = Guid.NewGuid();
-                private string m_Name = "unknown";
-                private string m_Path = "";
-                private string m_FullPath = "";
-                private string m_ActiveConfig;
+        private string m_Name = "unknown";
+        private string m_Path = "";
+        private string m_FullPath = "";
+        private string m_ActiveConfig;
         private string m_Version = "1.0.0";
-        
-                private OptionsNode m_Options;
-                private FilesNode m_Files;
+
+        private OptionsNode m_Options;
+        private FilesNode m_Files;
         private readonly ConfigurationNodeCollection m_Configurations = new ConfigurationNodeCollection();
         private readonly Dictionary<string, ProjectNode> m_Projects = new Dictionary<string, ProjectNode>();
         private readonly Dictionary<string, DatabaseProjectNode> m_DatabaseProjects = new Dictionary<string, DatabaseProjectNode>();
         private readonly List<ProjectNode> m_ProjectsOrder = new List<ProjectNode>();
         private readonly Dictionary<string, SolutionNode> m_Solutions = new Dictionary<string, SolutionNode>();
-            private CleanupNode m_Cleanup;
+        private CleanupNode m_Cleanup;
 
-            #endregion
+        #endregion
 
-                #region Properties
+        #region Properties
         public override IDataNode Parent
         {
             get
@@ -84,142 +84,142 @@ namespace Prebuild.Core.Nodes
             }
         }
 
-            public CleanupNode Cleanup
-            {
-                get
-                {
-                    return m_Cleanup;
-                }
+        public CleanupNode Cleanup
+        {
+            get
+            {
+                return m_Cleanup;
+            }
             set
             {
                 m_Cleanup = value;
             }
-            }
+        }
 
         public Guid Guid
         {
-            get 
-            { 
-                return m_Guid; 
+            get
+            {
+                return m_Guid;
             }
             set
             {
-                m_Guid = value; 
+                m_Guid = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the active config.
+        /// </summary>
+        /// <value>The active config.</value>
+        public string ActiveConfig
+        {
+            get
+            {
+                return m_ActiveConfig;
+            }
+            set
+            {
+                m_ActiveConfig = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path
+        {
+            get
+            {
+                return m_Path;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path.
+        /// </summary>
+        /// <value>The full path.</value>
+        public string FullPath
+        {
+            get
+            {
+                return m_FullPath;
+            }
+        }
+
+        /// <summary>
+        /// Gets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public string Version
+        {
+            get
+            {
+                return m_Version;
+            }
+        }
+
+        /// <summary>
+        /// Gets the options.
+        /// </summary>
+        /// <value>The options.</value>
+        public OptionsNode Options
+        {
+            get
+            {
+                return m_Options;
+            }
+        }
+
+        /// <summary>
+        /// Gets the files.
+        /// </summary>
+        /// <value>The files.</value>
+        public FilesNode Files
+        {
+            get
+            {
+                return m_Files;
+            }
+        }
+
+        /// <summary>
+        /// Gets the configurations.
+        /// </summary>
+        /// <value>The configurations.</value>
+        public ConfigurationNodeCollection Configurations
+        {
+            get
+            {
+                ConfigurationNodeCollection tmp = new ConfigurationNodeCollection();
+                tmp.AddRange(ConfigurationsTable);
+                return tmp;
+            }
+        }
+
+        /// <summary>
+        /// Gets the configurations table.
+        /// </summary>
+        /// <value>The configurations table.</value>
+        public ConfigurationNodeCollection ConfigurationsTable
+        {
+            get
+            {
+                return m_Configurations;
             }
         }
-                /// <summary>
-                /// Gets or sets the active config.
-                /// </summary>
-                /// <value>The active config.</value>
-                public string ActiveConfig 
-                { 
-                        get 
-                        { 
-                                return m_ActiveConfig; 
-                        } 
-                        set 
-                        { 
-                                m_ActiveConfig = value; 
-                        } 
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name 
-                {
-                        get 
-                        {
-                                return m_Name;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the path.
-                /// </summary>
-                /// <value>The path.</value>
-                public string Path 
-                {
-                        get 
-                        {
-                                return m_Path;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the full path.
-                /// </summary>
-                /// <value>The full path.</value>
-                public string FullPath
-                {
-                        get
-                        {
-                                return m_FullPath;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version 
-                {
-                        get 
-                        {
-                                return m_Version;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the options.
-                /// </summary>
-                /// <value>The options.</value>
-                public OptionsNode Options
-                {
-                        get
-                        {
-                                return m_Options;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the files.
-                /// </summary>
-                /// <value>The files.</value>
-                public FilesNode Files
-                {
-                        get
-                        {
-                                return m_Files;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the configurations.
-                /// </summary>
-                /// <value>The configurations.</value>
-                public ConfigurationNodeCollection Configurations
-                {
-                        get
-                        {
-                                ConfigurationNodeCollection tmp = new ConfigurationNodeCollection();
-                                tmp.AddRange(ConfigurationsTable);
-                                return tmp;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the configurations table.
-                /// </summary>
-                /// <value>The configurations table.</value>
-                public ConfigurationNodeCollection ConfigurationsTable
-                {
-                        get
-                        {
-                                return m_Configurations;
-                        }
-                }
         /// <summary>
         /// Gets the database projects.
         /// </summary>
@@ -250,106 +250,106 @@ namespace Prebuild.Core.Nodes
                 return m_Solutions;
             }
         }
-                /// <summary>
-                /// Gets the projects.
-                /// </summary>
-                /// <value>The projects.</value>
-                public ICollection<ProjectNode> Projects
-                {
-                        get
-                        {
+        /// <summary>
+        /// Gets the projects.
+        /// </summary>
+        /// <value>The projects.</value>
+        public ICollection<ProjectNode> Projects
+        {
+            get
+            {
                 List<ProjectNode> tmp = new List<ProjectNode>(m_Projects.Values);
                 tmp.Sort();
                 return tmp;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the projects table.
-                /// </summary>
-                /// <value>The projects table.</value>
-                public Dictionary<string, ProjectNode> ProjectsTable
-                {
-                        get
-                        {
-                                return m_Projects;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the projects table.
-                /// </summary>
-                /// <value>The projects table.</value>
-                public List<ProjectNode> ProjectsTableOrder
-                {
-                        get
-                        {
-                                return m_ProjectsOrder;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
-                        m_Path = Helper.AttributeValue(node, "path", m_Path);
-                        m_Version = Helper.AttributeValue(node, "version", m_Version);
-
-                        m_FullPath = m_Path;
-                        try
-                        {
-                                m_FullPath = Helper.ResolvePath(m_FullPath);
-                        }
-                        catch
-                        {
-                                throw new WarningException("Could not resolve solution path: {0}", m_Path);
-                        }
-
-                        Kernel.Instance.CurrentWorkingDirectory.Push();
-                        try
-                        {
-                                Helper.SetCurrentDir(m_FullPath);
-
-                                if( node == null )
-                                {
-                                        throw new ArgumentNullException("node");
-                                }
-
-                                foreach(XmlNode child in node.ChildNodes)
-                                {
-                                        IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                        if(dataNode is OptionsNode)
-                                        {
-                                                m_Options = (OptionsNode)dataNode;
-                                        }
-                                        else if(dataNode is FilesNode)
-                                        {
-                                                m_Files = (FilesNode)dataNode;
-                                        }
-                                        else if(dataNode is ConfigurationNode)
-                                        {
-                                                ConfigurationNode configurationNode = (ConfigurationNode) dataNode;
-                                                m_Configurations[configurationNode.NameAndPlatform] = configurationNode;
-
-                                                // If the active configuration is null, then we populate it.
-                                                if (ActiveConfig == null)
-                                                {
-                                                        ActiveConfig = configurationNode.Name;
-                                                }
-                                        }
-                                        else if(dataNode is ProjectNode)
-                                        {
-                                                m_Projects[((ProjectNode)dataNode).Name] = (ProjectNode) dataNode;
-                                                m_ProjectsOrder.Add((ProjectNode)dataNode);
-                                        }
+            }
+        }
+
+        /// <summary>
+        /// Gets the projects table.
+        /// </summary>
+        /// <value>The projects table.</value>
+        public Dictionary<string, ProjectNode> ProjectsTable
+        {
+            get
+            {
+                return m_Projects;
+            }
+        }
+
+        /// <summary>
+        /// Gets the projects table.
+        /// </summary>
+        /// <value>The projects table.</value>
+        public List<ProjectNode> ProjectsTableOrder
+        {
+            get
+            {
+                return m_ProjectsOrder;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            m_Name = Helper.AttributeValue(node, "name", m_Name);
+            m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
+            m_Path = Helper.AttributeValue(node, "path", m_Path);
+            m_Version = Helper.AttributeValue(node, "version", m_Version);
+
+            m_FullPath = m_Path;
+            try
+            {
+                m_FullPath = Helper.ResolvePath(m_FullPath);
+            }
+            catch
+            {
+                throw new WarningException("Could not resolve solution path: {0}", m_Path);
+            }
+
+            Kernel.Instance.CurrentWorkingDirectory.Push();
+            try
+            {
+                Helper.SetCurrentDir(m_FullPath);
+
+                if( node == null )
+                {
+                    throw new ArgumentNullException("node");
+                }
+
+                foreach(XmlNode child in node.ChildNodes)
+                {
+                    IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                    if(dataNode is OptionsNode)
+                    {
+                        m_Options = (OptionsNode)dataNode;
+                    }
+                    else if(dataNode is FilesNode)
+                    {
+                        m_Files = (FilesNode)dataNode;
+                    }
+                    else if(dataNode is ConfigurationNode)
+                    {
+                        ConfigurationNode configurationNode = (ConfigurationNode) dataNode;
+                        m_Configurations[configurationNode.NameAndPlatform] = configurationNode;
+
+                        // If the active configuration is null, then we populate it.
+                        if (ActiveConfig == null)
+                        {
+                            ActiveConfig = configurationNode.Name;
+                        }
+                    }
+                    else if(dataNode is ProjectNode)
+                    {
+                        m_Projects[((ProjectNode)dataNode).Name] = (ProjectNode) dataNode;
+                        m_ProjectsOrder.Add((ProjectNode)dataNode);
+                    }
                     else if(dataNode is SolutionNode)
                     {
                         m_Solutions[((SolutionNode)dataNode).Name] = (SolutionNode) dataNode;
@@ -369,14 +369,14 @@ namespace Prebuild.Core.Nodes
                             throw new WarningException("There can only be one Cleanup node.");
                         m_Cleanup = (CleanupNode)dataNode;
                     }
-                                }
-                        }
-                        finally
-                        {
-                                Kernel.Instance.CurrentWorkingDirectory.Pop();
-                        }
-                }
-
-                #endregion
-        }
+                }
+            }
+            finally
+            {
+                Kernel.Instance.CurrentWorkingDirectory.Pop();
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Parse/IfContext.cs b/Prebuild/src/Core/Parse/IfContext.cs
index 3c79d38..7729d3b 100644
--- a/Prebuild/src/Core/Parse/IfContext.cs
+++ b/Prebuild/src/Core/Parse/IfContext.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -27,128 +27,128 @@ using System;
 
 namespace Prebuild.Core.Parse
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum IfState
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                If,
-                /// <summary>
-                /// 
-                /// </summary>
-                ElseIf,
-                /// <summary>
-                /// 
-                /// </summary>
-                Else
-        }
-
-        /// <summary>
-        /// Summary description for IfContext.
-        /// </summary>
-        // Inspired by the equivalent WiX class (see www.sourceforge.net/projects/wix/)
-        public class IfContext
-        {
-                #region Properties
-
-                bool m_Active;
-                bool m_Keep;
-                bool m_EverKept;
-                IfState m_State = IfState.None;
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="IfContext"/> class.
-                /// </summary>
-                /// <param name="active">if set to <c>true</c> [active].</param>
-                /// <param name="keep">if set to <c>true</c> [keep].</param>
-                /// <param name="state">The state.</param>
-                public IfContext(bool active, bool keep, IfState state)
-                {
-                        m_Active = active;
-                        m_Keep = keep;
-                        m_EverKept = keep;
-                        m_State = state;
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets or sets a value indicating whether this <see cref="IfContext"/> is active.
-                /// </summary>
-                /// <value><c>true</c> if active; otherwise, <c>false</c>.</value>
-                public bool Active
-                {
-                        get
-                        {
-                                return m_Active;
-                        }
-                        set
-                        {
-                                m_Active = value;
-                        }
-                }
-
-                /// <summary>
-                /// Gets or sets a value indicating whether this <see cref="IfContext"/> is keep.
-                /// </summary>
-                /// <value><c>true</c> if keep; otherwise, <c>false</c>.</value>
-                public bool Keep
-                {
-                        get
-                        {
-                                return m_Keep;
-                        }
-                        set
-                        {
-                                m_Keep = value;
-                                if(m_Keep)
-                                {
-                                        m_EverKept = true;
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Gets a value indicating whether [ever kept].
-                /// </summary>
-                /// <value><c>true</c> if [ever kept]; otherwise, <c>false</c>.</value>
-                public bool EverKept
-                {
-                        get
-                        {
-                                return m_EverKept;
-                        }
-                }
-
-                /// <summary>
-                /// Gets or sets the state.
-                /// </summary>
-                /// <value>The state.</value>
-                public IfState State
-                {
-                        get
-                        {
-                                return m_State;
-                        }
-                        set
-                        {
-                                m_State = value;
-                        }
-                }
-
-                #endregion
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    public enum IfState
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        None,
+        /// <summary>
+        ///
+        /// </summary>
+        If,
+        /// <summary>
+        ///
+        /// </summary>
+        ElseIf,
+        /// <summary>
+        ///
+        /// </summary>
+        Else
+    }
+
+    /// <summary>
+    /// Summary description for IfContext.
+    /// </summary>
+    // Inspired by the equivalent WiX class (see www.sourceforge.net/projects/wix/)
+    public class IfContext
+    {
+        #region Properties
+
+        bool m_Active;
+        bool m_Keep;
+        bool m_EverKept;
+        IfState m_State = IfState.None;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IfContext"/> class.
+        /// </summary>
+        /// <param name="active">if set to <c>true</c> [active].</param>
+        /// <param name="keep">if set to <c>true</c> [keep].</param>
+        /// <param name="state">The state.</param>
+        public IfContext(bool active, bool keep, IfState state)
+        {
+            m_Active = active;
+            m_Keep = keep;
+            m_EverKept = keep;
+            m_State = state;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="IfContext"/> is active.
+        /// </summary>
+        /// <value><c>true</c> if active; otherwise, <c>false</c>.</value>
+        public bool Active
+        {
+            get
+            {
+                return m_Active;
+            }
+            set
+            {
+                m_Active = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="IfContext"/> is keep.
+        /// </summary>
+        /// <value><c>true</c> if keep; otherwise, <c>false</c>.</value>
+        public bool Keep
+        {
+            get
+            {
+                return m_Keep;
+            }
+            set
+            {
+                m_Keep = value;
+                if(m_Keep)
+                {
+                    m_EverKept = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether [ever kept].
+        /// </summary>
+        /// <value><c>true</c> if [ever kept]; otherwise, <c>false</c>.</value>
+        public bool EverKept
+        {
+            get
+            {
+                return m_EverKept;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public IfState State
+        {
+            get
+            {
+                return m_State;
+            }
+            set
+            {
+                m_State = value;
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Parse/Preprocessor.cs b/Prebuild/src/Core/Parse/Preprocessor.cs
index 0648fad..0cd6e82 100644
--- a/Prebuild/src/Core/Parse/Preprocessor.cs
+++ b/Prebuild/src/Core/Parse/Preprocessor.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -31,336 +31,336 @@ using System.Xml;
 
 namespace Prebuild.Core.Parse
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum OperatorSymbol
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Equal,
-                /// <summary>
-                /// 
-                /// </summary>
-                NotEqual,
-                /// <summary>
-                /// 
-                /// </summary>
-                LessThan,
-                /// <summary>
-                /// 
-                /// </summary>
-                GreaterThan,
-                /// <summary>
-                /// 
-                /// </summary>
-                LessThanEqual,
-                /// <summary>
-                /// 
-                /// </summary>
-                GreaterThanEqual
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Preprocessor
-        {
-                #region Constants
-
-                /// <summary>
-                /// Includes the regex to look for file tags in the <?include
-                /// ?> processing instruction.
-                /// </summary>
-                private static readonly Regex includeFileRegex = new Regex("file=\"(.+?)\"");
-
-                #endregion
-
-                #region Fields
-
-            readonly XmlDocument m_OutDoc = new XmlDocument();
-            readonly Stack<IfContext> m_IfStack = new Stack<IfContext>();
-            readonly Dictionary<string, object> m_Variables = new Dictionary<string, object>();
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="Preprocessor"/> class.
-                /// </summary>
-                public Preprocessor()
-                {
-                        RegisterVariable("OS", GetOS());
-                        RegisterVariable("RuntimeVersion", Environment.Version.Major);
-                        RegisterVariable("RuntimeMajor", Environment.Version.Major);
-                        RegisterVariable("RuntimeMinor", Environment.Version.Minor);
-                        RegisterVariable("RuntimeRevision", Environment.Version.Revision);
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the processed doc.
-                /// </summary>
-                /// <value>The processed doc.</value>
-                public XmlDocument ProcessedDoc
-                {
-                        get
-                        {
-                                return m_OutDoc;
-                        }
-                }
-
-                #endregion
-
-                #region Private Methods
-                 
-                /// <summary>
-                /// Parts of this code were taken from NAnt and is subject to the GPL
-                /// as per NAnt's license. Thanks to the NAnt guys for this little gem.
-                /// </summary>
-                /// <returns></returns>
-                public static string GetOS()
-                {
-                        PlatformID platId = Environment.OSVersion.Platform;
-                        if(platId == PlatformID.Win32NT || platId == PlatformID.Win32Windows)
-                        {
-                                return "Win32";
-                        }
-
-                        if (File.Exists("/System/Library/Frameworks/Cocoa.framework/Cocoa"))
-                        {
-                                return "MACOSX";
-                        }
-
-                        /*
-                         * .NET 1.x, under Mono, the UNIX code is 128. Under
-                         * .NET 2.x, Mono or MS, the UNIX code is 4
-                         */
-                        if(Environment.Version.Major == 1)
-                        {
-                                if((int)platId == 128)
-                                {
-                                        return "UNIX";
-                                }
-                        }
-                        else if((int)platId == 4)
-                        {
-                                return "UNIX";
-                        }
-
-                        return "Unknown";
-                }
-
-                private static bool CompareNum(OperatorSymbol oper, int val1, int val2)
-                {
-                        switch(oper)
-                        {
-                                case OperatorSymbol.Equal:
-                                        return (val1 == val2);
-                                case OperatorSymbol.NotEqual:
-                                        return (val1 != val2);
-                                case OperatorSymbol.LessThan:
-                                        return (val1 < val2);
-                                case OperatorSymbol.LessThanEqual:
-                                        return (val1 <= val2);
-                                case OperatorSymbol.GreaterThan:
-                                        return (val1 > val2);
-                                case OperatorSymbol.GreaterThanEqual:
-                                        return (val1 >= val2);
-                        }
-
-                        throw new WarningException("Unknown operator type");
-                }
-
-                private static bool CompareStr(OperatorSymbol oper, string val1, string val2)
-                {
-                        switch(oper)
-                        {
-                                case OperatorSymbol.Equal:
-                                        return (val1 == val2);
-                                case OperatorSymbol.NotEqual:
-                                        return (val1 != val2);
-                                case OperatorSymbol.LessThan:
-                                        return (val1.CompareTo(val2) < 0);
-                                case OperatorSymbol.LessThanEqual:
-                                        return (val1.CompareTo(val2) <= 0);
-                                case OperatorSymbol.GreaterThan:
-                                        return (val1.CompareTo(val2) > 0);
-                                case OperatorSymbol.GreaterThanEqual:
-                                        return (val1.CompareTo(val2) >= 0);
-                        }
-
-                        throw new WarningException("Unknown operator type");
-                }
-
-                private static char NextChar(int idx, string str)
-                {
-                        if((idx + 1) >= str.Length)
-                        {
-                                return Char.MaxValue;
-                        }
-
-                        return str[idx + 1];
-                }
-                // Very very simple expression parser. Can only match expressions of the form
-                // <var> <op> <value>:
-                // OS = Windows
-                // OS != Linux
-                // RuntimeMinor > 0
-                private bool ParseExpression(string exp)
-                {
-                        if(exp == null)
-                        {
-                                throw new ArgumentException("Invalid expression, cannot be null");
-                        }
-
-                        exp = exp.Trim();
-                        if(exp.Length < 1)
-                        {
-                                throw new ArgumentException("Invalid expression, cannot be 0 length");
-                        }
-
-                        string id = "";
-                        string str = "";
-                        OperatorSymbol oper = OperatorSymbol.None;
-                        bool inStr = false;
-
-                    for(int i = 0; i < exp.Length; i++)
-                        {
-                                char c = exp[i];
-                                if(Char.IsWhiteSpace(c))
-                                {
-                                        continue;
-                                }
-
-                                if(Char.IsLetterOrDigit(c) || c == '_')
-                                {
-                                        if(inStr)
-                                        {
-                                                str += c;
-                                        }
-                                        else
-                                        {
-                                                id += c;
-                                        }
-                                }
-                                else if(c == '\"')
-                                {
-                                        inStr = !inStr;
-                                        if(inStr)
-                                        {
-                                                str = "";
-                                        }
-                                }
-                                else
-                                {
-                                        if(inStr)
-                                        {
-                                                str += c;
-                                        }
-                                        else
-                                        {
-                                                switch(c)
-                                                {
-                                                        case '=':
-                                                                oper = OperatorSymbol.Equal;
-                                                                break;
-
-                                                        case '!':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.NotEqual;
-                                                                }
-                                                                
-                                                                break;
-
-                                                        case '<':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.LessThanEqual;
-                                                                }
-                                                                else
-                                                                {
-                                                                        oper = OperatorSymbol.LessThan;
-                                                                }
-                                                                
-                                                                break;
-
-                                                        case '>':
-                                                                if(NextChar(i, exp) == '=')
-                                                                {
-                                                                        oper = OperatorSymbol.GreaterThanEqual;
-                                                                }
-                                                                else
-                                                                {
-                                                                        oper = OperatorSymbol.GreaterThan;
-                                                                }
-
-                                                                break;
-                                                }
-                                        }
-                                }
-                        }
-
-                        
-                        if(inStr)
-                        {
-                                throw new WarningException("Expected end of string in expression");
-                        }
-
-                        if(oper == OperatorSymbol.None)
-                        {
-                                throw new WarningException("Expected operator in expression");
-                        }
-                    if(id.Length < 1)
-                    {
-                        throw new WarningException("Expected identifier in expression");
-                    }
-                    if(str.Length < 1)
-                    {
-                        throw new WarningException("Expected value in expression");
-                    }
-
-                    bool ret;
-                        try
-                        {
-                                object val = m_Variables[id.ToLower()];
-                                if(val == null)
-                                {
-                                        throw new WarningException("Unknown identifier '{0}'", id);
-                                }
-
-                            Type t = val.GetType();
-                                if(t.IsAssignableFrom(typeof(int)))
-                                {
-                                        int numVal = (int)val;
-                                        int numVal2 = Int32.Parse(str);
-                                        ret = CompareNum(oper, numVal, numVal2);
-                                }
-                                else
-                                {
-                                        string strVal = val.ToString();
-                                        string strVal2 = str;
-                                        ret = CompareStr(oper, strVal, strVal2);
-                                }
-                        }
-                        catch(ArgumentException ex)
-                        {
-                                ex.ToString();
-                                throw new WarningException("Invalid value type for system variable '{0}', expected int", id);
-                        }
-
-                        return ret;
-                }
+    /// <summary>
+    ///
+    /// </summary>
+    public enum OperatorSymbol
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        None,
+        /// <summary>
+        ///
+        /// </summary>
+        Equal,
+        /// <summary>
+        ///
+        /// </summary>
+        NotEqual,
+        /// <summary>
+        ///
+        /// </summary>
+        LessThan,
+        /// <summary>
+        ///
+        /// </summary>
+        GreaterThan,
+        /// <summary>
+        ///
+        /// </summary>
+        LessThanEqual,
+        /// <summary>
+        ///
+        /// </summary>
+        GreaterThanEqual
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    public class Preprocessor
+    {
+        #region Constants
+
+        /// <summary>
+        /// Includes the regex to look for file tags in the <?include
+        /// ?> processing instruction.
+        /// </summary>
+        private static readonly Regex includeFileRegex = new Regex("file=\"(.+?)\"");
+
+        #endregion
+
+        #region Fields
+
+        readonly XmlDocument m_OutDoc = new XmlDocument();
+        readonly Stack<IfContext> m_IfStack = new Stack<IfContext>();
+        readonly Dictionary<string, object> m_Variables = new Dictionary<string, object>();
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Preprocessor"/> class.
+        /// </summary>
+        public Preprocessor()
+        {
+            RegisterVariable("OS", GetOS());
+            RegisterVariable("RuntimeVersion", Environment.Version.Major);
+            RegisterVariable("RuntimeMajor", Environment.Version.Major);
+            RegisterVariable("RuntimeMinor", Environment.Version.Minor);
+            RegisterVariable("RuntimeRevision", Environment.Version.Revision);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the processed doc.
+        /// </summary>
+        /// <value>The processed doc.</value>
+        public XmlDocument ProcessedDoc
+        {
+            get
+            {
+                return m_OutDoc;
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Parts of this code were taken from NAnt and is subject to the GPL
+        /// as per NAnt's license. Thanks to the NAnt guys for this little gem.
+        /// </summary>
+        /// <returns></returns>
+        public static string GetOS()
+        {
+            PlatformID platId = Environment.OSVersion.Platform;
+            if(platId == PlatformID.Win32NT || platId == PlatformID.Win32Windows)
+            {
+                return "Win32";
+            }
+
+            if (File.Exists("/System/Library/Frameworks/Cocoa.framework/Cocoa"))
+            {
+                return "MACOSX";
+            }
+
+            /*
+             * .NET 1.x, under Mono, the UNIX code is 128. Under
+             * .NET 2.x, Mono or MS, the UNIX code is 4
+             */
+            if(Environment.Version.Major == 1)
+            {
+                if((int)platId == 128)
+                {
+                    return "UNIX";
+                }
+            }
+            else if((int)platId == 4)
+            {
+                return "UNIX";
+            }
+
+            return "Unknown";
+        }
+
+        private static bool CompareNum(OperatorSymbol oper, int val1, int val2)
+        {
+            switch(oper)
+            {
+                case OperatorSymbol.Equal:
+                    return (val1 == val2);
+                case OperatorSymbol.NotEqual:
+                    return (val1 != val2);
+                case OperatorSymbol.LessThan:
+                    return (val1 < val2);
+                case OperatorSymbol.LessThanEqual:
+                    return (val1 <= val2);
+                case OperatorSymbol.GreaterThan:
+                    return (val1 > val2);
+                case OperatorSymbol.GreaterThanEqual:
+                    return (val1 >= val2);
+            }
+
+            throw new WarningException("Unknown operator type");
+        }
+
+        private static bool CompareStr(OperatorSymbol oper, string val1, string val2)
+        {
+            switch(oper)
+            {
+                case OperatorSymbol.Equal:
+                    return (val1 == val2);
+                case OperatorSymbol.NotEqual:
+                    return (val1 != val2);
+                case OperatorSymbol.LessThan:
+                    return (val1.CompareTo(val2) < 0);
+                case OperatorSymbol.LessThanEqual:
+                    return (val1.CompareTo(val2) <= 0);
+                case OperatorSymbol.GreaterThan:
+                    return (val1.CompareTo(val2) > 0);
+                case OperatorSymbol.GreaterThanEqual:
+                    return (val1.CompareTo(val2) >= 0);
+            }
+
+            throw new WarningException("Unknown operator type");
+        }
+
+        private static char NextChar(int idx, string str)
+        {
+            if((idx + 1) >= str.Length)
+            {
+                return Char.MaxValue;
+            }
+
+            return str[idx + 1];
+        }
+        // Very very simple expression parser. Can only match expressions of the form
+        // <var> <op> <value>:
+        // OS = Windows
+        // OS != Linux
+        // RuntimeMinor > 0
+        private bool ParseExpression(string exp)
+        {
+            if(exp == null)
+            {
+                throw new ArgumentException("Invalid expression, cannot be null");
+            }
+
+            exp = exp.Trim();
+            if(exp.Length < 1)
+            {
+                throw new ArgumentException("Invalid expression, cannot be 0 length");
+            }
+
+            string id = "";
+            string str = "";
+            OperatorSymbol oper = OperatorSymbol.None;
+            bool inStr = false;
+
+            for(int i = 0; i < exp.Length; i++)
+            {
+                char c = exp[i];
+                if(Char.IsWhiteSpace(c))
+                {
+                    continue;
+                }
+
+                if(Char.IsLetterOrDigit(c) || c == '_')
+                {
+                    if(inStr)
+                    {
+                        str += c;
+                    }
+                    else
+                    {
+                        id += c;
+                    }
+                }
+                else if(c == '\"')
+                {
+                    inStr = !inStr;
+                    if(inStr)
+                    {
+                        str = "";
+                    }
+                }
+                else
+                {
+                    if(inStr)
+                    {
+                        str += c;
+                    }
+                    else
+                    {
+                        switch(c)
+                        {
+                            case '=':
+                                oper = OperatorSymbol.Equal;
+                                break;
+
+                            case '!':
+                                if(NextChar(i, exp) == '=')
+                                {
+                                    oper = OperatorSymbol.NotEqual;
+                                }
+
+                                break;
+
+                            case '<':
+                                if(NextChar(i, exp) == '=')
+                                {
+                                    oper = OperatorSymbol.LessThanEqual;
+                                }
+                                else
+                                {
+                                    oper = OperatorSymbol.LessThan;
+                                }
+
+                                break;
+
+                            case '>':
+                                if(NextChar(i, exp) == '=')
+                                {
+                                    oper = OperatorSymbol.GreaterThanEqual;
+                                }
+                                else
+                                {
+                                    oper = OperatorSymbol.GreaterThan;
+                                }
+
+                                break;
+                        }
+                    }
+                }
+            }
+
+
+            if(inStr)
+            {
+                throw new WarningException("Expected end of string in expression");
+            }
+
+            if(oper == OperatorSymbol.None)
+            {
+                throw new WarningException("Expected operator in expression");
+            }
+            if(id.Length < 1)
+            {
+                throw new WarningException("Expected identifier in expression");
+            }
+            if(str.Length < 1)
+            {
+                throw new WarningException("Expected value in expression");
+            }
+
+            bool ret;
+            try
+            {
+                object val = m_Variables[id.ToLower()];
+                if(val == null)
+                {
+                    throw new WarningException("Unknown identifier '{0}'", id);
+                }
+
+                Type t = val.GetType();
+                if(t.IsAssignableFrom(typeof(int)))
+                {
+                    int numVal = (int)val;
+                    int numVal2 = Int32.Parse(str);
+                    ret = CompareNum(oper, numVal, numVal2);
+                }
+                else
+                {
+                    string strVal = val.ToString();
+                    string strVal2 = str;
+                    ret = CompareStr(oper, strVal, strVal2);
+                }
+            }
+            catch(ArgumentException ex)
+            {
+                ex.ToString();
+                throw new WarningException("Invalid value type for system variable '{0}', expected int", id);
+            }
+
+            return ret;
+        }
 
         /// <summary>
         /// Taken from current Prebuild included in OpenSim 0.7.x
@@ -376,13 +376,13 @@ namespace Prebuild.Core.Parse
             if (!include.Contains ("*")) {
                 return;
             }
-            
+
             // Console.WriteLine("Processing {0}", include);
-            
+
             // Break up the include into pre and post wildcard sections
             string preWildcard = include.Substring (0, include.IndexOf ("*"));
             string postWildcard = include.Substring (include.IndexOf ("*") + 2);
-            
+
             // If preWildcard is a directory, recurse
             if (Directory.Exists (preWildcard)) {
                 string[] directories = Directory.GetDirectories (preWildcard);
@@ -390,7 +390,7 @@ namespace Prebuild.Core.Parse
                 Array.Reverse (directories);
                 foreach (string dirPath in directories) {
                     //Console.WriteLine ("Scanning : {0}", dirPath);
-                    
+
                     string includeFile = Path.Combine (dirPath, postWildcard);
                     if (includeFile.Contains ("*")) {
                         // postWildcard included another wildcard, recurse.
@@ -408,10 +408,10 @@ namespace Prebuild.Core.Parse
                 // preWildcard is not a path to a directory, so the wildcard is in the filename
                 string searchFilename = Path.GetFileName (preWildcard.Substring (preWildcard.IndexOf ("/") + 1) + "*" + postWildcard);
                 Console.WriteLine ("searchFilename: {0}", searchFilename);
-                
+
                 string searchDirectory = Path.GetDirectoryName (preWildcard);
                 Console.WriteLine ("searchDirectory: {0}", searchDirectory);
-                
+
                 string[] files = Directory.GetFiles (searchDirectory, searchFilename);
                 Array.Sort (files);
                 Array.Reverse (files);
@@ -426,227 +426,227 @@ namespace Prebuild.Core.Parse
             }
         }
 
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="name"></param>
-                /// <param name="variableValue"></param>
-                public void RegisterVariable(string name, object variableValue)
-                {
-                        if(name == null || variableValue == null)
-                        {
-                                return;
-                        }
-
-                        m_Variables[name.ToLower()] = variableValue;
-                }
-
-                /// <summary>
-                /// Performs validation on the xml source as well as evaluates conditional and flow expresions
-                /// </summary>
-                /// <exception cref="ArgumentException">For invalid use of conditional expressions or for invalid XML syntax.  If a XmlValidatingReader is passed, then will also throw exceptions for non-schema-conforming xml</exception>
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="variableValue"></param>
+        public void RegisterVariable(string name, object variableValue)
+        {
+            if(name == null || variableValue == null)
+            {
+                return;
+            }
+
+            m_Variables[name.ToLower()] = variableValue;
+        }
+
+        /// <summary>
+        /// Performs validation on the xml source as well as evaluates conditional and flow expresions
+        /// </summary>
+        /// <exception cref="ArgumentException">For invalid use of conditional expressions or for invalid XML syntax.  If a XmlValidatingReader is passed, then will also throw exceptions for non-schema-conforming xml</exception>
         /// <param name="initialReader"></param>
-                /// <returns>the output xml </returns>
-                public string Process(XmlReader initialReader)
-                {
-                        if(initialReader == null)
-                        {
-                                throw new ArgumentException("Invalid XML reader to pre-process");
-                        }
-
-                        IfContext context = new IfContext(true, true, IfState.None);
-                        StringWriter xmlText = new StringWriter();
-                        XmlTextWriter writer = new XmlTextWriter(xmlText);
-                        writer.Formatting = Formatting.Indented;
-
-                        // Create a queue of XML readers and add the initial
-                        // reader to it. Then we process until we run out of
-                        // readers which lets the <?include?> operation add more
-                        // readers to generate a multi-file parser and not require
-                        // XML fragments that a recursive version would use.
-                        Stack<XmlReader> readerStack = new Stack<XmlReader>();
-                        readerStack.Push(initialReader);
-                        
-                        while(readerStack.Count > 0)
-                        {
-                                // Pop off the next reader.
-                                XmlReader reader = readerStack.Pop();
-
-                                // Process through this XML reader until it is
-                                // completed (or it is replaced by the include
-                                // operation).
-                                while(reader.Read())
-                                {
-                                        // The prebuild file has a series of processing
-                                        // instructions which allow for specific
-                                        // inclusions based on operating system or to
-                                        // include additional files.
-                                        if(reader.NodeType == XmlNodeType.ProcessingInstruction)
-                                        {
-                                                bool ignore = false;
-
-                                                switch(reader.LocalName)
-                                                {
-                                                        case "include":
-                                                                // use regular expressions to parse out the attributes.
-                                                                MatchCollection matches = includeFileRegex.Matches(reader.Value);
-
-                                                                // make sure there is only one file attribute.
-                                                                if(matches.Count > 1)
-                                                                {
-                                                                        throw new WarningException("An <?include ?> node was found, but it specified more than one file.");
-                                                                }
-
-                                                                if(matches.Count == 0)
-                                                                {
-                                                                        throw new WarningException("An <?include ?> node was found, but it did not specify the file attribute.");
-                                                                }
+        /// <returns>the output xml </returns>
+        public string Process(XmlReader initialReader)
+        {
+            if(initialReader == null)
+            {
+                throw new ArgumentException("Invalid XML reader to pre-process");
+            }
+
+            IfContext context = new IfContext(true, true, IfState.None);
+            StringWriter xmlText = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(xmlText);
+            writer.Formatting = Formatting.Indented;
+
+            // Create a queue of XML readers and add the initial
+            // reader to it. Then we process until we run out of
+            // readers which lets the <?include?> operation add more
+            // readers to generate a multi-file parser and not require
+            // XML fragments that a recursive version would use.
+            Stack<XmlReader> readerStack = new Stack<XmlReader>();
+            readerStack.Push(initialReader);
+
+            while(readerStack.Count > 0)
+            {
+                // Pop off the next reader.
+                XmlReader reader = readerStack.Pop();
+
+                // Process through this XML reader until it is
+                // completed (or it is replaced by the include
+                // operation).
+                while(reader.Read())
+                {
+                    // The prebuild file has a series of processing
+                    // instructions which allow for specific
+                    // inclusions based on operating system or to
+                    // include additional files.
+                    if(reader.NodeType == XmlNodeType.ProcessingInstruction)
+                    {
+                        bool ignore = false;
+
+                        switch(reader.LocalName)
+                        {
+                            case "include":
+                                // use regular expressions to parse out the attributes.
+                                MatchCollection matches = includeFileRegex.Matches(reader.Value);
+
+                                // make sure there is only one file attribute.
+                                if(matches.Count > 1)
+                                {
+                                    throw new WarningException("An <?include ?> node was found, but it specified more than one file.");
+                                }
+
+                                if(matches.Count == 0)
+                                {
+                                    throw new WarningException("An <?include ?> node was found, but it did not specify the file attribute.");
+                                }
 
                                 // ***** Adding for wildcard handling
                                 // Push current reader back onto the stack.
                                 readerStack.Push (reader);
-                                
+
                                 // Pull the file out from the regex and make sure it is a valid file before using it.
                                 string filename = matches[0].Groups[1].Value;
-                                
+
                                 filename = String.Join (Path.DirectorySeparatorChar.ToString (), filename.Split (new char[] { '/', '\\' }));
-                                
+
                                 if (!filename.Contains ("*")) {
-                                
+
                                     FileInfo includeFile = new FileInfo (filename);
                                     if (!includeFile.Exists) {
                                         throw new WarningException ("Cannot include file: " + includeFile.FullName);
                                     }
-                                
+
                                     // Create a new reader object for this file. Then put the old reader back on the stack and start
                                     // processing using this new XML reader.
-                                
+
                                     XmlReader newReader = new XmlTextReader (includeFile.Open (FileMode.Open, FileAccess.Read, FileShare.Read));
                                     reader = newReader;
                                     readerStack.Push (reader);
-                                
+
                                 } else {
                                     WildCardInclude (readerStack, filename);
                                 }
-                                
+
                                 reader = (XmlReader)readerStack.Pop ();
                                 ignore = true;
                                 break;
 
-                                                        case "if":
-                                                                m_IfStack.Push(context);
-                                                                context = new IfContext(context.Keep & context.Active, ParseExpression(reader.Value), IfState.If);
-                                                                ignore = true;
-                                                                break;
-
-                                                        case "elseif":
-                                                                if(m_IfStack.Count == 0)
-                                                                {
-                                                                        throw new WarningException("Unexpected 'elseif' outside of 'if'");
-                                                                }
-                                                        if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                        {
-                                                            throw new WarningException("Unexpected 'elseif' outside of 'if'");
-                                                        }
-
-                                                        context.State = IfState.ElseIf;
-                                                                if(!context.EverKept)
-                                                                {
-                                                                        context.Keep = ParseExpression(reader.Value);
-                                                                }
-                                                                else
-                                                                {
-                                                                        context.Keep = false;
-                                                                }
-
-                                                                ignore = true;
-                                                                break;
-
-                                                        case "else":
-                                                                if(m_IfStack.Count == 0)
-                                                                {
-                                                                        throw new WarningException("Unexpected 'else' outside of 'if'");
-                                                                }
-                                                        if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                        {
-                                                            throw new WarningException("Unexpected 'else' outside of 'if'");
-                                                        }
-
-                                                        context.State = IfState.Else;
-                                                                context.Keep = !context.EverKept;
-                                                                ignore = true;
-                                                                break;
-
-                                                        case "endif":
-                                                                if(m_IfStack.Count == 0)
-                                                                {
-                                                                        throw new WarningException("Unexpected 'endif' outside of 'if'");
-                                                                }
-
-                                                                context = m_IfStack.Pop();
-                                                                ignore = true;
-                                                                break;
-                                                }
-
-                                                if(ignore)
-                                                {
-                                                        continue;
-                                                }
-                                        }//end pre-proc instruction
-
-                                        if(!context.Active || !context.Keep)
-                                        {
-                                                continue;
-                                        }
-
-                                        switch(reader.NodeType)
-                                        {
-                                                case XmlNodeType.Element:
-                                                        bool empty = reader.IsEmptyElement;
-                                                        writer.WriteStartElement(reader.Name);
-
-                                                        while (reader.MoveToNextAttribute())
-                                                        {
-                                                                writer.WriteAttributeString(reader.Name, reader.Value);
-                                                        }
-
-                                                        if(empty)
-                                                        {
-                                                                writer.WriteEndElement();
-                                                        }
-                                                
-                                                        break;
-
-                                                case XmlNodeType.EndElement:
-                                                        writer.WriteEndElement();
-                                                        break;
-
-                                                case XmlNodeType.Text:
-                                                        writer.WriteString(reader.Value);
-                                                        break;
-
-                                                case XmlNodeType.CDATA:
-                                                        writer.WriteCData(reader.Value);
-                                                        break;
-
-                                                default:
-                                                        break;
-                                        }
-                                }
-
-                                if(m_IfStack.Count != 0)
-                                {
-                                        throw new WarningException("Mismatched 'if', 'endif' pair");
-                                }
-                        }
-                        
-                        return xmlText.ToString();
-                }
-
-                #endregion
-        }
+                            case "if":
+                                m_IfStack.Push(context);
+                                context = new IfContext(context.Keep & context.Active, ParseExpression(reader.Value), IfState.If);
+                                ignore = true;
+                                break;
+
+                            case "elseif":
+                                if(m_IfStack.Count == 0)
+                                {
+                                    throw new WarningException("Unexpected 'elseif' outside of 'if'");
+                                }
+                                if(context.State != IfState.If && context.State != IfState.ElseIf)
+                                {
+                                    throw new WarningException("Unexpected 'elseif' outside of 'if'");
+                                }
+
+                                context.State = IfState.ElseIf;
+                                if(!context.EverKept)
+                                {
+                                    context.Keep = ParseExpression(reader.Value);
+                                }
+                                else
+                                {
+                                    context.Keep = false;
+                                }
+
+                                ignore = true;
+                                break;
+
+                            case "else":
+                                if(m_IfStack.Count == 0)
+                                {
+                                    throw new WarningException("Unexpected 'else' outside of 'if'");
+                                }
+                                if(context.State != IfState.If && context.State != IfState.ElseIf)
+                                {
+                                    throw new WarningException("Unexpected 'else' outside of 'if'");
+                                }
+
+                                context.State = IfState.Else;
+                                context.Keep = !context.EverKept;
+                                ignore = true;
+                                break;
+
+                            case "endif":
+                                if(m_IfStack.Count == 0)
+                                {
+                                    throw new WarningException("Unexpected 'endif' outside of 'if'");
+                                }
+
+                                context = m_IfStack.Pop();
+                                ignore = true;
+                                break;
+                        }
+
+                        if(ignore)
+                        {
+                            continue;
+                        }
+                    }//end pre-proc instruction
+
+                    if(!context.Active || !context.Keep)
+                    {
+                        continue;
+                    }
+
+                    switch(reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            bool empty = reader.IsEmptyElement;
+                            writer.WriteStartElement(reader.Name);
+
+                            while (reader.MoveToNextAttribute())
+                            {
+                                writer.WriteAttributeString(reader.Name, reader.Value);
+                            }
+
+                            if(empty)
+                            {
+                                writer.WriteEndElement();
+                            }
+
+                            break;
+
+                        case XmlNodeType.EndElement:
+                            writer.WriteEndElement();
+                            break;
+
+                        case XmlNodeType.Text:
+                            writer.WriteString(reader.Value);
+                            break;
+
+                        case XmlNodeType.CDATA:
+                            writer.WriteCData(reader.Value);
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+
+                if(m_IfStack.Count != 0)
+                {
+                    throw new WarningException("Mismatched 'if', 'endif' pair");
+                }
+            }
+
+            return xmlText.ToString();
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/AutotoolsTarget.cs b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
index 485e4dd..c52c4f1 100644
--- a/Prebuild/src/Core/Targets/AutotoolsTarget.cs
+++ b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
@@ -51,10 +51,10 @@ POSSIBILITY OF SUCH DAMAGE.
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject to
  the following conditions:
- 
+
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -156,7 +156,7 @@ namespace Prebuild.Core.Targets
 
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [Target("autotools")]
     public class AutotoolsTarget : ITarget
@@ -650,7 +650,7 @@ namespace Prebuild.Core.Targets
                     string tempAssemblyFile = Path.Combine(Path.GetTempPath(), project.Name + "-temp.dll");
                     System.CodeDom.Compiler.CompilerParameters cparam =
                         new System.CodeDom.Compiler.CompilerParameters(args, tempAssemblyFile);
-                    
+
                     System.CodeDom.Compiler.CompilerResults cr =
                         cscp.CompileAssemblyFromFile(cparam, sources);
 
@@ -673,11 +673,11 @@ namespace Prebuild.Core.Targets
                         if (File.Exists(tempAssemblyFile))
                             File.Delete(tempAssemblyFile);
                     }
-                    catch 
+                    catch
                     {
                         Console.WriteLine("Error! '{0}'", e);
                     }
-                   
+
                 }
 
                 // Tell the user if there's a problem copying the file
@@ -977,7 +977,7 @@ namespace Prebuild.Core.Targets
 
             if(autotoolsStream == null) {
 
-              /* 
+              /*
                * try without the default namespace prepended, in
                * case prebuild.exe assembly was compiled with
                * something other than Visual Studio .NET
diff --git a/Prebuild/src/Core/Targets/DebugTarget.cs b/Prebuild/src/Core/Targets/DebugTarget.cs
index d78064f..be8aea9 100644
--- a/Prebuild/src/Core/Targets/DebugTarget.cs
+++ b/Prebuild/src/Core/Targets/DebugTarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005	Matthew	Holmes (matthew@wildfiregames.com),	Dan	Moorehea
 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. 
-* The name of the author may not be     used to endorse or promote products     derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,     
-BUT     NOT     LIMITED TO,     THE     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be     used to endorse or promote products     derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -41,62 +41,62 @@ using Prebuild.Core.Nodes;
 #if     (DEBUG && _DEBUG_TARGET)
 namespace Prebuild.Core.Targets
 {
-        [Target("debug")]
-        public class DebugTarget : ITarget
-        {
+    [Target("debug")]
+    public class DebugTarget : ITarget
+    {
 #region Fields
 
-                private Kernel m_Kernel = null;
+        private Kernel m_Kernel = null;
 
 #endregion
 
 #region ITarget Members
 
-                public void     Write()
-                {
-                        foreach(SolutionNode s in m_Kernel.Solutions)
-                        {
-                                Console.WriteLine("Solution     [ {0}, {1} ]", s.Name, s.Path);
-                                foreach(string file     in s.Files)
+        public void     Write()
+        {
+            foreach(SolutionNode s in m_Kernel.Solutions)
+            {
+                Console.WriteLine("Solution     [ {0}, {1} ]", s.Name, s.Path);
+                foreach(string file     in s.Files)
 {
-                                        Console.WriteLine("\tFile [     {0}     ]",     file);
+                    Console.WriteLine("\tFile [ {0}     ]",     file);
 }
 
-                                foreach(ProjectNode     proj in s.Projects)
-                                {
-                                        Console.WriteLine("\tProject [ {0},     {1}. {2} ]", proj.Name, proj.Path, proj.Language);
-                                        foreach(string file     in proj.Files)
-                                                Console.WriteLine("\t\tFile     [ {0} ]", file);
-                                }
-                        }
-                }
-
-                public void     Clean()
-                {
-                        Console.WriteLine("Not implemented");
-                }
-
-                public string Name
-                {
-                        get
-                        {
-                                return "debug";
-                        }
-                }
-
-                public Kernel Kernel
-                {
-                        get
-                        {
-                                return m_Kernel;
-                        }
-                        set
-                        {
-                                m_Kernel = value;
-                        }
-                }
+                foreach(ProjectNode     proj in s.Projects)
+                {
+                    Console.WriteLine("\tProject [ {0}, {1}. {2} ]", proj.Name, proj.Path, proj.Language);
+                    foreach(string file in proj.Files)
+                        Console.WriteLine("\t\tFile     [ {0} ]", file);
+                }
+            }
+        }
+
+        public void     Clean()
+        {
+            Console.WriteLine("Not implemented");
+        }
+
+        public string Name
+        {
+            get
+            {
+                return "debug";
+            }
+        }
+
+        public Kernel Kernel
+        {
+            get
+            {
+                return m_Kernel;
+            }
+            set
+            {
+                m_Kernel = value;
+            }
+        }
 
 #endregion
-        }
+    }
 }
 #endif
diff --git a/Prebuild/src/Core/Targets/MakefileTarget.cs b/Prebuild/src/Core/Targets/MakefileTarget.cs
index 54046dd..8fe1c44 100644
--- a/Prebuild/src/Core/Targets/MakefileTarget.cs
+++ b/Prebuild/src/Core/Targets/MakefileTarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004 Crestez Leonard (cleonard@go.ro)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
diff --git a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
index ea6d2c2..85fe2db 100644
--- a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
+++ b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (da
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -35,481 +35,481 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("monodev")]
-        public class MonoDevelopTarget : ITarget
-        {
-                #region Fields
-
-                private Kernel m_Kernel;
-
-                #endregion
-
-                #region Private Methods
-
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        {
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        }
-                        else
-                        {
-                                tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        }
-
-                        return tmpPath;
-                }
-
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "<ProjectReference type=\"";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ret += "Project\"";
-                                ret += " localcopy=\"" + refr.LocalCopy.ToString() +  "\" refto=\"" + refr.Name + "\" />";
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        ret += "Assembly\" refto=\"";
-
-                                        string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
-
-                                        ret += finalPath;
-                                        ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                                        return ret;
-                                }
-
-                                ret += "Gac\"";
-                                ret += " localcopy=\"" + refr.LocalCopy.ToString() + "\"";
-                                ret += " refto=\"";
-                                try
-                                {
-                                        /*
-                                        Day changed to 28 Mar 2007
-                                        ...
-                                        08:09 < cj> is there anything that replaces Assembly.LoadFromPartialName() ?
-                                        08:09 < jonp> no
-                                        08:10 < jonp> in their infinite wisdom [sic], microsoft decided that the 
-                                                      ability to load any assembly version by-name was an inherently 
-                                                      bad idea
-                                        08:11 < cj> I'm thinking of a bunch of four-letter words right now...
-                                        08:11 < cj> security through making it difficult for the developer!!!
-                                        08:12 < jonp> just use the Obsolete API
-                                        08:12 < jonp> it should still work
-                                        08:12 < cj> alrighty.
-                                        08:12 < jonp> you just get warnings when using it
-                                        */
-                                        Assembly assem = Assembly.LoadWithPartialName(refr.Name);
-                                        ret += assem.FullName;
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("monodev")]
+    public class MonoDevelopTarget : ITarget
+    {
+        #region Fields
+
+        private Kernel m_Kernel;
+
+        #endregion
+
+        #region Private Methods
+
+        private static string PrependPath(string path)
+        {
+            string tmpPath = Helper.NormalizePath(path, '/');
+            Regex regex = new Regex(@"(\w):/(\w+)");
+            Match match = regex.Match(tmpPath);
+            if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+            {
+                tmpPath = Helper.NormalizePath(tmpPath);
+            }
+            else
+            {
+                tmpPath = Helper.NormalizePath("./" + tmpPath);
+            }
+
+            return tmpPath;
+        }
+
+        private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+        {
+            string ret = "<ProjectReference type=\"";
+            if(solution.ProjectsTable.ContainsKey(refr.Name))
+            {
+                ret += "Project\"";
+                ret += " localcopy=\"" + refr.LocalCopy.ToString() +  "\" refto=\"" + refr.Name + "\" />";
+            }
+            else
+            {
+                ProjectNode project = (ProjectNode)refr.Parent;
+                string fileRef = FindFileReference(refr.Name, project);
+
+                if(refr.Path != null || fileRef != null)
+                {
+                    ret += "Assembly\" refto=\"";
+
+                    string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
+
+                    ret += finalPath;
+                    ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+                    return ret;
+                }
+
+                ret += "Gac\"";
+                ret += " localcopy=\"" + refr.LocalCopy.ToString() + "\"";
+                ret += " refto=\"";
+                try
+                {
+                    /*
+                    Day changed to 28 Mar 2007
+                    ...
+                    08:09 < cj> is there anything that replaces Assembly.LoadFromPartialName() ?
+                    08:09 < jonp> no
+                    08:10 < jonp> in their infinite wisdom [sic], microsoft decided that the
+                                  ability to load any assembly version by-name was an inherently
+                                  bad idea
+                    08:11 < cj> I'm thinking of a bunch of four-letter words right now...
+                    08:11 < cj> security through making it difficult for the developer!!!
+                    08:12 < jonp> just use the Obsolete API
+                    08:12 < jonp> it should still work
+                    08:12 < cj> alrighty.
+                    08:12 < jonp> you just get warnings when using it
+                    */
+                    Assembly assem = Assembly.LoadWithPartialName(refr.Name);
+                    ret += assem.FullName;
                     //ret += refr.Name;
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += refr.Name;
-                                }
-                                ret += "\" />";
-                        }
-
-                        return ret;
-                }
-
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-
-                        return null;
-                }
-
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        {
-                                return "False";
-                        }
-                        return "True";
-                }
-
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string csComp = "Mcs";
-                        string netRuntime = "Mono";
-                        if(project.Runtime == ClrRuntime.Microsoft)
-                        {
-                                csComp = "Csc";
-                                netRuntime = "MsNet";
-                        }
-
-                        string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
-                        StreamWriter ss = new StreamWriter(projFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-
-                        using(ss)
-                        {
-                                ss.WriteLine(
-                                        "<Project name=\"{0}\" description=\"\" standardNamespace=\"{1}\" newfilesearch=\"None\" enableviewstate=\"True\" fileversion=\"2.0\" language=\"C#\" clr-version=\"Net_2_0\" ctype=\"DotNetProject\">",
-                                        project.Name,
-                                        project.RootNamespace
-                                        );
-                                
-                                                                int count = 0;
-                                
-                                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
-
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"DotNetProjectConfiguration\">", conf.Name);
-                                        ss.Write("      <Output");
-                                        ss.Write(" directory=\"{0}\"", Helper.EndPath(Helper.NormalizePath(".\\" + conf.Options["OutputPath"].ToString())));
-                                        ss.Write(" assembly=\"{0}\"", project.AssemblyName);
-                                        ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
-                                        //ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        //ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <Build");
-                                        ss.Write(" debugmode=\"True\"");
-                                        if (project.Type == ProjectType.WinExe)
-                                        {
-                                                ss.Write(" target=\"{0}\"", ProjectType.Exe.ToString());
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" target=\"{0}\"", project.Type);
-                                        }
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <Execution");
-                                        ss.Write(" runwithwarnings=\"{0}\"", !conf.Options.WarningsAsErrors);
-                                        ss.Write(" consolepause=\"True\"");
-                                        ss.Write(" runtime=\"{0}\"", netRuntime);
+                }
+                catch (System.NullReferenceException e)
+                {
+                    e.ToString();
+                    ret += refr.Name;
+                }
+                ret += "\" />";
+            }
+
+            return ret;
+        }
+
+        private static string FindFileReference(string refName, ProjectNode project)
+        {
+            foreach(ReferencePathNode refPath in project.ReferencePaths)
+            {
+                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+                if(File.Exists(fullPath))
+                {
+                    return fullPath;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the XML doc file.
+        /// </summary>
+        /// <param name="project">The project.</param>
+        /// <param name="conf">The conf.</param>
+        /// <returns></returns>
+        public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf)
+        {
+            if( conf == null )
+            {
+                throw new ArgumentNullException("conf");
+            }
+            if( project == null )
+            {
+                throw new ArgumentNullException("project");
+            }
+            string docFile = (string)conf.Options["XmlDocFile"];
+            if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+            {
+                return "False";
+            }
+            return "True";
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
+            string csComp = "Mcs";
+            string netRuntime = "Mono";
+            if(project.Runtime == ClrRuntime.Microsoft)
+            {
+                csComp = "Csc";
+                netRuntime = "MsNet";
+            }
+
+            string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
+            StreamWriter ss = new StreamWriter(projFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+
+            using(ss)
+            {
+                ss.WriteLine(
+                    "<Project name=\"{0}\" description=\"\" standardNamespace=\"{1}\" newfilesearch=\"None\" enableviewstate=\"True\" fileversion=\"2.0\" language=\"C#\" clr-version=\"Net_2_0\" ctype=\"DotNetProject\">",
+                    project.Name,
+                    project.RootNamespace
+                    );
+
+                                int count = 0;
+
+                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
+
+                foreach(ConfigurationNode conf in project.Configurations)
+                {
+                    ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"DotNetProjectConfiguration\">", conf.Name);
+                    ss.Write("      <Output");
+                    ss.Write(" directory=\"{0}\"", Helper.EndPath(Helper.NormalizePath(".\\" + conf.Options["OutputPath"].ToString())));
+                    ss.Write(" assembly=\"{0}\"", project.AssemblyName);
+                    ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
+                    //ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+                    //ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+                    if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+                    {
+                        ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+                    }
+                    if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+                    {
+                        ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+                    }
+                    ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+                    ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+                    ss.WriteLine(" />");
+
+                    ss.Write("      <Build");
+                    ss.Write(" debugmode=\"True\"");
+                    if (project.Type == ProjectType.WinExe)
+                    {
+                        ss.Write(" target=\"{0}\"", ProjectType.Exe.ToString());
+                    }
+                    else
+                    {
+                        ss.Write(" target=\"{0}\"", project.Type);
+                    }
+                    ss.WriteLine(" />");
+
+                    ss.Write("      <Execution");
+                    ss.Write(" runwithwarnings=\"{0}\"", !conf.Options.WarningsAsErrors);
+                    ss.Write(" consolepause=\"True\"");
+                    ss.Write(" runtime=\"{0}\"", netRuntime);
                     ss.Write(" clr-version=\"Net_2_0\"");
-                                        ss.WriteLine(" />");
-                                        
-                                        ss.Write("      <CodeGeneration");
-                                        ss.Write(" compiler=\"{0}\"", csComp);
-                                        ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
-                                        ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
-                                        ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
-                                        ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
-                                        ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
-                                        ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
-                                        ss.Write(" mainclass=\"{0}\"", project.StartupObject);
-                                        ss.Write(" target=\"{0}\"", project.Type);
-                                        ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
-                                        ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
-                                        ss.Write(" win32Icon=\"{0}\"", project.AppIcon);
-                                        ss.Write(" ctype=\"CSharpCompilerParameters\"");
-                                        ss.WriteLine(" />");
-                                        ss.WriteLine("    </Configuration>");
-
-                                        count++;
-                                }                
-                                ss.WriteLine("  </Configurations>");
-
-                                ss.Write("  <DeploymentInformation");
-                                ss.Write(" target=\"\"");
-                                ss.Write(" script=\"\"");
-                                ss.Write(" strategy=\"File\"");
-                                ss.WriteLine(">");
-                                ss.WriteLine("    <excludeFiles />");
-                                ss.WriteLine("  </DeploymentInformation>");
-                                
-                                ss.WriteLine("  <Contents>");
-                                foreach(string file in project.Files)
-                                {
-                                        string buildAction;
-                                        string dependson = "";
-                                        string resource_id = "";
-                                        string copyToOutput = "";
-                                        
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.None:
-                                                        buildAction = "Nothing";
-                                                        break;
-
-                                                case BuildAction.Content:
-                                                        buildAction = "Exclude";
-                                                        break;
-
-                                                case BuildAction.EmbeddedResource:
-                                                        buildAction = "EmbedAsResource";
-                                                        break;
-
-                                                default:
-                                                        buildAction = "Compile";
-                                                        break;
-                                        }
+                    ss.WriteLine(" />");
+
+                    ss.Write("      <CodeGeneration");
+                    ss.Write(" compiler=\"{0}\"", csComp);
+                    ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
+                    ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
+                    ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
+                    ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
+                    ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
+                    ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
+                    ss.Write(" mainclass=\"{0}\"", project.StartupObject);
+                    ss.Write(" target=\"{0}\"", project.Type);
+                    ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
+                    ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
+                    ss.Write(" win32Icon=\"{0}\"", project.AppIcon);
+                    ss.Write(" ctype=\"CSharpCompilerParameters\"");
+                    ss.WriteLine(" />");
+                    ss.WriteLine("    </Configuration>");
+
+                    count++;
+                }
+                ss.WriteLine("  </Configurations>");
+
+                ss.Write("  <DeploymentInformation");
+                ss.Write(" target=\"\"");
+                ss.Write(" script=\"\"");
+                ss.Write(" strategy=\"File\"");
+                ss.WriteLine(">");
+                ss.WriteLine("    <excludeFiles />");
+                ss.WriteLine("  </DeploymentInformation>");
+
+                ss.WriteLine("  <Contents>");
+                foreach(string file in project.Files)
+                {
+                     string buildAction;
+                    string dependson = "";
+                    string resource_id = "";
+                    string copyToOutput = "";
+
+                    switch(project.Files.GetBuildAction(file))
+                    {
+                        case BuildAction.None:
+                            buildAction = "Nothing";
+                            break;
+
+                        case BuildAction.Content:
+                            buildAction = "Exclude";
+                            break;
+
+                        case BuildAction.EmbeddedResource:
+                            buildAction = "EmbedAsResource";
+                            break;
+
+                        default:
+                            buildAction = "Compile";
+                            break;
+                    }
 
                     if (project.Files.GetCopyToOutput(file) != CopyToOutput.Never)
-                                                    buildAction = "FileCopy";
-
-                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string extension = Path.GetExtension(file);
-                                        string designer_format = string.Format(".Designer{0}", extension);
-
-                                        if (file.EndsWith(designer_format))
-                                        {
-                                                string basename = file.Substring(0, file.LastIndexOf(designer_format));
-                                                string[] extensions = new string[] { ".cs", ".resx", ".settings" };
-
-                                                foreach(string ext in extensions)
-                                                {
-                                                        if (project.Files.Contains(basename + ext))
-                                                        {
-                                                                dependson = string.Format(" dependson=\"{0}{1}\"", basename, ext);
-                                                                break;
-                                                        }
-                                                }
-                                        }
-                                        if (extension == ".resx")
-                                        {
-                                                buildAction = "EmbedAsResource";
-                                                string basename = file.Substring(0, file.LastIndexOf(".resx"));                                         
-                                                
-                                                // Visual Studio type resx + form dependency
-                                                if (project.Files.Contains(basename + ".cs"))
-                                                {
-                                                        dependson = string.Format(" dependson=\"{0}{1}\"", basename, ".cs");
-                                                }
-
-                                                // We need to specify a resources file name to avoid MissingManifestResourceExceptions
-                                                // in libraries that are built.
-                                                resource_id = string.Format(" resource_id=\"{0}.{1}.resources\"",
-                                                                project.AssemblyName, basename.Replace("/", "."));
-                                        }
-
-                                        switch(project.Files.GetCopyToOutput(file))
-                                        {
-                                                case CopyToOutput.Always:
-                                                        copyToOutput = string.Format(" copyToOutputDirectory=\"Always\"");
-                                                        break;
-                                                case CopyToOutput.PreserveNewest:
-                                                        copyToOutput = string.Format(" copyToOutputDirectory=\"PreserveNewest\"");
-                                                        break;
-                                        }
-                                        
-                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string filePath = PrependPath(file);
-                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\"{2}{3}{4} />", 
-                                                     filePath, buildAction, dependson, resource_id, copyToOutput);
-                                }
-                                ss.WriteLine("  </Contents>");
-
-                                ss.WriteLine("  <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ss.WriteLine("    {0}", BuildReference(solution, refr));
-                                }
-                                ss.WriteLine("  </References>");
-
-
-                                ss.WriteLine("</Project>");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating MonoDevelop combine and project files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
-                        StreamWriter ss = new StreamWriter(combFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
+                            buildAction = "FileCopy";
+
+                    // Sort of a hack, we try and resolve the path and make it relative, if we can.
+                    string extension = Path.GetExtension(file);
+                    string designer_format = string.Format(".Designer{0}", extension);
+
+                    if (file.EndsWith(designer_format))
+                    {
+                        string basename = file.Substring(0, file.LastIndexOf(designer_format));
+                        string[] extensions = new string[] { ".cs", ".resx", ".settings" };
+
+                        foreach(string ext in extensions)
+                        {
+                            if (project.Files.Contains(basename + ext))
+                            {
+                                dependson = string.Format(" dependson=\"{0}{1}\"", basename, ext);
+                                break;
+                            }
+                        }
+                    }
+                    if (extension == ".resx")
+                    {
+                        buildAction = "EmbedAsResource";
+                        string basename = file.Substring(0, file.LastIndexOf(".resx"));
+
+                        // Visual Studio type resx + form dependency
+                        if (project.Files.Contains(basename + ".cs"))
+                        {
+                            dependson = string.Format(" dependson=\"{0}{1}\"", basename, ".cs");
+                        }
+
+                        // We need to specify a resources file name to avoid MissingManifestResourceExceptions
+                        // in libraries that are built.
+                        resource_id = string.Format(" resource_id=\"{0}.{1}.resources\"",
+                                project.AssemblyName, basename.Replace("/", "."));
+                    }
+
+                    switch(project.Files.GetCopyToOutput(file))
+                    {
+                        case CopyToOutput.Always:
+                            copyToOutput = string.Format(" copyToOutputDirectory=\"Always\"");
+                            break;
+                        case CopyToOutput.PreserveNewest:
+                            copyToOutput = string.Format(" copyToOutputDirectory=\"PreserveNewest\"");
+                            break;
+                    }
+
+                     // Sort of a hack, we try and resolve the path and make it relative, if we can.
+                     string filePath = PrependPath(file);
+                    ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\"{2}{3}{4} />",
+                                 filePath, buildAction, dependson, resource_id, copyToOutput);
+                }
+                ss.WriteLine("  </Contents>");
+
+                ss.WriteLine("  <References>");
+                foreach(ReferenceNode refr in project.References)
+                {
+                    ss.WriteLine("    {0}", BuildReference(solution, refr));
+                }
+                ss.WriteLine("  </References>");
+
+
+                ss.WriteLine("</Project>");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void WriteCombine(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Creating MonoDevelop combine and project files");
+            foreach(ProjectNode project in solution.Projects)
+            {
+                if(m_Kernel.AllowProject(project.FilterGroups))
+                {
+                    m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+                    WriteProject(solution, project);
+                }
+            }
+
+            m_Kernel.Log.Write("");
+            string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
+            StreamWriter ss = new StreamWriter(combFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+
             int count = 0;
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("<Combine name=\"{0}\" fileversion=\"2.0\" description=\"\">", solution.Name);
-
-                                count = 0;
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        if(count == 0)
-                                        {
-                                                ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
-                                        }
-
-                                        ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"CombineConfiguration\">", conf.Name);
-                                        foreach(ProjectNode project in solution.Projects)
-                                        {
-                                                ss.WriteLine("      <Entry configuration=\"{1}\" build=\"True\" name=\"{0}\" />", project.Name, conf.Name);
-                                        }
-                                        ss.WriteLine("    </Configuration>");
-
-                                        count++;
-                                }
-                                ss.WriteLine("  </Configurations>");
-                                
-                                count = 0;
-                                
-                                foreach(ProjectNode project in solution.Projects)
-                                {                    
-                                        if(count == 0)
-                                                ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
-
-                                        ss.WriteLine("    <Execute type=\"None\" entry=\"{0}\" />", project.Name);
-                                        count++;
-                                }
-                                ss.WriteLine("  </StartMode>");
-                                
-                                ss.WriteLine("  <Entries>");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("    <Entry filename=\"{0}\" />",
-                                                Helper.MakeFilePath(path, project.Name, "mdp"));
-                                }
-                                ss.WriteLine("  </Entries>");
-                                
-                                ss.WriteLine("</Combine>");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
-                        Helper.DeleteIfExists(projectFile);
-                }
-
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning MonoDevelop combine and project files for", solution.Name);
-
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
-                        Helper.DeleteIfExists(slnFile);
-
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-
-                #endregion
-
-                #region ITarget Members
-
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "sharpdev";
-                        }
-                }
-
-                #endregion
-        }
+
+            using(ss)
+            {
+                ss.WriteLine("<Combine name=\"{0}\" fileversion=\"2.0\" description=\"\">", solution.Name);
+
+                count = 0;
+                foreach(ConfigurationNode conf in solution.Configurations)
+                {
+                    if(count == 0)
+                    {
+                        ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
+                    }
+
+                    ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"CombineConfiguration\">", conf.Name);
+                    foreach(ProjectNode project in solution.Projects)
+                    {
+                        ss.WriteLine("      <Entry configuration=\"{1}\" build=\"True\" name=\"{0}\" />", project.Name, conf.Name);
+                    }
+                    ss.WriteLine("    </Configuration>");
+
+                    count++;
+                }
+                ss.WriteLine("  </Configurations>");
+
+                count = 0;
+
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    if(count == 0)
+                        ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
+
+                    ss.WriteLine("    <Execute type=\"None\" entry=\"{0}\" />", project.Name);
+                    count++;
+                }
+                ss.WriteLine("  </StartMode>");
+
+                ss.WriteLine("  <Entries>");
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+                    ss.WriteLine("    <Entry filename=\"{0}\" />",
+                        Helper.MakeFilePath(path, project.Name, "mdp"));
+                }
+                ss.WriteLine("  </Entries>");
+
+                ss.WriteLine("</Combine>");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void CleanProject(ProjectNode project)
+        {
+            m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
+            Helper.DeleteIfExists(projectFile);
+        }
+
+        private void CleanSolution(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Cleaning MonoDevelop combine and project files for", solution.Name);
+
+            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
+            Helper.DeleteIfExists(slnFile);
+
+            foreach(ProjectNode project in solution.Projects)
+            {
+                CleanProject(project);
+            }
+
+            m_Kernel.Log.Write("");
+        }
+
+        #endregion
+
+        #region ITarget Members
+
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public void Write(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode solution in kern.Solutions)
+            {
+                WriteCombine(solution);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Clean(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode sol in kern.Solutions)
+            {
+                CleanSolution(sol);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return "sharpdev";
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 9a86767..21bc80e 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -47,36 +47,36 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("nant")]
-        public class NAntTarget : ITarget
-        {
-                #region Fields
-
-                private Kernel m_Kernel;
-
-                #endregion
-
-                #region Private Methods
-
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        //if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        //{
-                        tmpPath = Helper.NormalizePath(tmpPath);
-                        //}
-                        //                      else
-                        //                      {
-                        //                              tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        //                      }
-
-                        return tmpPath;
-                }
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("nant")]
+    public class NAntTarget : ITarget
+    {
+        #region Fields
+
+        private Kernel m_Kernel;
+
+        #endregion
+
+        #region Private Methods
+
+        private static string PrependPath(string path)
+        {
+            string tmpPath = Helper.NormalizePath(path, '/');
+            Regex regex = new Regex(@"(\w):/(\w+)");
+            Match match = regex.Match(tmpPath);
+            //if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+            //{
+            tmpPath = Helper.NormalizePath(tmpPath);
+            //}
+            //                  else
+            //                  {
+            //                          tmpPath = Helper.NormalizePath("./" + tmpPath);
+            //                  }
+
+            return tmpPath;
+        }
 
         private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
         {
@@ -85,7 +85,7 @@ namespace Prebuild.Core.Targets
             {
                 return refr.Path;
             }
-            
+
             if (solution.ProjectsTable.ContainsKey(refr.Name))
             {
                 ProjectNode projectRef = (ProjectNode) solution.ProjectsTable[refr.Name];
@@ -113,7 +113,7 @@ namespace Prebuild.Core.Targets
             return refr.Name + ".dll";
         }
 
-            public static string GetRefFileName(string refName)
+        public static string GetRefFileName(string refName)
         {
             if (ExtensionSpecified(refName))
             {
@@ -140,11 +140,11 @@ namespace Prebuild.Core.Targets
             return extension;
         }
 
-                private static string FindFileReference(string refName, ProjectNode project)
-                {
-                        foreach (ReferencePathNode refPath in project.ReferencePaths)
-                        {
-                            string fullPath = Helper.MakeFilePath(refPath.Path, refName);
+        private static string FindFileReference(string refName, ProjectNode project)
+        {
+            foreach (ReferencePathNode refPath in project.ReferencePaths)
+            {
+                string fullPath = Helper.MakeFilePath(refPath.Path, refName);
 
                 if (File.Exists(fullPath))
                 {
@@ -153,10 +153,10 @@ namespace Prebuild.Core.Targets
 
                 fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
 
-                                if (File.Exists(fullPath))
-                                {
-                                        return fullPath;
-                                }
+                if (File.Exists(fullPath))
+                {
+                    return fullPath;
+                }
 
                 fullPath = Helper.MakeFilePath(refPath.Path, refName, "exe");
 
@@ -164,162 +164,162 @@ namespace Prebuild.Core.Targets
                 {
                     return fullPath;
                 }
-                        }
-
-                        return null;
-                }
-
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf)
-                {
-                        if (conf == null)
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if (project == null)
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        //                      if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        //                      {
-                        //                              return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
-                        //                      }
-                        return docFile;
-                }
-
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the XML doc file.
+        /// </summary>
+        /// <param name="project">The project.</param>
+        /// <param name="conf">The conf.</param>
+        /// <returns></returns>
+        public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf)
+        {
+            if (conf == null)
+            {
+                throw new ArgumentNullException("conf");
+            }
+            if (project == null)
+            {
+                throw new ArgumentNullException("project");
+            }
+            string docFile = (string)conf.Options["XmlDocFile"];
+            //                  if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+            //                  {
+            //                          return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
+            //                  }
+            return docFile;
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
             string projFile = Helper.MakeFilePath(project.FullPath, project.Name + GetProjectExtension(project), "build");
-                        StreamWriter ss = new StreamWriter(projFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-                        bool hasDoc = false;
-
-                        using (ss)
-                        {
-                                ss.WriteLine("<?xml version=\"1.0\" ?>");
-                                ss.WriteLine("<project name=\"{0}\" default=\"build\">", project.Name);
-                                ss.WriteLine("    <target name=\"{0}\">", "build");
-                                ss.WriteLine("            <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />");
-                                ss.WriteLine("            <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />");
-
-                                ss.Write("                <csc ");
-                                ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower());
-                                ss.Write(" debug=\"{0}\"", "${build.debug}");
-                                ss.Write(" platform=\"${build.platform}\"");
-
-
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.KeyFile != "")
-                                        {
-                                                ss.Write(" keyfile=\"{0}\"", conf.Options.KeyFile);
-                                                break;
-                                        }
-                                }
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" unsafe=\"{0}\"", conf.Options.AllowUnsafe);
-                                        break;
-                                }
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" warnaserror=\"{0}\"", conf.Options.WarningsAsErrors);
-                                        break;
-                                }
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" define=\"{0}\"", conf.Options.CompilerDefines);
-                                        break;
-                                }
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
-                                        break;
-                                }
-
-                                ss.Write(" main=\"{0}\"", project.StartupObject);
-
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (GetXmlDocFile(project, conf) != "")
-                                        {
-                                                ss.Write(" doc=\"{0}\"", "${project::get-base-directory()}/${build.dir}/" + GetXmlDocFile(project, conf));
-                                                hasDoc = true;
-                                        }
-                                        break;
-                                }
-                                ss.Write(" output=\"{0}", "${project::get-base-directory()}/${build.dir}/${project::get-name()}");
-                                if (project.Type == ProjectType.Library)
-                                {
-                                        ss.Write(".dll\"");
-                                }
-                                else
-                                {
-                                        ss.Write(".exe\"");
-                                }
-                                if (project.AppIcon != null && project.AppIcon.Length != 0)
-                                {
-                                        ss.Write(" win32icon=\"{0}\"", Helper.NormalizePath(project.AppIcon, '/'));
-                                }
+            StreamWriter ss = new StreamWriter(projFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+            bool hasDoc = false;
+
+            using (ss)
+            {
+                ss.WriteLine("<?xml version=\"1.0\" ?>");
+                ss.WriteLine("<project name=\"{0}\" default=\"build\">", project.Name);
+                ss.WriteLine("    <target name=\"{0}\">", "build");
+                ss.WriteLine("            <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />");
+                ss.WriteLine("            <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />");
+
+                ss.Write("                <csc ");
+                ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower());
+                ss.Write(" debug=\"{0}\"", "${build.debug}");
+                ss.Write(" platform=\"${build.platform}\"");
+
+
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    if (conf.Options.KeyFile != "")
+                    {
+                        ss.Write(" keyfile=\"{0}\"", conf.Options.KeyFile);
+                        break;
+                    }
+                }
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ss.Write(" unsafe=\"{0}\"", conf.Options.AllowUnsafe);
+                    break;
+                }
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ss.Write(" warnaserror=\"{0}\"", conf.Options.WarningsAsErrors);
+                    break;
+                }
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ss.Write(" define=\"{0}\"", conf.Options.CompilerDefines);
+                    break;
+                }
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
+                    break;
+                }
+
+                ss.Write(" main=\"{0}\"", project.StartupObject);
+
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    if (GetXmlDocFile(project, conf) != "")
+                    {
+                        ss.Write(" doc=\"{0}\"", "${project::get-base-directory()}/${build.dir}/" + GetXmlDocFile(project, conf));
+                        hasDoc = true;
+                    }
+                    break;
+                }
+                ss.Write(" output=\"{0}", "${project::get-base-directory()}/${build.dir}/${project::get-name()}");
+                if (project.Type == ProjectType.Library)
+                {
+                    ss.Write(".dll\"");
+                }
+                else
+                {
+                    ss.Write(".exe\"");
+                }
+                if (project.AppIcon != null && project.AppIcon.Length != 0)
+                {
+                    ss.Write(" win32icon=\"{0}\"", Helper.NormalizePath(project.AppIcon, '/'));
+                }
                 // This disables a very different behavior between VS and NAnt.  With Nant,
                 //    If you have using System.Xml;  it will ensure System.Xml.dll is referenced,
                 //    but not in VS.  This will force the behaviors to match, so when it works
                 //    in nant, it will work in VS.
                 ss.Write(" noconfig=\"true\"");
                 ss.WriteLine(">");
-                                ss.WriteLine("                    <resources prefix=\"{0}\" dynamicprefix=\"true\" >", project.RootNamespace);
-                                foreach (string file in project.Files)
-                                {
-                                        switch (project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.EmbeddedResource:
-                                                        ss.WriteLine("                            {0}", "<include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
-                                                        break;
-                                                default:
-                                                        if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                                                        {
-                                                                ss.WriteLine("                            <include name=\"{0}\" />", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                                                        }
-                                                        break;
-                                        }
-                                }
-                                //if (project.Files.GetSubType(file).ToString() != "Code")
-                                //{
-                                //      ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");                                     
-
-                                ss.WriteLine("                    </resources>");
-                                ss.WriteLine("                    <sources failonempty=\"true\">");
-                                foreach (string file in project.Files)
-                                {
-                                        switch (project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.Compile:
-                                                        ss.WriteLine("                            <include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
-                                                        break;
-                                                default:
-                                                        break;
-                                        }
-                                }
-                                ss.WriteLine("                    </sources>");
-                                ss.WriteLine("                    <references basedir=\"${project::get-base-directory()}\">");
-                                ss.WriteLine("                            <lib>");
-                                ss.WriteLine("                                    <include name=\"${project::get-base-directory()}\" />");
+                ss.WriteLine("                    <resources prefix=\"{0}\" dynamicprefix=\"true\" >", project.RootNamespace);
+                foreach (string file in project.Files)
+                {
+                    switch (project.Files.GetBuildAction(file))
+                    {
+                        case BuildAction.EmbeddedResource:
+                            ss.WriteLine("                                {0}", "<include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
+                            break;
+                        default:
+                            if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+                            {
+                                ss.WriteLine("                            <include name=\"{0}\" />", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+                            }
+                            break;
+                    }
+                }
+                //if (project.Files.GetSubType(file).ToString() != "Code")
+                //{
+                //      ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+
+                ss.WriteLine("                    </resources>");
+                ss.WriteLine("                    <sources failonempty=\"true\">");
+                foreach (string file in project.Files)
+                {
+                    switch (project.Files.GetBuildAction(file))
+                    {
+                        case BuildAction.Compile:
+                            ss.WriteLine("                                <include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                ss.WriteLine("                    </sources>");
+                ss.WriteLine("                    <references basedir=\"${project::get-base-directory()}\">");
+                ss.WriteLine("                            <lib>");
+                ss.WriteLine("                                    <include name=\"${project::get-base-directory()}\" />");
                 foreach(ReferencePathNode refPath in project.ReferencePaths)
                 {
                     ss.WriteLine("                                        <include name=\"${project::get-base-directory()}/" + refPath.Path.TrimEnd('/', '\\') + "\" />");
                 }
-                                ss.WriteLine("                            </lib>");
-                                foreach (ReferenceNode refr in project.References)
-                                {
-                                        string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
+                ss.WriteLine("                            </lib>");
+                foreach (ReferenceNode refr in project.References)
+                {
+                    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
                     if (refr.Path != null) {
                         if (ExtensionSpecified(refr.Name))
                         {
@@ -334,12 +334,12 @@ namespace Prebuild.Core.Targets
                     {
                         ss.WriteLine ("                <include name=\"" + path + "\" />");
                     }
-                                }
-                                ss.WriteLine("                    </references>");
+                }
+                ss.WriteLine("                    </references>");
 
-                                ss.WriteLine("            </csc>");
+                ss.WriteLine("            </csc>");
 
-                                foreach (ConfigurationNode conf in project.Configurations)
+                foreach (ConfigurationNode conf in project.Configurations)
                 {
                     if (!String.IsNullOrEmpty(conf.Options.OutputPath))
                     {
@@ -361,170 +361,170 @@ namespace Prebuild.Core.Targets
                     }
                 }
 
-                                ss.WriteLine("    </target>");
-
-                                ss.WriteLine("    <target name=\"clean\">");
-                                ss.WriteLine("            <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("            <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
-                                ss.WriteLine("    </target>");
-
-                                ss.WriteLine("    <target name=\"doc\" description=\"Creates documentation.\">");
-                                if (hasDoc)
-                                {
-                                        ss.WriteLine("            <property name=\"doc.target\" value=\"\" />");
-                                        ss.WriteLine("            <if test=\"${platform::is-unix()}\">");
-                                        ss.WriteLine("                    <property name=\"doc.target\" value=\"Web\" />");
-                                        ss.WriteLine("            </if>");
-                                        ss.WriteLine("            <ndoc failonerror=\"false\" verbose=\"true\">");
-                                        ss.WriteLine("                    <assemblies basedir=\"${project::get-base-directory()}\">");
-                                        ss.Write("                                <include name=\"${build.dir}/${project::get-name()}");
-                                        if (project.Type == ProjectType.Library)
-                                        {
-                                                ss.WriteLine(".dll\" />");
-                                        }
-                                        else
-                                        {
-                                                ss.WriteLine(".exe\" />");
-                                        }
-
-                                        ss.WriteLine("                    </assemblies>");
-                                        ss.WriteLine("                    <summaries basedir=\"${project::get-base-directory()}\">");
-                                        ss.WriteLine("                            <include name=\"${build.dir}/${project::get-name()}.xml\"/>");
-                                        ss.WriteLine("                    </summaries>");
-                                        ss.WriteLine("                    <referencepaths basedir=\"${project::get-base-directory()}\">");
-                                        ss.WriteLine("                            <include name=\"${build.dir}\" />");
-                                        //                                      foreach(ReferenceNode refr in project.References)
-                                        //                                      {
-                                        //                                              string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReferencePath(solution, refr)), '/');
-                                        //                                              if (path != "")
-                                        //                                              {
-                                        //                                                      ss.WriteLine("                            <include name=\"{0}\" />", path);
-                                        //                                              }
-                                        //                                      }
-                                        ss.WriteLine("                    </referencepaths>");
-                                        ss.WriteLine("                    <documenters>");
-                                        ss.WriteLine("                            <documenter name=\"MSDN\">");
-                                        ss.WriteLine("                                    <property name=\"OutputDirectory\" value=\"${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}\" />");
-                                        ss.WriteLine("                                    <property name=\"OutputTarget\" value=\"${doc.target}\" />");
-                                        ss.WriteLine("                                    <property name=\"HtmlHelpName\" value=\"${project::get-name()}\" />");
-                                        ss.WriteLine("                                    <property name=\"IncludeFavorites\" value=\"False\" />");
-                                        ss.WriteLine("                                    <property name=\"Title\" value=\"${project::get-name()} SDK Documentation\" />");
-                                        ss.WriteLine("                                    <property name=\"SplitTOCs\" value=\"False\" />");
-                                        ss.WriteLine("                                    <property name=\"DefaulTOC\" value=\"\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowVisualBasic\" value=\"True\" />");
-                                        ss.WriteLine("                                    <property name=\"AutoDocumentConstructors\" value=\"True\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowMissingSummaries\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowMissingRemarks\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowMissingParams\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowMissingReturns\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"ShowMissingValues\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"DocumentInternals\" value=\"False\" />");
-                                        ss.WriteLine("                                    <property name=\"DocumentPrivates\" value=\"False\" />");
-                                        ss.WriteLine("                                    <property name=\"DocumentProtected\" value=\"True\" />");
-                                        ss.WriteLine("                                    <property name=\"DocumentEmptyNamespaces\" value=\"${build.debug}\" />");
-                                        ss.WriteLine("                                    <property name=\"IncludeAssemblyVersion\" value=\"True\" />");
-                                        ss.WriteLine("                            </documenter>");
-                                        ss.WriteLine("                    </documenters>");
-                                        ss.WriteLine("            </ndoc>");
-                                }
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine("</project>");
-                        }
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating NAnt build files");
-                        foreach (ProjectNode project in solution.Projects)
-                        {
-                                if (m_Kernel.AllowProject(project.FilterGroups))
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
-                        StreamWriter ss = new StreamWriter(combFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-
-                        using (ss)
-                        {
-                                ss.WriteLine("<?xml version=\"1.0\" ?>");
-                                ss.WriteLine("<project name=\"{0}\" default=\"build\">", solution.Name);
-                                ss.WriteLine("    <echo message=\"Using '${nant.settings.currentframework}' Framework\"/>");
-                                ss.WriteLine();
-
-                                //ss.WriteLine("        <property name=\"dist.dir\" value=\"dist\" />");
-                                //ss.WriteLine("        <property name=\"source.dir\" value=\"source\" />");
-                                ss.WriteLine("    <property name=\"bin.dir\" value=\"bin\" />");
-                                ss.WriteLine("    <property name=\"obj.dir\" value=\"obj\" />");
-                                ss.WriteLine("    <property name=\"doc.dir\" value=\"doc\" />");
-                                ss.WriteLine("    <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
-
-                                // Use the active configuration, which is the first configuration name in the prebuild file.
-                                Dictionary<string,string> emittedConfigurations = new Dictionary<string, string>();
-
-                                ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", solution.ActiveConfig);
-                                ss.WriteLine();
-
-                                foreach (ConfigurationNode conf in solution.Configurations)
-                                {
-                                        // If the name isn't in the emitted configurations, we give a high level target to the 
-                                        // platform specific on. This lets "Debug" point to "Debug-AnyCPU".
-                                        if (!emittedConfigurations.ContainsKey(conf.Name))
-                                        {
-                                                // Add it to the dictionary so we only emit one.
-                                                emittedConfigurations.Add(conf.Name, conf.Platform);
-
-                                                // Write out the target block.
-                                                ss.WriteLine("    <target name=\"{0}\" description=\"{0}|{1}\" depends=\"{0}-{1}\">", conf.Name, conf.Platform);
-                                                ss.WriteLine("    </target>");
-                                                ss.WriteLine();
-                                        }
-
-                                        // Write out the target for the configuration.
-                                        ss.WriteLine("    <target name=\"{0}-{1}\" description=\"{0}|{1}\">", conf.Name, conf.Platform);
-                                        ss.WriteLine("            <property name=\"project.config\" value=\"{0}\" />", conf.Name);
-                                        ss.WriteLine("            <property name=\"build.debug\" value=\"{0}\" />", conf.Options["DebugInformation"].ToString().ToLower());
-                                        ss.WriteLine("\t\t  <property name=\"build.platform\" value=\"{0}\" />", conf.Platform);
-                                        ss.WriteLine("    </target>");
-                                        ss.WriteLine();
-                                }
-
-                                ss.WriteLine("    <target name=\"net-1.1\" description=\"Sets framework to .NET 1.1\">");
-                                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-1.1\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-
-                                ss.WriteLine("    <target name=\"net-2.0\" description=\"Sets framework to .NET 2.0\">");
-                                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-2.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-
-                                ss.WriteLine("    <target name=\"net-3.5\" description=\"Sets framework to .NET 3.5\">");
-                                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-3.5\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-
-                                ss.WriteLine("    <target name=\"mono-1.0\" description=\"Sets framework to mono 1.0\">");
-                                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"mono-1.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-
-                                ss.WriteLine("    <target name=\"mono-2.0\" description=\"Sets framework to mono 2.0\">");
-                                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"mono-2.0\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
-
-                                ss.WriteLine("    <target name=\"mono-3.5\" description=\"Sets framework to mono 3.5\">");
-                                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-3.5\" />");
-                                ss.WriteLine("    </target>");
-                                ss.WriteLine();
+                ss.WriteLine("    </target>");
+
+                ss.WriteLine("    <target name=\"clean\">");
+                ss.WriteLine("            <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
+                ss.WriteLine("            <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
+                ss.WriteLine("    </target>");
+
+                ss.WriteLine("    <target name=\"doc\" description=\"Creates documentation.\">");
+                if (hasDoc)
+                {
+                    ss.WriteLine("                <property name=\"doc.target\" value=\"\" />");
+                    ss.WriteLine("                <if test=\"${platform::is-unix()}\">");
+                    ss.WriteLine("                        <property name=\"doc.target\" value=\"Web\" />");
+                    ss.WriteLine("                </if>");
+                    ss.WriteLine("                <ndoc failonerror=\"false\" verbose=\"true\">");
+                    ss.WriteLine("                        <assemblies basedir=\"${project::get-base-directory()}\">");
+                    ss.Write("                            <include name=\"${build.dir}/${project::get-name()}");
+                    if (project.Type == ProjectType.Library)
+                    {
+                        ss.WriteLine(".dll\" />");
+                    }
+                    else
+                    {
+                        ss.WriteLine(".exe\" />");
+                    }
+
+                    ss.WriteLine("                        </assemblies>");
+                    ss.WriteLine("                        <summaries basedir=\"${project::get-base-directory()}\">");
+                    ss.WriteLine("                                <include name=\"${build.dir}/${project::get-name()}.xml\"/>");
+                    ss.WriteLine("                        </summaries>");
+                    ss.WriteLine("                        <referencepaths basedir=\"${project::get-base-directory()}\">");
+                    ss.WriteLine("                                <include name=\"${build.dir}\" />");
+                    //                                  foreach(ReferenceNode refr in project.References)
+                    //                                  {
+                    //                                          string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReferencePath(solution, refr)), '/');
+                    //                                          if (path != "")
+                    //                                          {
+                    //                                                  ss.WriteLine("                            <include name=\"{0}\" />", path);
+                    //                                          }
+                    //                                  }
+                    ss.WriteLine("                        </referencepaths>");
+                    ss.WriteLine("                        <documenters>");
+                    ss.WriteLine("                                <documenter name=\"MSDN\">");
+                    ss.WriteLine("                                        <property name=\"OutputDirectory\" value=\"${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}\" />");
+                    ss.WriteLine("                                        <property name=\"OutputTarget\" value=\"${doc.target}\" />");
+                    ss.WriteLine("                                        <property name=\"HtmlHelpName\" value=\"${project::get-name()}\" />");
+                    ss.WriteLine("                                        <property name=\"IncludeFavorites\" value=\"False\" />");
+                    ss.WriteLine("                                        <property name=\"Title\" value=\"${project::get-name()} SDK Documentation\" />");
+                    ss.WriteLine("                                        <property name=\"SplitTOCs\" value=\"False\" />");
+                    ss.WriteLine("                                        <property name=\"DefaulTOC\" value=\"\" />");
+                    ss.WriteLine("                                        <property name=\"ShowVisualBasic\" value=\"True\" />");
+                    ss.WriteLine("                                        <property name=\"AutoDocumentConstructors\" value=\"True\" />");
+                    ss.WriteLine("                                        <property name=\"ShowMissingSummaries\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"ShowMissingRemarks\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"ShowMissingParams\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"ShowMissingReturns\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"ShowMissingValues\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"DocumentInternals\" value=\"False\" />");
+                    ss.WriteLine("                                        <property name=\"DocumentPrivates\" value=\"False\" />");
+                    ss.WriteLine("                                        <property name=\"DocumentProtected\" value=\"True\" />");
+                    ss.WriteLine("                                        <property name=\"DocumentEmptyNamespaces\" value=\"${build.debug}\" />");
+                    ss.WriteLine("                                        <property name=\"IncludeAssemblyVersion\" value=\"True\" />");
+                    ss.WriteLine("                                </documenter>");
+                    ss.WriteLine("                        </documenters>");
+                    ss.WriteLine("                </ndoc>");
+                }
+                ss.WriteLine("    </target>");
+                ss.WriteLine("</project>");
+            }
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void WriteCombine(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Creating NAnt build files");
+            foreach (ProjectNode project in solution.Projects)
+            {
+                if (m_Kernel.AllowProject(project.FilterGroups))
+                {
+                    m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+                    WriteProject(solution, project);
+                }
+            }
+
+            m_Kernel.Log.Write("");
+            string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
+            StreamWriter ss = new StreamWriter(combFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+
+            using (ss)
+            {
+                ss.WriteLine("<?xml version=\"1.0\" ?>");
+                ss.WriteLine("<project name=\"{0}\" default=\"build\">", solution.Name);
+                ss.WriteLine("    <echo message=\"Using '${nant.settings.currentframework}' Framework\"/>");
+                ss.WriteLine();
+
+                //ss.WriteLine("        <property name=\"dist.dir\" value=\"dist\" />");
+                //ss.WriteLine("        <property name=\"source.dir\" value=\"source\" />");
+                ss.WriteLine("    <property name=\"bin.dir\" value=\"bin\" />");
+                ss.WriteLine("    <property name=\"obj.dir\" value=\"obj\" />");
+                ss.WriteLine("    <property name=\"doc.dir\" value=\"doc\" />");
+                ss.WriteLine("    <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
+
+                // Use the active configuration, which is the first configuration name in the prebuild file.
+                Dictionary<string,string> emittedConfigurations = new Dictionary<string, string>();
+
+                ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", solution.ActiveConfig);
+                ss.WriteLine();
+
+                foreach (ConfigurationNode conf in solution.Configurations)
+                {
+                    // If the name isn't in the emitted configurations, we give a high level target to the
+                    // platform specific on. This lets "Debug" point to "Debug-AnyCPU".
+                    if (!emittedConfigurations.ContainsKey(conf.Name))
+                    {
+                        // Add it to the dictionary so we only emit one.
+                        emittedConfigurations.Add(conf.Name, conf.Platform);
+
+                        // Write out the target block.
+                        ss.WriteLine("    <target name=\"{0}\" description=\"{0}|{1}\" depends=\"{0}-{1}\">", conf.Name, conf.Platform);
+                        ss.WriteLine("    </target>");
+                        ss.WriteLine();
+                    }
+
+                    // Write out the target for the configuration.
+                    ss.WriteLine("        <target name=\"{0}-{1}\" description=\"{0}|{1}\">", conf.Name, conf.Platform);
+                    ss.WriteLine("                <property name=\"project.config\" value=\"{0}\" />", conf.Name);
+                    ss.WriteLine("                <property name=\"build.debug\" value=\"{0}\" />", conf.Options["DebugInformation"].ToString().ToLower());
+                    ss.WriteLine("\t\t  <property name=\"build.platform\" value=\"{0}\" />", conf.Platform);
+                    ss.WriteLine("        </target>");
+                    ss.WriteLine();
+                }
+
+                ss.WriteLine("    <target name=\"net-1.1\" description=\"Sets framework to .NET 1.1\">");
+                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-1.1\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"net-2.0\" description=\"Sets framework to .NET 2.0\">");
+                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-2.0\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"net-3.5\" description=\"Sets framework to .NET 3.5\">");
+                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"net-3.5\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"mono-1.0\" description=\"Sets framework to mono 1.0\">");
+                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"mono-1.0\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"mono-2.0\" description=\"Sets framework to mono 2.0\">");
+                ss.WriteLine("            <property name=\"nant.settings.currentframework\" value=\"mono-2.0\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"mono-3.5\" description=\"Sets framework to mono 3.5\">");
+                ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-3.5\" />");
+                ss.WriteLine("    </target>");
+                ss.WriteLine();
 
                 ss.WriteLine("    <target name=\"init\" description=\"\">");
                 ss.WriteLine("        <call target=\"${project.config}\" />");
@@ -625,7 +625,7 @@ namespace Prebuild.Core.Targets
                     }
                 }
 
-                            ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
+                ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
                 foreach (ProjectNode project in solution.Projects)
                 {
                     string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
diff --git a/Prebuild/src/Core/Targets/SharpDevelop2Target.cs b/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
index 66dd1bc..40a210d 100644
--- a/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
+++ b/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -29,11 +29,11 @@ using Prebuild.Core.Attributes;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("sharpdev2")]
-        public class SharpDevelop2Target : VS2005Target
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("sharpdev2")]
+    public class SharpDevelop2Target : VS2005Target
     {
         #region Properties
         public override string VersionName
@@ -45,38 +45,38 @@ namespace Prebuild.Core.Targets
         }
         #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Write(Kernel kern)
-                {
-                        base.Write(kern);
-                }
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public override void Write(Kernel kern)
+        {
+            base.Write(kern);
+        }
 
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Clean(Kernel kern)
-                {
-                        base.Clean(kern);
-                }
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public override void Clean(Kernel kern)
+        {
+            base.Clean(kern);
+        }
 
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return "sharpdev2";
-                        }
-                }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public override string Name
+        {
+            get
+            {
+                return "sharpdev2";
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
index 8e32050..acab9f4 100644
--- a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
+++ b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (da
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,392 +34,392 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("sharpdev")]
-        public class SharpDevelopTarget : ITarget
-        {
-                #region Fields
-
-                private Kernel m_Kernel;
-
-                #endregion
-
-                #region Private Methods
-
-                private static string PrependPath(string path)
-                {
-                        string tmpPath = Helper.NormalizePath(path, '/');
-                        Regex regex = new Regex(@"(\w):/(\w+)");
-                        Match match = regex.Match(tmpPath);
-                        if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-                        {
-                                tmpPath = Helper.NormalizePath(tmpPath);
-                        }
-                        else
-                        {
-                                tmpPath = Helper.NormalizePath("./" + tmpPath);
-                        }
-
-                        return tmpPath;
-                }
-
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
-                {
-                        string ret = "<Reference type=\"";
-                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                        {
-                                ret += "Project\" refto=\"" + refr.Name;
-                                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                        }
-                        else
-                        {
-                                ProjectNode project = (ProjectNode)refr.Parent;
-                                string fileRef = FindFileReference(refr.Name, project);
-
-                                if(refr.Path != null || fileRef != null)
-                                {
-                                        ret += "Assembly\" refto=\"";
-
-                                        string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
-
-                                        ret += finalPath;
-                                        ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                                        return ret;
-                                }
-
-                                ret += "Gac\" refto=\"";
-                                try
-                                {
-                                        //Assembly assem = Assembly.Load(refr.Name);
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("sharpdev")]
+    public class SharpDevelopTarget : ITarget
+    {
+        #region Fields
+
+        private Kernel m_Kernel;
+
+        #endregion
+
+        #region Private Methods
+
+        private static string PrependPath(string path)
+        {
+            string tmpPath = Helper.NormalizePath(path, '/');
+            Regex regex = new Regex(@"(\w):/(\w+)");
+            Match match = regex.Match(tmpPath);
+            if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+            {
+                tmpPath = Helper.NormalizePath(tmpPath);
+            }
+            else
+            {
+                tmpPath = Helper.NormalizePath("./" + tmpPath);
+            }
+
+            return tmpPath;
+        }
+
+        private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+        {
+            string ret = "<Reference type=\"";
+            if(solution.ProjectsTable.ContainsKey(refr.Name))
+            {
+                ret += "Project\" refto=\"" + refr.Name;
+                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+            }
+            else
+            {
+                ProjectNode project = (ProjectNode)refr.Parent;
+                string fileRef = FindFileReference(refr.Name, project);
+
+                if(refr.Path != null || fileRef != null)
+                {
+                    ret += "Assembly\" refto=\"";
+
+                    string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
+
+                    ret += finalPath;
+                    ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+                    return ret;
+                }
+
+                ret += "Gac\" refto=\"";
+                try
+                {
+                    //Assembly assem = Assembly.Load(refr.Name);
                     ret += refr.Name;// assem.FullName;
-                                }
-                                catch (System.NullReferenceException e)
-                                {
-                                        e.ToString();
-                                        ret += refr.Name;
-                                }
-                                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
-                        }
-
-                        return ret;
-                }
-
-                private static string FindFileReference(string refName, ProjectNode project) 
-                {
-                        foreach(ReferencePathNode refPath in project.ReferencePaths) 
-                        {
-                                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
-
-                                if(File.Exists(fullPath)) 
-                                {
-                                        return fullPath;
-                                }
-                        }
-
-                        return null;
-                }
-
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        string docFile = (string)conf.Options["XmlDocFile"];
-                        if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
-                        {
-                                return "False";
-                        }
-                        return "True";
-                }
-
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        string csComp = "Csc";
-                        string netRuntime = "MsNet";
-                        if(project.Runtime == ClrRuntime.Mono)
-                        {
-                                csComp = "Mcs";
-                                netRuntime = "Mono";
-                        }
-
-                        string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
-                        StreamWriter ss = new StreamWriter(projFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-
-                        using(ss)
-                        {
-                                ss.WriteLine(
-                                        "<Project name=\"{0}\" standardNamespace=\"{1}\" description=\"\" newfilesearch=\"None\" enableviewstate=\"True\" version=\"1.1\" projecttype=\"C#\">",
-                                        project.Name,
-                                        project.RootNamespace
-                                        );
-
-                                ss.WriteLine("  <Contents>");
-                                foreach(string file in project.Files)
-                                {
-                                        string buildAction = "Compile";
-                                        switch(project.Files.GetBuildAction(file))
-                                        {
-                                                case BuildAction.None:
-                                                        buildAction = "Nothing";
-                                                        break;
-
-                                                case BuildAction.Content:
-                                                        buildAction = "Exclude";
-                                                        break;
-
-                                                case BuildAction.EmbeddedResource:
-                                                        buildAction = "EmbedAsResource";
-                                                        break;
-
-                                                default:
-                                                        buildAction = "Compile";
-                                                        break;
-                                        }
-
-                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string filePath = PrependPath(file);
-                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
-                                }
-                                ss.WriteLine("  </Contents>");
-
-                                ss.WriteLine("  <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ss.WriteLine("    {0}", BuildReference(solution, refr));
-                                }
-                                ss.WriteLine("  </References>");
-
-                                ss.Write("  <DeploymentInformation");
-                                ss.Write(" target=\"\"");
-                                ss.Write(" script=\"\"");
-                                ss.Write(" strategy=\"File\"");
-                                ss.WriteLine(" />");
-
-                                int count = 0;
-                                
-                                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
-
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ss.Write("    <Configuration");
-                                        ss.Write(" runwithwarnings=\"True\"");
-                                        ss.Write(" name=\"{0}\"", conf.Name);
-                                        ss.WriteLine(">");
-                                        ss.Write("      <CodeGeneration");
-                                        ss.Write(" runtime=\"{0}\"", netRuntime);
-                                        ss.Write(" compiler=\"{0}\"", csComp);
-                                        ss.Write(" compilerversion=\"\"");
-                                        ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
-                                        ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
-                                        ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
-                                        ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
-                                        ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
-                                        ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
-                                        ss.Write(" mainclass=\"{0}\"", project.StartupObject);
-                                        ss.Write(" target=\"{0}\"", project.Type);
-                                        ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
-                                        ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
-                                        ss.Write(" win32Icon=\"{0}\"", Helper.NormalizePath(".\\" + project.AppIcon));
-                                        ss.Write(" noconfig=\"{0}\"", "False");
-                                        ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
-                                        ss.WriteLine(" />");
-
-                                        ss.Write("      <Execution");
-                                        ss.Write(" commandlineparameters=\"\"");
-                                        ss.Write(" consolepause=\"True\"");
-                                        ss.WriteLine(" />");
-
-                                        ss.Write("      <Output");
-                                        ss.Write(" directory=\".\\{0}\"", Helper.NormalizePath(conf.Options["OutputPath"].ToString()));
-                                        ss.Write(" assembly=\"{0}\"", project.AssemblyName);
-                                        ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
-                                        ss.WriteLine(" />");
-                                        ss.WriteLine("    </Configuration>");
-
-                                        count++;
-                                }  
-                                ss.WriteLine("  </Configurations>");
-                                ss.WriteLine("</Project>");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void WriteCombine(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating SharpDevelop combine and project files");
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-
-                        m_Kernel.Log.Write("");
-                        string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
-                        StreamWriter ss = new StreamWriter(combFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("<Combine fileversion=\"1.0\" name=\"{0}\" description=\"\">", solution.Name);
-                
-                                int count = 0;
-                                foreach(ProjectNode project in solution.Projects)
-                                {                    
-                                        if(count == 0)
-                                                ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
-
-                                        ss.WriteLine("    <Execute entry=\"{0}\" type=\"None\" />", project.Name);
-                                        count++;
-                                }
-                                ss.WriteLine("  </StartMode>");
-                
-                                ss.WriteLine("  <Entries>");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("    <Entry filename=\"{0}\" />",
-                                                Helper.MakeFilePath(path, project.Name, "prjx"));
-                                }
-                                ss.WriteLine("  </Entries>");
-
-                                count = 0;
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        if(count == 0)
-                                        {
-                                                ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
-                                        }
-
-                                        ss.WriteLine("    <Configuration name=\"{0}\">", conf.Name);
-                                        foreach(ProjectNode project in solution.Projects)
-                                        {
-                                                ss.WriteLine("      <Entry name=\"{0}\" configurationname=\"{1}\" build=\"True\" />", project.Name, conf.Name);
-                                        }
-                                        ss.WriteLine("    </Configuration>");
-
-                                        count++;
-                                }
-                                ss.WriteLine("  </Configurations>");
-                                ss.WriteLine("</Combine>");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
-                        Helper.DeleteIfExists(projectFile);
-                }
-
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning SharpDevelop combine and project files for", solution.Name);
-
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
-                        Helper.DeleteIfExists(slnFile);
-
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-            
-                        m_Kernel.Log.Write("");
-                }
-
-                #endregion
-
-                #region ITarget Members
-
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode solution in kern.Solutions)
-                        {
-                                WriteCombine(solution);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in kern.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return "sharpdev";
-                        }
-                }
-
-                #endregion
-        }
+                }
+                catch (System.NullReferenceException e)
+                {
+                    e.ToString();
+                    ret += refr.Name;
+                }
+                ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+            }
+
+            return ret;
+        }
+
+        private static string FindFileReference(string refName, ProjectNode project)
+        {
+            foreach(ReferencePathNode refPath in project.ReferencePaths)
+            {
+                string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+                if(File.Exists(fullPath))
+                {
+                    return fullPath;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the XML doc file.
+        /// </summary>
+        /// <param name="project">The project.</param>
+        /// <param name="conf">The conf.</param>
+        /// <returns></returns>
+        public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf)
+        {
+            if( conf == null )
+            {
+                throw new ArgumentNullException("conf");
+            }
+            if( project == null )
+            {
+                throw new ArgumentNullException("project");
+            }
+            string docFile = (string)conf.Options["XmlDocFile"];
+            if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+            {
+                return "False";
+            }
+            return "True";
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
+            string csComp = "Csc";
+            string netRuntime = "MsNet";
+            if(project.Runtime == ClrRuntime.Mono)
+            {
+                csComp = "Mcs";
+                netRuntime = "Mono";
+            }
+
+            string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
+            StreamWriter ss = new StreamWriter(projFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+
+            using(ss)
+            {
+                ss.WriteLine(
+                    "<Project name=\"{0}\" standardNamespace=\"{1}\" description=\"\" newfilesearch=\"None\" enableviewstate=\"True\" version=\"1.1\" projecttype=\"C#\">",
+                    project.Name,
+                    project.RootNamespace
+                    );
+
+                ss.WriteLine("  <Contents>");
+                foreach(string file in project.Files)
+                {
+                    string buildAction = "Compile";
+                    switch(project.Files.GetBuildAction(file))
+                    {
+                        case BuildAction.None:
+                            buildAction = "Nothing";
+                            break;
+
+                        case BuildAction.Content:
+                            buildAction = "Exclude";
+                            break;
+
+                        case BuildAction.EmbeddedResource:
+                            buildAction = "EmbedAsResource";
+                            break;
+
+                        default:
+                            buildAction = "Compile";
+                            break;
+                    }
+
+                    // Sort of a hack, we try and resolve the path and make it relative, if we can.
+                    string filePath = PrependPath(file);
+                    ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
+                }
+                ss.WriteLine("  </Contents>");
+
+                ss.WriteLine("  <References>");
+                foreach(ReferenceNode refr in project.References)
+                {
+                    ss.WriteLine("    {0}", BuildReference(solution, refr));
+                }
+                ss.WriteLine("  </References>");
+
+                ss.Write("  <DeploymentInformation");
+                ss.Write(" target=\"\"");
+                ss.Write(" script=\"\"");
+                ss.Write(" strategy=\"File\"");
+                ss.WriteLine(" />");
+
+                int count = 0;
+
+                ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
+
+                foreach(ConfigurationNode conf in project.Configurations)
+                {
+                    ss.Write("    <Configuration");
+                    ss.Write(" runwithwarnings=\"True\"");
+                    ss.Write(" name=\"{0}\"", conf.Name);
+                    ss.WriteLine(">");
+                    ss.Write("      <CodeGeneration");
+                    ss.Write(" runtime=\"{0}\"", netRuntime);
+                    ss.Write(" compiler=\"{0}\"", csComp);
+                    ss.Write(" compilerversion=\"\"");
+                    ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
+                    ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
+                    ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
+                    ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
+                    ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
+                    ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
+                    ss.Write(" mainclass=\"{0}\"", project.StartupObject);
+                    ss.Write(" target=\"{0}\"", project.Type);
+                    ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
+                    ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
+                    ss.Write(" win32Icon=\"{0}\"", Helper.NormalizePath(".\\" + project.AppIcon));
+                    ss.Write(" noconfig=\"{0}\"", "False");
+                    ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
+                    ss.WriteLine(" />");
+
+                    ss.Write("      <Execution");
+                    ss.Write(" commandlineparameters=\"\"");
+                    ss.Write(" consolepause=\"True\"");
+                    ss.WriteLine(" />");
+
+                    ss.Write("      <Output");
+                    ss.Write(" directory=\".\\{0}\"", Helper.NormalizePath(conf.Options["OutputPath"].ToString()));
+                    ss.Write(" assembly=\"{0}\"", project.AssemblyName);
+                    ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
+                    if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+                    {
+                        ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+                    }
+                    if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+                    {
+                        ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+                    }
+                    ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+                    ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+                    ss.WriteLine(" />");
+                    ss.WriteLine("    </Configuration>");
+
+                    count++;
+                }
+                ss.WriteLine("  </Configurations>");
+                ss.WriteLine("</Project>");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void WriteCombine(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Creating SharpDevelop combine and project files");
+            foreach(ProjectNode project in solution.Projects)
+            {
+                if(m_Kernel.AllowProject(project.FilterGroups))
+                {
+                    m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+                    WriteProject(solution, project);
+                }
+            }
+
+            m_Kernel.Log.Write("");
+            string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
+            StreamWriter ss = new StreamWriter(combFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+
+            using(ss)
+            {
+                ss.WriteLine("<Combine fileversion=\"1.0\" name=\"{0}\" description=\"\">", solution.Name);
+
+                int count = 0;
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    if(count == 0)
+                        ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
+
+                    ss.WriteLine("    <Execute entry=\"{0}\" type=\"None\" />", project.Name);
+                    count++;
+                }
+                ss.WriteLine("  </StartMode>");
+
+                ss.WriteLine("  <Entries>");
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+                    ss.WriteLine("    <Entry filename=\"{0}\" />",
+                        Helper.MakeFilePath(path, project.Name, "prjx"));
+                }
+                ss.WriteLine("  </Entries>");
+
+                count = 0;
+                foreach(ConfigurationNode conf in solution.Configurations)
+                {
+                    if(count == 0)
+                    {
+                        ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
+                    }
+
+                    ss.WriteLine("    <Configuration name=\"{0}\">", conf.Name);
+                    foreach(ProjectNode project in solution.Projects)
+                    {
+                        ss.WriteLine("      <Entry name=\"{0}\" configurationname=\"{1}\" build=\"True\" />", project.Name, conf.Name);
+                    }
+                    ss.WriteLine("    </Configuration>");
+
+                    count++;
+                }
+                ss.WriteLine("  </Configurations>");
+                ss.WriteLine("</Combine>");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void CleanProject(ProjectNode project)
+        {
+            m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
+            Helper.DeleteIfExists(projectFile);
+        }
+
+        private void CleanSolution(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Cleaning SharpDevelop combine and project files for", solution.Name);
+
+            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
+            Helper.DeleteIfExists(slnFile);
+
+            foreach(ProjectNode project in solution.Projects)
+            {
+                CleanProject(project);
+            }
+
+            m_Kernel.Log.Write("");
+        }
+
+        #endregion
+
+        #region ITarget Members
+
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public void Write(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode solution in kern.Solutions)
+            {
+                WriteCombine(solution);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Clean(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode sol in kern.Solutions)
+            {
+                CleanSolution(sol);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return "sharpdev";
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/ToolInfo.cs b/Prebuild/src/Core/Targets/ToolInfo.cs
index 935c674..984d20e 100644
--- a/Prebuild/src/Core/Targets/ToolInfo.cs
+++ b/Prebuild/src/Core/Targets/ToolInfo.cs
@@ -4,194 +4,194 @@ using System.Text;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public struct ToolInfo
-        {
-                string name;
-                string guid;
-                string fileExtension;
-                string xmlTag;
-                string importProject;
+    /// <summary>
+    ///
+    /// </summary>
+    public struct ToolInfo
+    {
+        string name;
+        string guid;
+        string fileExtension;
+        string xmlTag;
+        string importProject;
 
-                /// <summary>
-                /// Gets or sets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return name;
-                        }
-                        set
-                        {
-                                name = value;
-                        }
-                }
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                name = value;
+            }
+        }
 
-                /// <summary>
-                /// Gets or sets the GUID.
-                /// </summary>
-                /// <value>The GUID.</value>
-                public string Guid
-                {
-                        get
-                        {
-                                return guid;
-                        }
-                        set
-                        {
-                                guid = value;
-                        }
-                }
+        /// <summary>
+        /// Gets or sets the GUID.
+        /// </summary>
+        /// <value>The GUID.</value>
+        public string Guid
+        {
+            get
+            {
+                return guid;
+            }
+            set
+            {
+                guid = value;
+            }
+        }
 
-                /// <summary>
-                /// Gets or sets the file extension.
-                /// </summary>
-                /// <value>The file extension.</value>
-                public string FileExtension
-                {
-                        get
-                        {
-                                return fileExtension;
-                        }
-                        set
-                        {
-                                fileExtension = value;
-                        }
-                }
-                public string LanguageExtension
-                {
-                        get
-                        {
-                                switch (this.Name)
-                                {
-                                        case "C#":
-                                                return ".cs";
-                                        case "VisualBasic":
-                                                return ".vb";
-                                        case "Boo":
-                                                return ".boo";
-                                        default:
-                                                return ".cs";
-                                }
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the XML tag.
-                /// </summary>
-                /// <value>The XML tag.</value>
-                public string XmlTag
-                {
-                        get
-                        {
-                                return xmlTag;
-                        }
-                        set
-                        {
-                                xmlTag = value;
-                        }
-                }
+        /// <summary>
+        /// Gets or sets the file extension.
+        /// </summary>
+        /// <value>The file extension.</value>
+        public string FileExtension
+        {
+            get
+            {
+                return fileExtension;
+            }
+            set
+            {
+                fileExtension = value;
+            }
+        }
+        public string LanguageExtension
+        {
+            get
+            {
+                switch (this.Name)
+                {
+                    case "C#":
+                        return ".cs";
+                    case "VisualBasic":
+                        return ".vb";
+                    case "Boo":
+                        return ".boo";
+                    default:
+                        return ".cs";
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets the XML tag.
+        /// </summary>
+        /// <value>The XML tag.</value>
+        public string XmlTag
+        {
+            get
+            {
+                return xmlTag;
+            }
+            set
+            {
+                xmlTag = value;
+            }
+        }
 
-                /// <summary>
-                /// Gets or sets the import project property.
-                /// </summary>
-                /// <value>The ImportProject tag.</value>
-                public string ImportProject
-                {
-                        get
-                        {
-                                return importProject;
-                        }
-                        set
-                        {
-                                importProject = value;
-                        }
-                }
+        /// <summary>
+        /// Gets or sets the import project property.
+        /// </summary>
+        /// <value>The ImportProject tag.</value>
+        public string ImportProject
+        {
+            get
+            {
+                return importProject;
+            }
+            set
+            {
+                importProject = value;
+            }
+        }
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ToolInfo"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                /// <param name="guid">The GUID.</param>
-                /// <param name="fileExtension">The file extension.</param>
-                /// <param name="xml">The XML.</param>
-                /// <param name="importProject">The import project.</param>
-                public ToolInfo(string name, string guid, string fileExtension, string xml, string importProject)
-                {
-                        this.name = name;
-                        this.guid = guid;
-                        this.fileExtension = fileExtension;
-                        this.xmlTag = xml;
-                        this.importProject = importProject;
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="guid">The GUID.</param>
+        /// <param name="fileExtension">The file extension.</param>
+        /// <param name="xml">The XML.</param>
+        /// <param name="importProject">The import project.</param>
+        public ToolInfo(string name, string guid, string fileExtension, string xml, string importProject)
+        {
+            this.name = name;
+            this.guid = guid;
+            this.fileExtension = fileExtension;
+            this.xmlTag = xml;
+            this.importProject = importProject;
+        }
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ToolInfo"/> class.
-                /// </summary>
-                /// <param name="name">The name.</param>
-                /// <param name="guid">The GUID.</param>
-                /// <param name="fileExtension">The file extension.</param>
-                /// <param name="xml">The XML.</param>
-                public ToolInfo(string name, string guid, string fileExtension, string xml)
-                {
-                        this.name = name;
-                        this.guid = guid;
-                        this.fileExtension = fileExtension;
-                        this.xmlTag = xml;
-                        this.importProject = "$(MSBuildBinPath)\\Microsoft." + xml + ".Targets";
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="guid">The GUID.</param>
+        /// <param name="fileExtension">The file extension.</param>
+        /// <param name="xml">The XML.</param>
+        public ToolInfo(string name, string guid, string fileExtension, string xml)
+        {
+            this.name = name;
+            this.guid = guid;
+            this.fileExtension = fileExtension;
+            this.xmlTag = xml;
+            this.importProject = "$(MSBuildBinPath)\\Microsoft." + xml + ".Targets";
+        }
 
-                /// <summary>
-                /// Equals operator
-                /// </summary>
-                /// <param name="obj">ToolInfo to compare</param>
-                /// <returns>true if toolInfos are equal</returns>
-                public override bool Equals(object obj)
-                {
-                        if (obj == null)
-                        {
-                                throw new ArgumentNullException("obj");
-                        }
-                        if (obj.GetType() != typeof(ToolInfo))
-                                return false;
+        /// <summary>
+        /// Equals operator
+        /// </summary>
+        /// <param name="obj">ToolInfo to compare</param>
+        /// <returns>true if toolInfos are equal</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+            if (obj.GetType() != typeof(ToolInfo))
+                return false;
 
-                        ToolInfo c = (ToolInfo)obj;
-                        return ((this.name == c.name) && (this.guid == c.guid) && (this.fileExtension == c.fileExtension) && (this.importProject == c.importProject));
-                }
+            ToolInfo c = (ToolInfo)obj;
+            return ((this.name == c.name) && (this.guid == c.guid) && (this.fileExtension == c.fileExtension) && (this.importProject == c.importProject));
+        }
 
-                /// <summary>
-                /// Equals operator
-                /// </summary>
-                /// <param name="c1">ToolInfo to compare</param>
-                /// <param name="c2">ToolInfo to compare</param>
-                /// <returns>True if toolInfos are equal</returns>
-                public static bool operator ==(ToolInfo c1, ToolInfo c2)
-                {
-                        return ((c1.name == c2.name) && (c1.guid == c2.guid) && (c1.fileExtension == c2.fileExtension) && (c1.importProject == c2.importProject) && (c1.xmlTag == c2.xmlTag));
-                }
+        /// <summary>
+        /// Equals operator
+        /// </summary>
+        /// <param name="c1">ToolInfo to compare</param>
+        /// <param name="c2">ToolInfo to compare</param>
+        /// <returns>True if toolInfos are equal</returns>
+        public static bool operator ==(ToolInfo c1, ToolInfo c2)
+        {
+            return ((c1.name == c2.name) && (c1.guid == c2.guid) && (c1.fileExtension == c2.fileExtension) && (c1.importProject == c2.importProject) && (c1.xmlTag == c2.xmlTag));
+        }
 
-                /// <summary>
-                /// Not equals operator
-                /// </summary>
-                /// <param name="c1">ToolInfo to compare</param>
-                /// <param name="c2">ToolInfo to compare</param>
-                /// <returns>True if toolInfos are not equal</returns>
-                public static bool operator !=(ToolInfo c1, ToolInfo c2)
-                {
-                        return !(c1 == c2);
-                }
+        /// <summary>
+        /// Not equals operator
+        /// </summary>
+        /// <param name="c1">ToolInfo to compare</param>
+        /// <param name="c2">ToolInfo to compare</param>
+        /// <returns>True if toolInfos are not equal</returns>
+        public static bool operator !=(ToolInfo c1, ToolInfo c2)
+        {
+            return !(c1 == c2);
+        }
 
-                /// <summary>
-                /// Hash Code
-                /// </summary>
-                /// <returns>Hash code</returns>
-                public override int GetHashCode()
-                {
-                        return name.GetHashCode() ^ guid.GetHashCode() ^ this.fileExtension.GetHashCode() ^ this.importProject.GetHashCode() ^ this.xmlTag.GetHashCode();
+        /// <summary>
+        /// Hash Code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return name.GetHashCode() ^ guid.GetHashCode() ^ this.fileExtension.GetHashCode() ^ this.importProject.GetHashCode() ^ this.xmlTag.GetHashCode();
 
-                }
-        }
+        }
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VS2002Target.cs b/Prebuild/src/Core/Targets/VS2002Target.cs
index 2292624..d7f6dd1 100644
--- a/Prebuild/src/Core/Targets/VS2002Target.cs
+++ b/Prebuild/src/Core/Targets/VS2002Target.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -29,59 +29,59 @@ using Prebuild.Core.Attributes;
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("vs2002")]
-        public class VS2002Target : VS2003Target
-        {
-                #region Private Methods
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("vs2002")]
+    public class VS2002Target : VS2003Target
+    {
+        #region Private Methods
 
-                private void SetVS2002()
-                {
-                        this.SolutionVersion = "7.00";
-                        this.ProductVersion = "7.0.9254";
-                        this.SchemaVersion = "1.0";
-                        this.VersionName = "2002";
-                        this.Version = VSVersion.VS70;
-                }
+        private void SetVS2002()
+        {
+            this.SolutionVersion = "7.00";
+            this.ProductVersion = "7.0.9254";
+            this.SchemaVersion = "1.0";
+            this.VersionName = "2002";
+            this.Version = VSVersion.VS70;
+        }
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Write(Kernel kern)
-                {
-                        SetVS2002();
-                        base.Write(kern);
-                }
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public override void Write(Kernel kern)
+        {
+            SetVS2002();
+            base.Write(kern);
+        }
 
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public override void Clean(Kernel kern)
-                {
-                        SetVS2002();
-                        base.Clean(kern);
-                }
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public override void Clean(Kernel kern)
+        {
+            SetVS2002();
+            base.Clean(kern);
+        }
 
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return "vs2002";
-                        }
-                }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public override string Name
+        {
+            get
+            {
+                return "vs2002";
+            }
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VS2003Target.cs b/Prebuild/src/Core/Targets/VS2003Target.cs
index 10e2dc4..f4b4517 100644
--- a/Prebuild/src/Core/Targets/VS2003Target.cs
+++ b/Prebuild/src/Core/Targets/VS2003Target.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -34,560 +34,560 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Targets
 {
-        [Target("vs2003")]
-        public class VS2003Target : ITarget
-        {
-
-                #region Fields
-
-                string solutionVersion = "8.00";
-                string productVersion = "7.10.3077";
-                string schemaVersion = "2.0";
-                string versionName = "2003";
-                VSVersion version = VSVersion.VS71;
-
-            readonly Dictionary<string, ToolInfo> m_Tools = new Dictionary<string, ToolInfo>();
-                Kernel m_Kernel;
-
-                /// <summary>
-                /// Gets or sets the solution version.
-                /// </summary>
-                /// <value>The solution version.</value>
-                protected string SolutionVersion
-                {
-                        get
-                        {
-                                return solutionVersion;
-                        }
-                        set
-                        {
-                                solutionVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the product version.
-                /// </summary>
-                /// <value>The product version.</value>
-                protected string ProductVersion
-                {
-                        get
-                        {
-                                return productVersion;
-                        }
-                        set
-                        {
-                                productVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the schema version.
-                /// </summary>
-                /// <value>The schema version.</value>
-                protected string SchemaVersion
-                {
-                        get
-                        {
-                                return schemaVersion;
-                        }
-                        set
-                        {
-                                schemaVersion = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the name of the version.
-                /// </summary>
-                /// <value>The name of the version.</value>
-                protected string VersionName
-                {
-                        get
-                        {
-                                return versionName;
-                        }
-                        set
-                        {
-                                versionName = value;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                protected VSVersion Version
-                {
-                        get
-                        {
-                                return version;
-                        }
-                        set
-                        {
-                                version = value;
-                        }
-                }
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="VS2003Target"/> class.
-                /// </summary>
-                public VS2003Target()
-                {
-                        m_Tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP");
-                        m_Tools["VB.NET"] = new ToolInfo("VB.NET", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic");
-                }
-
-                #endregion
-
-                #region Private Methods
-
-                private string MakeRefPath(ProjectNode project)
-                {
-                        string ret = "";
-                        foreach(ReferencePathNode node in project.ReferencePaths)
-                        {
-                                try
-                                {
-                                        string fullPath = Helper.ResolvePath(node.Path);
-                                        if(ret.Length < 1)
-                                        {
-                                                ret = fullPath;
-                                        }
-                                        else
-                                        {
-                                                ret += ";" + fullPath;
-                                        }
-                                }
-                                catch(ArgumentException)
-                                {
-                                        m_Kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
-                                }
-                        }
-
-                        return ret;
-                }
-
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        if(!m_Tools.ContainsKey(project.Language))
-                        {
-                                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                        }
-
-                        ToolInfo toolInfo = m_Tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        StreamWriter ps = new StreamWriter(projectFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
-
-                        using(ps)
-                        {
-                                ps.WriteLine("<VisualStudioProject>");
-                                ps.WriteLine("    <{0}", toolInfo.XmlTag);
-                                ps.WriteLine("\t\t\t\tProjectType = \"Local\"");
-                                ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", ProductVersion);
-                                ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", SchemaVersion);
-                                ps.WriteLine("\t\t\t\tProjectGuid = \"{{{0}}}\"", project.Guid.ToString().ToUpper());
-                                ps.WriteLine("\t\t>");
-
-                                ps.WriteLine("\t\t\t\t<Build>");
-                                ps.WriteLine("            <Settings");
-                                ps.WriteLine("\t\t\t\t  ApplicationIcon = \"{0}\"",project.AppIcon);
-                                ps.WriteLine("\t\t\t\t  AssemblyKeyContainerName = \"\"");
-                                ps.WriteLine("\t\t\t\t  AssemblyName = \"{0}\"", project.AssemblyName);
-                                ps.WriteLine("\t\t\t\t  AssemblyOriginatorKeyFile = \"\"");
-                                ps.WriteLine("\t\t\t\t  DefaultClientScript = \"JScript\"");
-                                ps.WriteLine("\t\t\t\t  DefaultHTMLPageLayout = \"Grid\"");
-                                ps.WriteLine("\t\t\t\t  DefaultTargetSchema = \"IE50\"");
-                                ps.WriteLine("\t\t\t\t  DelaySign = \"false\"");
-
-                                if(Version == VSVersion.VS70)
-                                {
-                                        ps.WriteLine("\t\t\t\t  NoStandardLibraries = \"false\"");
-                                }
-
-                                ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type);
-
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", conf.Options["PreBuildEvent"]);
-                                        }
-                                        if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", conf.Options["PostBuildEvent"]);
-                                        }
-                                        if (conf.Options["RunPostBuildEvent"] == null)
-                                        {
-                                                ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", "OnBuildSuccess");
-                                        }
-                                        else
-                                        {
-                                                ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", conf.Options["RunPostBuildEvent"]);
-                                        }
-                                        break;
-                                }
-                                
-                                ps.WriteLine("\t\t\t\t  RootNamespace = \"{0}\"", project.RootNamespace);
-                                ps.WriteLine("\t\t\t\t  StartupObject = \"{0}\"", project.StartupObject);
-                                ps.WriteLine("\t\t     >");
-
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.WriteLine("\t\t\t\t  <Config");
-                                        ps.WriteLine("\t\t\t\t      Name = \"{0}\"", conf.Name);
-                                        ps.WriteLine("\t\t\t\t      AllowUnsafeBlocks = \"{0}\"", conf.Options["AllowUnsafe"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      BaseAddress = \"{0}\"", conf.Options["BaseAddress"]);
-                                        ps.WriteLine("\t\t\t\t      CheckForOverflowUnderflow = \"{0}\"", conf.Options["CheckUnderflowOverflow"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      ConfigurationOverrideFile = \"\"");
-                                        ps.WriteLine("\t\t\t\t      DefineConstants = \"{0}\"", conf.Options["CompilerDefines"]);
-                                        ps.WriteLine("\t\t\t\t      DocumentationFile = \"{0}\"", GetXmlDocFile(project, conf));//default to the assembly name
-                                        ps.WriteLine("\t\t\t\t      DebugSymbols = \"{0}\"", conf.Options["DebugInformation"].ToString().ToLower());
-                                        ps.WriteLine("\t\t\t\t      FileAlignment = \"{0}\"", conf.Options["FileAlignment"]);
-                                        ps.WriteLine("\t\t\t\t      IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"].ToString().ToLower());
-                    
-                                        if(Version == VSVersion.VS71)
-                                        {
-                                                ps.WriteLine("\t\t\t\t      NoStdLib = \"{0}\"", conf.Options["NoStdLib"].ToString().ToLower());
-                                                ps.WriteLine("\t\t\t\t      NoWarn = \"{0}\"", conf.Options["SuppressWarnings"].ToString().ToLower());
-                                        }
-
-                                        ps.WriteLine("\t\t\t\t      Optimize = \"{0}\"", conf.Options["OptimizeCode"].ToString().ToLower());       
-                                        ps.WriteLine("                    OutputPath = \"{0}\"", 
-                                                Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
-                                        ps.WriteLine("                    RegisterForComInterop = \"{0}\"", conf.Options["RegisterComInterop"].ToString().ToLower());
-                                        ps.WriteLine("                    RemoveIntegerChecks = \"{0}\"", conf.Options["RemoveIntegerChecks"].ToString().ToLower());
-                                        ps.WriteLine("                    TreatWarningsAsErrors = \"{0}\"", conf.Options["WarningsAsErrors"].ToString().ToLower());
-                                        ps.WriteLine("                    WarningLevel = \"{0}\"", conf.Options["WarningLevel"]);
-                                        ps.WriteLine("                />");
-                                }
-
-                                ps.WriteLine("            </Settings>");
-
-                                ps.WriteLine("            <References>");
-                                foreach(ReferenceNode refr in project.References)
-                                {
-                                        ps.WriteLine("                <Reference");
-                                        ps.WriteLine("                    Name = \"{0}\"", refr.Name);
-                                        ps.WriteLine("                    AssemblyName = \"{0}\"", refr.Name);
-
-                                        if(solution.ProjectsTable.ContainsKey(refr.Name))
-                                        {
-                                                ProjectNode refProject = solution.ProjectsTable[refr.Name];
-                                                ps.WriteLine("                    Project = \"{{{0}}}\"", refProject.Guid.ToString().ToUpper());
-                                                ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToUpper());
-                                        }
-                                        else
-                                        {
-                                                if(refr.Path != null)
-                                                {
-                                                        ps.WriteLine("                    HintPath = \"{0}\"", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
-                                                }
-
-                                        }
-                    
-                                        if(refr.LocalCopySpecified)
-                                        {
-                                                ps.WriteLine("                    Private = \"{0}\"",refr.LocalCopy);
-                                        }
-
-                                        ps.WriteLine("                />");
-                                }
-                                ps.WriteLine("            </References>");
-
-                                ps.WriteLine("        </Build>");
-                                ps.WriteLine("        <Files>");
-                
-                                ps.WriteLine("            <Include>");
-
-                                foreach(string file in project.Files)
-                                {
-                                        string fileName = file.Replace(".\\", "");
-                                        ps.WriteLine("                <File");
-                                        ps.WriteLine("                    RelPath = \"{0}\"", fileName);
-                                        ps.WriteLine("                    SubType = \"{0}\"", project.Files.GetSubType(file));
-                                        ps.WriteLine("                    BuildAction = \"{0}\"", project.Files.GetBuildAction(file));
-                                        ps.WriteLine("                />");
-
-                                        if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                                        {
-                                                ps.WriteLine("                <File");
-                                                ps.WriteLine("                    RelPath = \"{0}\"", fileName.Substring(0, fileName.LastIndexOf('.')) + ".resx");
-                                                int slash = fileName.LastIndexOf('\\');
-                                                if (slash == -1)
-                                                {
-                                                        ps.WriteLine("                    DependentUpon = \"{0}\"", fileName);
-                                                }
-                                                else
-                                                {
-                                                        ps.WriteLine("                    DependentUpon = \"{0}\"", fileName.Substring(slash + 1, fileName.Length - slash - 1));
-                                                }
-                                                ps.WriteLine("                    BuildAction = \"{0}\"", "EmbeddedResource");
-                                                ps.WriteLine("                />");
-
-                                        }
-                                }
-                                ps.WriteLine("            </Include>");
-                
-                                ps.WriteLine("        </Files>");
-                                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("</VisualStudioProject>");
-                        }
-
-                        ps = new StreamWriter(projectFile + ".user");
-                        using(ps)
-                        {
-                                ps.WriteLine("<VisualStudioProject>");
-                                ps.WriteLine("    <{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("        <Build>");
-
-                                ps.WriteLine("            <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
-                                foreach(ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.WriteLine("                <Config");
-                                        ps.WriteLine("                    Name = \"{0}\"", conf.Name);
-                                        ps.WriteLine("                />");
-                                }
-                                ps.WriteLine("            </Settings>");
-
-                                ps.WriteLine("        </Build>");
-                                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
-                                ps.WriteLine("</VisualStudioProject>");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                /// <summary>
-                /// Gets the XML doc file.
-                /// </summary>
-                /// <param name="project">The project.</param>
-                /// <param name="conf">The conf.</param>
-                /// <returns></returns>
-                public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
-                {
-                        if( conf == null )
-                        {
-                                throw new ArgumentNullException("conf");
-                        }
-                        if( project == null )
-                        {
-                                throw new ArgumentNullException("project");
-                        }
-                        //                      if(!(bool)conf.Options["GenerateXmlDocFile"]) //default to none, if the generate option is false
-                        //                      {
-                        //                              return string.Empty;
-                        //                      }
-
-                        //default to "AssemblyName.xml"
-                        //string defaultValue = Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
-                        //return (string)conf.Options["XmlDocFile", defaultValue];
-
-                        //default to no XmlDocFile file
-                        return (string)conf.Options["XmlDocFile", ""];
-                }
-
-                private void WriteSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", VersionName);
-
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                if(m_Kernel.AllowProject(project.FilterGroups)) 
-                                {
-                                        m_Kernel.Log.Write("...Creating project: {0}", project.Name);
-                                        WriteProject(solution, project);
-                                }
-                        }
-
-                        m_Kernel.Log.Write("");
-                        string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                        StreamWriter ss = new StreamWriter(solutionFile);
-
-                        m_Kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
-            
-                        using(ss)
-                        {
-                                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        if(!m_Tools.ContainsKey(project.Language))
-                                        {
-                                                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                                        }
-
-                                        ToolInfo toolInfo = m_Tools[project.Language];
-                
-                                        string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                                        ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
-                                                toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
-                                                toolInfo.FileExtension), project.Guid.ToString().ToUpper());
-
-                                        ss.WriteLine("\tProjectSection(ProjectDependencies) = postProject");
-                                        ss.WriteLine("\tEndProjectSection");
-
-                                        ss.WriteLine("EndProject");
-                                }
-
-                                ss.WriteLine("Global");
-
-                                ss.WriteLine("\tGlobalSection(SolutionConfiguration) = preSolution");
-                                foreach(ConfigurationNode conf in solution.Configurations)
-                                {
-                                        ss.WriteLine("\t\t{0} = {0}", conf.Name);
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-
-                                ss.WriteLine("\tGlobalSection(ProjectDependencies) = postSolution");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        for(int i = 0; i < project.References.Count; i++)
-                                        {
-                                                ReferenceNode refr = project.References[i];
-                                                if(solution.ProjectsTable.ContainsKey(refr.Name))
-                                                {
-                                                        ProjectNode refProject = solution.ProjectsTable[refr.Name];
-                                                        ss.WriteLine("\t\t({{{0}}}).{1} = ({{{2}}})", 
-                                                                project.Guid.ToString().ToUpper()
-                                                                , i, 
-                                                                refProject.Guid.ToString().ToUpper()
-                                                                );
-                                                }
-                                        }
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-
-                                ss.WriteLine("\tGlobalSection(ProjectConfiguration) = postSolution");
-                                foreach(ProjectNode project in solution.Projects)
-                                {
-                                        foreach(ConfigurationNode conf in solution.Configurations)
-                                        {
-                                                ss.WriteLine("\t\t{{{0}}}.{1}.ActiveCfg = {1}|.NET",
-                                                        project.Guid.ToString().ToUpper(),
-                                                        conf.Name);
-
-                                                ss.WriteLine("\t\t{{{0}}}.{1}.Build.0 = {1}|.NET",
-                                                        project.Guid.ToString().ToUpper(),
-                                                        conf.Name);
-                                        }
-                                }
-                                ss.WriteLine("\tEndGlobalSection");
-
-                                if(solution.Files != null)
-                                {
-                                        ss.WriteLine("\tGlobalSection(SolutionItems) = postSolution");
-                                        foreach(string file in solution.Files)
-                                        {
-                                                ss.WriteLine("\t\t{0} = {0}", file);
-                                        }
-                                        ss.WriteLine("\tEndGlobalSection");
-                                }
-
-                                ss.WriteLine("\tGlobalSection(ExtensibilityGlobals) = postSolution");
-                                ss.WriteLine("\tEndGlobalSection");
-                                ss.WriteLine("\tGlobalSection(ExtensibilityAddIns) = postSolution");
-                                ss.WriteLine("\tEndGlobalSection");
-
-                                ss.WriteLine("EndGlobal");
-                        }
-
-                        m_Kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void CleanProject(ProjectNode project)
-                {
-                        m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
-
-                        ToolInfo toolInfo = m_Tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        string userFile = projectFile + ".user";
-            
-                        Helper.DeleteIfExists(projectFile);
-                        Helper.DeleteIfExists(userFile);
-                }
-
-                private void CleanSolution(SolutionNode solution)
-                {
-                        m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", VersionName, solution.Name);
-
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                        string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
-            
-                        Helper.DeleteIfExists(slnFile);
-                        Helper.DeleteIfExists(suoFile);
-
-                        foreach(ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-
-                        m_Kernel.Log.Write("");
-                }
-
-                #endregion
-
-                #region ITarget Members
-
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Write(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in m_Kernel.Solutions)
-                        {
-                                WriteSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if( kern == null )
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        m_Kernel = kern;
-                        foreach(SolutionNode sol in m_Kernel.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        m_Kernel = null;
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public virtual string Name
-                {
-                        get
-                        {
-                                return "vs2003";
-                        }
-                }
-
-                #endregion
-        }
+    [Target("vs2003")]
+    public class VS2003Target : ITarget
+    {
+
+        #region Fields
+
+        string solutionVersion = "8.00";
+        string productVersion = "7.10.3077";
+        string schemaVersion = "2.0";
+        string versionName = "2003";
+        VSVersion version = VSVersion.VS71;
+
+        readonly Dictionary<string, ToolInfo> m_Tools = new Dictionary<string, ToolInfo>();
+        Kernel m_Kernel;
+
+        /// <summary>
+        /// Gets or sets the solution version.
+        /// </summary>
+        /// <value>The solution version.</value>
+        protected string SolutionVersion
+        {
+            get
+            {
+                return solutionVersion;
+            }
+            set
+            {
+                solutionVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the product version.
+        /// </summary>
+        /// <value>The product version.</value>
+        protected string ProductVersion
+        {
+            get
+            {
+                return productVersion;
+            }
+            set
+            {
+                productVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the schema version.
+        /// </summary>
+        /// <value>The schema version.</value>
+        protected string SchemaVersion
+        {
+            get
+            {
+                return schemaVersion;
+            }
+            set
+            {
+                schemaVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the name of the version.
+        /// </summary>
+        /// <value>The name of the version.</value>
+        protected string VersionName
+        {
+            get
+            {
+                return versionName;
+            }
+            set
+            {
+                versionName = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        protected VSVersion Version
+        {
+            get
+            {
+                return version;
+            }
+            set
+            {
+                version = value;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VS2003Target"/> class.
+        /// </summary>
+        public VS2003Target()
+        {
+            m_Tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP");
+            m_Tools["VB.NET"] = new ToolInfo("VB.NET", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic");
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private string MakeRefPath(ProjectNode project)
+        {
+            string ret = "";
+            foreach(ReferencePathNode node in project.ReferencePaths)
+            {
+                try
+                {
+                    string fullPath = Helper.ResolvePath(node.Path);
+                    if(ret.Length < 1)
+                    {
+                        ret = fullPath;
+                    }
+                    else
+                    {
+                        ret += ";" + fullPath;
+                    }
+                }
+                catch(ArgumentException)
+                {
+                    m_Kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
+                }
+            }
+
+            return ret;
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
+            if(!m_Tools.ContainsKey(project.Language))
+            {
+                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+            }
+
+            ToolInfo toolInfo = m_Tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            StreamWriter ps = new StreamWriter(projectFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
+
+            using(ps)
+            {
+                ps.WriteLine("<VisualStudioProject>");
+                ps.WriteLine("    <{0}", toolInfo.XmlTag);
+                ps.WriteLine("\t\t\t\tProjectType = \"Local\"");
+                ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", ProductVersion);
+                ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", SchemaVersion);
+                ps.WriteLine("\t\t\t\tProjectGuid = \"{{{0}}}\"", project.Guid.ToString().ToUpper());
+                ps.WriteLine("\t\t>");
+
+                ps.WriteLine("\t\t\t\t<Build>");
+                ps.WriteLine("            <Settings");
+                ps.WriteLine("\t\t\t\t  ApplicationIcon = \"{0}\"",project.AppIcon);
+                ps.WriteLine("\t\t\t\t  AssemblyKeyContainerName = \"\"");
+                ps.WriteLine("\t\t\t\t  AssemblyName = \"{0}\"", project.AssemblyName);
+                ps.WriteLine("\t\t\t\t  AssemblyOriginatorKeyFile = \"\"");
+                ps.WriteLine("\t\t\t\t  DefaultClientScript = \"JScript\"");
+                ps.WriteLine("\t\t\t\t  DefaultHTMLPageLayout = \"Grid\"");
+                ps.WriteLine("\t\t\t\t  DefaultTargetSchema = \"IE50\"");
+                ps.WriteLine("\t\t\t\t  DelaySign = \"false\"");
+
+                if(Version == VSVersion.VS70)
+                {
+                    ps.WriteLine("\t\t\t\t  NoStandardLibraries = \"false\"");
+                }
+
+                ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type);
+
+                foreach(ConfigurationNode conf in project.Configurations)
+                {
+                    if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+                    {
+                        ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", conf.Options["PreBuildEvent"]);
+                    }
+                    if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+                    {
+                        ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+                    }
+                    else
+                    {
+                        ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", conf.Options["PostBuildEvent"]);
+                    }
+                    if (conf.Options["RunPostBuildEvent"] == null)
+                    {
+                        ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", "OnBuildSuccess");
+                    }
+                    else
+                    {
+                        ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", conf.Options["RunPostBuildEvent"]);
+                    }
+                    break;
+                }
+
+                ps.WriteLine("\t\t\t\t  RootNamespace = \"{0}\"", project.RootNamespace);
+                ps.WriteLine("\t\t\t\t  StartupObject = \"{0}\"", project.StartupObject);
+                ps.WriteLine("\t\t     >");
+
+                foreach(ConfigurationNode conf in project.Configurations)
+                {
+                    ps.WriteLine("\t\t\t\t  <Config");
+                    ps.WriteLine("\t\t\t\t      Name = \"{0}\"", conf.Name);
+                    ps.WriteLine("\t\t\t\t      AllowUnsafeBlocks = \"{0}\"", conf.Options["AllowUnsafe"].ToString().ToLower());
+                    ps.WriteLine("\t\t\t\t      BaseAddress = \"{0}\"", conf.Options["BaseAddress"]);
+                    ps.WriteLine("\t\t\t\t      CheckForOverflowUnderflow = \"{0}\"", conf.Options["CheckUnderflowOverflow"].ToString().ToLower());
+                    ps.WriteLine("\t\t\t\t      ConfigurationOverrideFile = \"\"");
+                    ps.WriteLine("\t\t\t\t      DefineConstants = \"{0}\"", conf.Options["CompilerDefines"]);
+                    ps.WriteLine("\t\t\t\t      DocumentationFile = \"{0}\"", GetXmlDocFile(project, conf));//default to the assembly name
+                    ps.WriteLine("\t\t\t\t      DebugSymbols = \"{0}\"", conf.Options["DebugInformation"].ToString().ToLower());
+                    ps.WriteLine("\t\t\t\t      FileAlignment = \"{0}\"", conf.Options["FileAlignment"]);
+                    ps.WriteLine("\t\t\t\t      IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"].ToString().ToLower());
+
+                    if(Version == VSVersion.VS71)
+                    {
+                        ps.WriteLine("\t\t\t\t      NoStdLib = \"{0}\"", conf.Options["NoStdLib"].ToString().ToLower());
+                        ps.WriteLine("\t\t\t\t      NoWarn = \"{0}\"", conf.Options["SuppressWarnings"].ToString().ToLower());
+                    }
+
+                    ps.WriteLine("\t\t\t\t      Optimize = \"{0}\"", conf.Options["OptimizeCode"].ToString().ToLower());
+                    ps.WriteLine("                    OutputPath = \"{0}\"",
+                        Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
+                    ps.WriteLine("                    RegisterForComInterop = \"{0}\"", conf.Options["RegisterComInterop"].ToString().ToLower());
+                    ps.WriteLine("                    RemoveIntegerChecks = \"{0}\"", conf.Options["RemoveIntegerChecks"].ToString().ToLower());
+                    ps.WriteLine("                    TreatWarningsAsErrors = \"{0}\"", conf.Options["WarningsAsErrors"].ToString().ToLower());
+                    ps.WriteLine("                    WarningLevel = \"{0}\"", conf.Options["WarningLevel"]);
+                    ps.WriteLine("                />");
+                }
+
+                ps.WriteLine("            </Settings>");
+
+                ps.WriteLine("            <References>");
+                foreach(ReferenceNode refr in project.References)
+                {
+                    ps.WriteLine("                <Reference");
+                    ps.WriteLine("                    Name = \"{0}\"", refr.Name);
+                    ps.WriteLine("                    AssemblyName = \"{0}\"", refr.Name);
+
+                    if(solution.ProjectsTable.ContainsKey(refr.Name))
+                    {
+                        ProjectNode refProject = solution.ProjectsTable[refr.Name];
+                        ps.WriteLine("                    Project = \"{{{0}}}\"", refProject.Guid.ToString().ToUpper());
+                        ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToUpper());
+                    }
+                    else
+                    {
+                        if(refr.Path != null)
+                        {
+                            ps.WriteLine("                    HintPath = \"{0}\"", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+                        }
+
+                    }
+
+                    if(refr.LocalCopySpecified)
+                    {
+                        ps.WriteLine("                    Private = \"{0}\"",refr.LocalCopy);
+                    }
+
+                    ps.WriteLine("                />");
+                }
+                ps.WriteLine("            </References>");
+
+                ps.WriteLine("        </Build>");
+                ps.WriteLine("        <Files>");
+
+                ps.WriteLine("            <Include>");
+
+                foreach(string file in project.Files)
+                {
+                    string fileName = file.Replace(".\\", "");
+                    ps.WriteLine("                <File");
+                    ps.WriteLine("                    RelPath = \"{0}\"", fileName);
+                    ps.WriteLine("                    SubType = \"{0}\"", project.Files.GetSubType(file));
+                    ps.WriteLine("                    BuildAction = \"{0}\"", project.Files.GetBuildAction(file));
+                    ps.WriteLine("                />");
+
+                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+                    {
+                        ps.WriteLine("                <File");
+                        ps.WriteLine("                    RelPath = \"{0}\"", fileName.Substring(0, fileName.LastIndexOf('.')) + ".resx");
+                        int slash = fileName.LastIndexOf('\\');
+                        if (slash == -1)
+                        {
+                            ps.WriteLine("                    DependentUpon = \"{0}\"", fileName);
+                        }
+                        else
+                        {
+                            ps.WriteLine("                    DependentUpon = \"{0}\"", fileName.Substring(slash + 1, fileName.Length - slash - 1));
+                        }
+                        ps.WriteLine("                    BuildAction = \"{0}\"", "EmbeddedResource");
+                        ps.WriteLine("                />");
+
+                    }
+                }
+                ps.WriteLine("            </Include>");
+
+                ps.WriteLine("        </Files>");
+                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
+                ps.WriteLine("</VisualStudioProject>");
+            }
+
+            ps = new StreamWriter(projectFile + ".user");
+            using(ps)
+            {
+                ps.WriteLine("<VisualStudioProject>");
+                ps.WriteLine("    <{0}>", toolInfo.XmlTag);
+                ps.WriteLine("        <Build>");
+
+                ps.WriteLine("            <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
+                foreach(ConfigurationNode conf in project.Configurations)
+                {
+                    ps.WriteLine("                <Config");
+                    ps.WriteLine("                    Name = \"{0}\"", conf.Name);
+                    ps.WriteLine("                />");
+                }
+                ps.WriteLine("            </Settings>");
+
+                ps.WriteLine("        </Build>");
+                ps.WriteLine("    </{0}>", toolInfo.XmlTag);
+                ps.WriteLine("</VisualStudioProject>");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        /// <summary>
+        /// Gets the XML doc file.
+        /// </summary>
+        /// <param name="project">The project.</param>
+        /// <param name="conf">The conf.</param>
+        /// <returns></returns>
+        public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf)
+        {
+            if( conf == null )
+            {
+                throw new ArgumentNullException("conf");
+            }
+            if( project == null )
+            {
+                throw new ArgumentNullException("project");
+            }
+            //                  if(!(bool)conf.Options["GenerateXmlDocFile"]) //default to none, if the generate option is false
+            //                  {
+            //                          return string.Empty;
+            //                  }
+
+            //default to "AssemblyName.xml"
+            //string defaultValue = Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
+            //return (string)conf.Options["XmlDocFile", defaultValue];
+
+            //default to no XmlDocFile file
+            return (string)conf.Options["XmlDocFile", ""];
+        }
+
+        private void WriteSolution(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", VersionName);
+
+            foreach(ProjectNode project in solution.Projects)
+            {
+                if(m_Kernel.AllowProject(project.FilterGroups))
+                {
+                    m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+                    WriteProject(solution, project);
+                }
+            }
+
+            m_Kernel.Log.Write("");
+            string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+            StreamWriter ss = new StreamWriter(solutionFile);
+
+            m_Kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
+
+            using(ss)
+            {
+                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    if(!m_Tools.ContainsKey(project.Language))
+                    {
+                        throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+                    }
+
+                    ToolInfo toolInfo = m_Tools[project.Language];
+
+                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+                    ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
+                        toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
+                        toolInfo.FileExtension), project.Guid.ToString().ToUpper());
+
+                    ss.WriteLine("\tProjectSection(ProjectDependencies) = postProject");
+                    ss.WriteLine("\tEndProjectSection");
+
+                    ss.WriteLine("EndProject");
+                }
+
+                ss.WriteLine("Global");
+
+                ss.WriteLine("\tGlobalSection(SolutionConfiguration) = preSolution");
+                foreach(ConfigurationNode conf in solution.Configurations)
+                {
+                    ss.WriteLine("\t\t{0} = {0}", conf.Name);
+                }
+                ss.WriteLine("\tEndGlobalSection");
+
+                ss.WriteLine("\tGlobalSection(ProjectDependencies) = postSolution");
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    for(int i = 0; i < project.References.Count; i++)
+                    {
+                        ReferenceNode refr = project.References[i];
+                        if(solution.ProjectsTable.ContainsKey(refr.Name))
+                        {
+                            ProjectNode refProject = solution.ProjectsTable[refr.Name];
+                            ss.WriteLine("\t\t({{{0}}}).{1} = ({{{2}}})",
+                                project.Guid.ToString().ToUpper()
+                                , i,
+                                refProject.Guid.ToString().ToUpper()
+                                );
+                        }
+                    }
+                }
+                ss.WriteLine("\tEndGlobalSection");
+
+                ss.WriteLine("\tGlobalSection(ProjectConfiguration) = postSolution");
+                foreach(ProjectNode project in solution.Projects)
+                {
+                    foreach(ConfigurationNode conf in solution.Configurations)
+                    {
+                        ss.WriteLine("\t\t{{{0}}}.{1}.ActiveCfg = {1}|.NET",
+                            project.Guid.ToString().ToUpper(),
+                            conf.Name);
+
+                        ss.WriteLine("\t\t{{{0}}}.{1}.Build.0 = {1}|.NET",
+                            project.Guid.ToString().ToUpper(),
+                            conf.Name);
+                    }
+                }
+                ss.WriteLine("\tEndGlobalSection");
+
+                if(solution.Files != null)
+                {
+                    ss.WriteLine("\tGlobalSection(SolutionItems) = postSolution");
+                    foreach(string file in solution.Files)
+                    {
+                        ss.WriteLine("\t\t{0} = {0}", file);
+                    }
+                    ss.WriteLine("\tEndGlobalSection");
+                }
+
+                ss.WriteLine("\tGlobalSection(ExtensibilityGlobals) = postSolution");
+                ss.WriteLine("\tEndGlobalSection");
+                ss.WriteLine("\tGlobalSection(ExtensibilityAddIns) = postSolution");
+                ss.WriteLine("\tEndGlobalSection");
+
+                ss.WriteLine("EndGlobal");
+            }
+
+            m_Kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void CleanProject(ProjectNode project)
+        {
+            m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+
+            ToolInfo toolInfo = m_Tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            string userFile = projectFile + ".user";
+
+            Helper.DeleteIfExists(projectFile);
+            Helper.DeleteIfExists(userFile);
+        }
+
+        private void CleanSolution(SolutionNode solution)
+        {
+            m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", VersionName, solution.Name);
+
+            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+            string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
+
+            Helper.DeleteIfExists(slnFile);
+            Helper.DeleteIfExists(suoFile);
+
+            foreach(ProjectNode project in solution.Projects)
+            {
+                CleanProject(project);
+            }
+
+            m_Kernel.Log.Write("");
+        }
+
+        #endregion
+
+        #region ITarget Members
+
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Write(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode sol in m_Kernel.Solutions)
+            {
+                WriteSolution(sol);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Clean(Kernel kern)
+        {
+            if( kern == null )
+            {
+                throw new ArgumentNullException("kern");
+            }
+            m_Kernel = kern;
+            foreach(SolutionNode sol in m_Kernel.Solutions)
+            {
+                CleanSolution(sol);
+            }
+            m_Kernel = null;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public virtual string Name
+        {
+            get
+            {
+                return "vs2003";
+            }
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
index 9c70e26..e5a0939 100644
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ b/Prebuild/src/Core/Targets/VS2005Target.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com)
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -35,7 +35,7 @@ using Prebuild.Core.Utilities;
 namespace Prebuild.Core.Targets
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [Target("vs2005")]
     public class VS2005Target : VSGenericTarget
@@ -137,9 +137,9 @@ namespace Prebuild.Core.Targets
         /// <summary>
         /// Initializes a new instance of the <see cref="VS2005Target"/> class.
         /// </summary>
-        public VS2005Target() 
+        public VS2005Target()
             : base()
-        {          
+        {
         }
 
         #endregion
diff --git a/Prebuild/src/Core/Targets/VS2008Target.cs b/Prebuild/src/Core/Targets/VS2008Target.cs
index fee4f7f..a3f3aca 100644
--- a/Prebuild/src/Core/Targets/VS2008Target.cs
+++ b/Prebuild/src/Core/Targets/VS2008Target.cs
@@ -11,86 +11,86 @@ using System.CodeDom.Compiler;
 namespace Prebuild.Core.Targets
 {
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("vs2008")]
-        public class VS2008Target : VSGenericTarget
-        {
-                #region Fields
-                string solutionVersion = "10.00";
-                string productVersion = "9.0.21022";
-                string schemaVersion = "2.0";
-                string versionName = "Visual Studio 2008";
-                string name = "vs2008";
-                VSVersion version = VSVersion.VS90;
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("vs2008")]
+    public class VS2008Target : VSGenericTarget
+    {
+        #region Fields
+        string solutionVersion = "10.00";
+        string productVersion = "9.0.21022";
+        string schemaVersion = "2.0";
+        string versionName = "Visual Studio 2008";
+        string name = "vs2008";
+        VSVersion version = VSVersion.VS90;
 
-                /// <summary>
-                /// Gets or sets the solution version.
-                /// </summary>
-                /// <value>The solution version.</value>
-                public override string SolutionVersion
-                {
-                        get
-                        {
-                                return solutionVersion;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the product version.
-                /// </summary>
-                /// <value>The product version.</value>
-                public override string ProductVersion
-                {
-                        get
-                        {
-                                return productVersion;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the schema version.
-                /// </summary>
-                /// <value>The schema version.</value>
-                public override string SchemaVersion
-                {
-                        get
-                        {
-                                return schemaVersion;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the name of the version.
-                /// </summary>
-                /// <value>The name of the version.</value>
-                public override string VersionName
-                {
-                        get
-                        {
-                                return versionName;
-                        }
-                }
-                /// <summary>
-                /// Gets or sets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public override VSVersion Version
-                {
-                        get
-                        {
-                                return version;
-                        }
-                }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return name;
-                        }
-                }
+        /// <summary>
+        /// Gets or sets the solution version.
+        /// </summary>
+        /// <value>The solution version.</value>
+        public override string SolutionVersion
+        {
+            get
+            {
+                return solutionVersion;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the product version.
+        /// </summary>
+        /// <value>The product version.</value>
+        public override string ProductVersion
+        {
+            get
+            {
+                return productVersion;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the schema version.
+        /// </summary>
+        /// <value>The schema version.</value>
+        public override string SchemaVersion
+        {
+            get
+            {
+                return schemaVersion;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the name of the version.
+        /// </summary>
+        /// <value>The name of the version.</value>
+        public override string VersionName
+        {
+            get
+            {
+                return versionName;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public override VSVersion Version
+        {
+            get
+            {
+                return version;
+            }
+        }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public override string Name
+        {
+            get
+            {
+                return name;
+            }
+        }
 
         protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion)
         {
@@ -110,18 +110,18 @@ namespace Prebuild.Core.Targets
             get { return "# Visual Studio 2008"; }
         }
 
-            #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="VS2005Target"/> class.
-                /// </summary>
-                public VS2008Target()
-                        : base()
-                {
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VS2005Target"/> class.
+        /// </summary>
+        public VS2008Target()
+            : base()
+        {
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs
index e8aeab5..b4c79dc 100644
--- a/Prebuild/src/Core/Targets/VS2010Target.cs
+++ b/Prebuild/src/Core/Targets/VS2010Target.cs
@@ -11,96 +11,96 @@ using System.CodeDom.Compiler;
 namespace Prebuild.Core.Targets
 {
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [Target("vs2010")]
-        public class VS2010Target : VSGenericTarget
-        {
-                #region Fields
-                
-                string solutionVersion = "11.00";
-                string productVersion = "9.0.30729";
-                string schemaVersion = "2.0";
-                string versionName = "Visual Studio 2010";
-                string name = "vs2010";
-                VSVersion version = VSVersion.VS10;
-
-                #endregion
-                
-                #region Properties
-                
-                /// <summary>
-                /// Gets or sets the solution version.
-                /// </summary>
-                /// <value>The solution version.</value>
-                public override string SolutionVersion
-                {
-                        get
-                        {
-                                return solutionVersion;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets or sets the product version.
-                /// </summary>
-                /// <value>The product version.</value>
-                public override string ProductVersion
-                {
-                        get
-                        {
-                                return productVersion;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets or sets the schema version.
-                /// </summary>
-                /// <value>The schema version.</value>
-                public override string SchemaVersion
-                {
-                        get
-                        {
-                                return schemaVersion;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets or sets the name of the version.
-                /// </summary>
-                /// <value>The name of the version.</value>
-                public override string VersionName
-                {
-                        get
-                        {
-                                return versionName;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets or sets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public override VSVersion Version
-                {
-                        get
-                        {
-                                return version;
-                        }
-                }
-                
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public override string Name
-                {
-                        get
-                        {
-                                return name;
-                        }
-                }
+    /// <summary>
+    ///
+    /// </summary>
+    [Target("vs2010")]
+    public class VS2010Target : VSGenericTarget
+    {
+        #region Fields
+
+        string solutionVersion = "11.00";
+        string productVersion = "9.0.30729";
+        string schemaVersion = "2.0";
+        string versionName = "Visual Studio 2010";
+        string name = "vs2010";
+        VSVersion version = VSVersion.VS10;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the solution version.
+        /// </summary>
+        /// <value>The solution version.</value>
+        public override string SolutionVersion
+        {
+            get
+            {
+                return solutionVersion;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the product version.
+        /// </summary>
+        /// <value>The product version.</value>
+        public override string ProductVersion
+        {
+            get
+            {
+                return productVersion;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the schema version.
+        /// </summary>
+        /// <value>The schema version.</value>
+        public override string SchemaVersion
+        {
+            get
+            {
+                return schemaVersion;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the version.
+        /// </summary>
+        /// <value>The name of the version.</value>
+        public override string VersionName
+        {
+            get
+            {
+                return versionName;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public override VSVersion Version
+        {
+            get
+            {
+                return version;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public override string Name
+        {
+            get
+            {
+                return name;
+            }
+        }
 
         protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion)
         {
@@ -110,7 +110,7 @@ namespace Prebuild.Core.Targets
                 case FrameworkVersion.v4_5:
                 case FrameworkVersion.v4_0:
                 case FrameworkVersion.v3_5:
-                        return "ToolsVersion=\"4.0\"";
+                    return "ToolsVersion=\"4.0\"";
                 case FrameworkVersion.v3_0:
                     return "ToolsVersion=\"3.0\"";
                 default:
@@ -123,18 +123,18 @@ namespace Prebuild.Core.Targets
             get { return "# Visual Studio 2010"; }
         }
 
-            #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="VS2005Target"/> class.
-                /// </summary>
-                public VS2010Target()
-                        : base()
-                {
-                }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VS2005Target"/> class.
+        /// </summary>
+        public VS2010Target()
+            : base()
+        {
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index b7c71e6..400788b 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -35,141 +35,141 @@ using System.CodeDom.Compiler;
 namespace Prebuild.Core.Targets
 {
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public abstract class VSGenericTarget : ITarget
-        {
-                #region Fields
-
-                readonly Dictionary<string, ToolInfo> tools = new Dictionary<string, ToolInfo>();
+    /// <summary>
+    ///
+    /// </summary>
+    public abstract class VSGenericTarget : ITarget
+    {
+        #region Fields
+
+        readonly Dictionary<string, ToolInfo> tools = new Dictionary<string, ToolInfo>();
 //        NameValueCollection CopyFiles = new NameValueCollection();
-                Kernel kernel;
-                #endregion
-
-                #region Properties
-                /// <summary>
-                /// Gets or sets the solution version.
-                /// </summary>
-                /// <value>The solution version.</value>
-                public abstract string SolutionVersion { get; }
-                /// <summary>
-                /// Gets or sets the product version.
-                /// </summary>
-                /// <value>The product version.</value>
-                public abstract string ProductVersion { get; }
-                /// <summary>
-                /// Gets or sets the schema version.
-                /// </summary>
-                /// <value>The schema version.</value>
-                public abstract string SchemaVersion { get; }
-                /// <summary>
-                /// Gets or sets the name of the version.
-                /// </summary>
-                /// <value>The name of the version.</value>
-                public abstract string VersionName { get; }
-                /// <summary>
-                /// Gets or sets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public abstract VSVersion Version { get; }
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public abstract string Name { get; }
-
-                protected abstract string GetToolsVersionXml(FrameworkVersion version);
-                public abstract string SolutionTag { get; }
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="VSGenericTarget"/> class.
-                /// </summary>
-                protected VSGenericTarget()
-                {
-                        tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
-                        tools["Database"] = new ToolInfo("Database", "{4F174C21-8C12-11D0-8340-0000F80270F8}", "dbp", "UNKNOWN");
-                        tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
-                        tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
-                        tools["Folder"] = new ToolInfo("Folder", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", null, null);
-                }
-
-                #endregion
-
-                #region Private Methods
-
-                private string MakeRefPath(ProjectNode project)
-                {
-                        string ret = "";
-                        foreach (ReferencePathNode node in project.ReferencePaths)
-                        {
-                                try
-                                {
-                                        string fullPath = Helper.ResolvePath(node.Path);
-                                        if (ret.Length < 1)
-                                        {
-                                                ret = fullPath;
-                                        }
-                                        else
-                                        {
-                                                ret += ";" + fullPath;
-                                        }
-                                }
-                                catch (ArgumentException)
-                                {
-                                        kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
-                                }
-                        }
-
-                        return ret;
-                }
-
-                private static ProjectNode FindProjectInSolution(string name, SolutionNode solution)
-                {
-                        SolutionNode node = solution;
-
-                        while (node.Parent is SolutionNode)
-                                node = node.Parent as SolutionNode;
-
-                        return FindProjectInSolutionRecursively(name, node);
-                }
-
-                private static ProjectNode FindProjectInSolutionRecursively(string name, SolutionNode solution)
-                {
-                        if (solution.ProjectsTable.ContainsKey(name))
-                                return solution.ProjectsTable[name];
-
-                        foreach (SolutionNode child in solution.Solutions)
-                        {
-                                ProjectNode node = FindProjectInSolutionRecursively(name, child);
-                                if (node != null)
-                                        return node;
-                        }
-
-                        return null;
-                }
-
-                private void WriteProject(SolutionNode solution, ProjectNode project)
-                {
-                        if (!tools.ContainsKey(project.Language))
-                        {
-                                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
-                        }
-
-                        ToolInfo toolInfo = tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        StreamWriter ps = new StreamWriter(projectFile);
-
-                        kernel.CurrentWorkingDirectory.Push();
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
-
-                        #region Project File
-                        using (ps)
-                        {
+        Kernel kernel;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets the solution version.
+        /// </summary>
+        /// <value>The solution version.</value>
+        public abstract string SolutionVersion { get; }
+        /// <summary>
+        /// Gets or sets the product version.
+        /// </summary>
+        /// <value>The product version.</value>
+        public abstract string ProductVersion { get; }
+        /// <summary>
+        /// Gets or sets the schema version.
+        /// </summary>
+        /// <value>The schema version.</value>
+        public abstract string SchemaVersion { get; }
+        /// <summary>
+        /// Gets or sets the name of the version.
+        /// </summary>
+        /// <value>The name of the version.</value>
+        public abstract string VersionName { get; }
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public abstract VSVersion Version { get; }
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public abstract string Name { get; }
+
+        protected abstract string GetToolsVersionXml(FrameworkVersion version);
+        public abstract string SolutionTag { get; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VSGenericTarget"/> class.
+        /// </summary>
+        protected VSGenericTarget()
+        {
+            tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
+            tools["Database"] = new ToolInfo("Database", "{4F174C21-8C12-11D0-8340-0000F80270F8}", "dbp", "UNKNOWN");
+            tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
+            tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
+            tools["Folder"] = new ToolInfo("Folder", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", null, null);
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private string MakeRefPath(ProjectNode project)
+        {
+            string ret = "";
+            foreach (ReferencePathNode node in project.ReferencePaths)
+            {
+                try
+                {
+                    string fullPath = Helper.ResolvePath(node.Path);
+                    if (ret.Length < 1)
+                    {
+                        ret = fullPath;
+                    }
+                    else
+                    {
+                        ret += ";" + fullPath;
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
+                }
+            }
+
+            return ret;
+        }
+
+        private static ProjectNode FindProjectInSolution(string name, SolutionNode solution)
+        {
+            SolutionNode node = solution;
+
+            while (node.Parent is SolutionNode)
+                node = node.Parent as SolutionNode;
+
+            return FindProjectInSolutionRecursively(name, node);
+        }
+
+        private static ProjectNode FindProjectInSolutionRecursively(string name, SolutionNode solution)
+        {
+            if (solution.ProjectsTable.ContainsKey(name))
+                return solution.ProjectsTable[name];
+
+            foreach (SolutionNode child in solution.Solutions)
+            {
+                ProjectNode node = FindProjectInSolutionRecursively(name, child);
+                if (node != null)
+                    return node;
+            }
+
+            return null;
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
+            if (!tools.ContainsKey(project.Language))
+            {
+                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+            }
+
+            ToolInfo toolInfo = tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            StreamWriter ps = new StreamWriter(projectFile);
+
+            kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
+
+            #region Project File
+            using (ps)
+            {
                 string targets = "";
 
                 if(project.Files.CopyFiles > 0)
@@ -177,347 +177,347 @@ namespace Prebuild.Core.Targets
                 else
                     targets = "Build";
 
-                                ps.WriteLine("<Project DefaultTargets=\"{0}\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" {1}>", targets, GetToolsVersionXml(project.FrameworkVersion));
-                                ps.WriteLine("  <PropertyGroup>");
-                                ps.WriteLine("    <ProjectType>Local</ProjectType>");
-                                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", ProductVersion);
-                                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", SchemaVersion);
-                                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
-
-                                // Visual Studio has a hard coded guid for the project type
-                                if (project.Type == ProjectType.Web)
-                                        ps.WriteLine("    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>");
-                                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
-                                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
-                                ps.WriteLine("    <AssemblyKeyContainerName>");
-                                ps.WriteLine("    </AssemblyKeyContainerName>");
-                                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        if (conf.Options.KeyFile != "")
-                                        {
-                                                ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
-                                                ps.WriteLine("    <SignAssembly>true</SignAssembly>");
-                                                break;
-                                        }
-                                }
-                                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
-                                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
-                                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
-                                ps.WriteLine("    <DelaySign>false</DelaySign>");
-                                ps.WriteLine("    <TargetFrameworkVersion>{0}</TargetFrameworkVersion>", project.FrameworkVersion.ToString().Replace("_", "."));
-
-                                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type == ProjectType.Web ? ProjectType.Library.ToString() : project.Type.ToString());
-                                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
-                                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
-                                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
-                                if (string.IsNullOrEmpty(project.DebugStartParameters))
-                                {
-                                        ps.WriteLine("    <StartArguments>{0}</StartArguments>", project.DebugStartParameters);
-                                }
-                                ps.WriteLine("    <FileUpgradeFlags>");
-                                ps.WriteLine("    </FileUpgradeFlags>");
-
-                                ps.WriteLine("  </PropertyGroup>");
-
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.Write("      <PropertyGroup ");
-                                        ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|{1}' \">", conf.Name, conf.Platform);
-                                        ps.WriteLine("    <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
-                                        ps.WriteLine("    <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
-                                        ps.WriteLine("    <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
-                                        ps.WriteLine("    <ConfigurationOverrideFile>");
-                                        ps.WriteLine("    </ConfigurationOverrideFile>");
-                                        ps.WriteLine("    <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
-                                        ps.WriteLine("    <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
-                                        ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
-                                        ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
-                                        ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
-                                        if (project.Type != ProjectType.Web)
-                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
-                                                             Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
-                                        else
-                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
-                                                             Helper.EndPath(Helper.NormalizePath("bin\\")));
-
-                                        ps.WriteLine("    <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
-                                        ps.WriteLine("    <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
-                                        ps.WriteLine("    <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
-                                        ps.WriteLine("    <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
-                                        ps.WriteLine("    <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
-                                        ps.WriteLine("    <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
-                                        ps.WriteLine("    <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
-                                        ps.WriteLine("  </PropertyGroup>");
-                                }
-
-                                //ps.WriteLine("          </Settings>");
-
-                                Dictionary<ReferenceNode, ProjectNode> projectReferences = new Dictionary<ReferenceNode, ProjectNode>();
-                                List<ReferenceNode> otherReferences = new List<ReferenceNode>();
-
-                                foreach (ReferenceNode refr in project.References)
-                                {
-                                        ProjectNode projectNode = FindProjectInSolution(refr.Name, solution);
-
-                                        if (projectNode == null)
-                                                otherReferences.Add(refr);
-                                        else
-                                                projectReferences.Add(refr, projectNode);
-                                }
-                                // Assembly References
-                                ps.WriteLine("  <ItemGroup>");
-
-                                foreach (ReferenceNode refr in otherReferences)
-                                {
-                                        ps.Write("        <Reference");
-                                        ps.Write(" Include=\"");
-                                        ps.Write(refr.Name);
-                                        ps.WriteLine("\" >");
-                                        ps.Write("                <Name>");
-                                        ps.Write(refr.Name);
-                                        ps.WriteLine("</Name>");
-                                                                                
-                                        if(!String.IsNullOrEmpty(refr.Path))
-                                        {
-                                                // Use absolute path to assembly (for determining assembly type)
-                                                string absolutePath = Path.Combine(project.FullPath, refr.Path);
-                                                if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "exe"))) {
-                                                        // Assembly is an executable (exe)
-                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "exe"));
-                                                } else if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "dll"))) {
-                                                        // Assembly is an library (dll)                                                 
-                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
-                                                } else {
-                                                        string referencePath = Helper.MakeFilePath(refr.Path, refr.Name, "dll");
-                                                        kernel.Log.Write(LogType.Warning, "Reference \"{0}\": The specified file doesn't exist.", referencePath);
-                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
-                                                }
-                                        }
-                                        
-                                        ps.WriteLine("          <Private>{0}</Private>", refr.LocalCopy);
-                                        ps.WriteLine("    </Reference>");
-                                }
-                                ps.WriteLine("  </ItemGroup>");
-
-                                //Project References
-                                ps.WriteLine("  <ItemGroup>");
-                                foreach (KeyValuePair<ReferenceNode, ProjectNode> pair in projectReferences)
-                                {
-                                        ToolInfo tool = tools[pair.Value.Language];
-                                        if (tools == null)
-                                                throw new UnknownLanguageException();
-
-                                        string path =
-                                                Helper.MakePathRelativeTo(project.FullPath,
-                                                                          Helper.MakeFilePath(pair.Value.FullPath, pair.Value.Name, tool.FileExtension));
-                                        ps.WriteLine("    <ProjectReference Include=\"{0}\">", path);
-
-                                        // TODO: Allow reference to visual basic projects
-                                        ps.WriteLine("          <Name>{0}</Name>", pair.Value.Name);
-                                        ps.WriteLine("          <Project>{0}</Project>", pair.Value.Guid.ToString("B").ToUpper());
-                                        ps.WriteLine("          <Package>{0}</Package>", tool.Guid.ToUpper());
-
-                                        //This is the Copy Local flag in VS
-                                        ps.WriteLine("          <Private>{0}</Private>", pair.Key.LocalCopy);
-
-                                        ps.WriteLine("    </ProjectReference>");
-                                }
-                                ps.WriteLine("  </ItemGroup>");
-
-                                //                                ps.WriteLine("        </Build>");
-                                ps.WriteLine("  <ItemGroup>");
-
-                                //                                ps.WriteLine("          <Include>");
-                                List<string> list = new List<string>();
-
-                                foreach (string path in project.Files)
-                                {
-                                        string lower = path.ToLower();
-                                        if (lower.EndsWith(".resx"))
-                                        {
-                                                string codebehind = String.Format("{0}.Designer{1}", path.Substring(0, path.LastIndexOf('.')), toolInfo.LanguageExtension);
-                                                if (!list.Contains(codebehind))
-                                                        list.Add(codebehind);
-                                        }
-
-                                }
-
-
-                                foreach (string filePath in project.Files)
-                                {
+                ps.WriteLine("<Project DefaultTargets=\"{0}\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" {1}>", targets, GetToolsVersionXml(project.FrameworkVersion));
+                ps.WriteLine("  <PropertyGroup>");
+                ps.WriteLine("    <ProjectType>Local</ProjectType>");
+                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", ProductVersion);
+                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", SchemaVersion);
+                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
+
+                // Visual Studio has a hard coded guid for the project type
+                if (project.Type == ProjectType.Web)
+                    ps.WriteLine("        <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>");
+                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
+                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
+                ps.WriteLine("    <AssemblyKeyContainerName>");
+                ps.WriteLine("    </AssemblyKeyContainerName>");
+                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    if (conf.Options.KeyFile != "")
+                    {
+                        ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
+                        ps.WriteLine("    <SignAssembly>true</SignAssembly>");
+                        break;
+                    }
+                }
+                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
+                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
+                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
+                ps.WriteLine("    <DelaySign>false</DelaySign>");
+                ps.WriteLine("    <TargetFrameworkVersion>{0}</TargetFrameworkVersion>", project.FrameworkVersion.ToString().Replace("_", "."));
+
+                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type == ProjectType.Web ? ProjectType.Library.ToString() : project.Type.ToString());
+                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
+                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
+                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
+                if (string.IsNullOrEmpty(project.DebugStartParameters))
+                {
+                    ps.WriteLine("        <StartArguments>{0}</StartArguments>", project.DebugStartParameters);
+                }
+                ps.WriteLine("    <FileUpgradeFlags>");
+                ps.WriteLine("    </FileUpgradeFlags>");
+
+                ps.WriteLine("  </PropertyGroup>");
+
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ps.Write("  <PropertyGroup ");
+                    ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|{1}' \">", conf.Name, conf.Platform);
+                    ps.WriteLine("        <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
+                    ps.WriteLine("        <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
+                    ps.WriteLine("        <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
+                    ps.WriteLine("        <ConfigurationOverrideFile>");
+                    ps.WriteLine("        </ConfigurationOverrideFile>");
+                    ps.WriteLine("        <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
+                    ps.WriteLine("        <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
+                    ps.WriteLine("        <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
+                    ps.WriteLine("        <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
+                    ps.WriteLine("        <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
+                    if (project.Type != ProjectType.Web)
+                        ps.WriteLine("    <OutputPath>{0}</OutputPath>",
+                                     Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
+                    else
+                        ps.WriteLine("    <OutputPath>{0}</OutputPath>",
+                                     Helper.EndPath(Helper.NormalizePath("bin\\")));
+
+                    ps.WriteLine("        <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
+                    ps.WriteLine("        <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
+                    ps.WriteLine("        <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
+                    ps.WriteLine("        <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
+                    ps.WriteLine("        <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
+                    ps.WriteLine("        <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
+                    ps.WriteLine("        <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
+                    ps.WriteLine("      </PropertyGroup>");
+                }
+
+                //ps.WriteLine("          </Settings>");
+
+                Dictionary<ReferenceNode, ProjectNode> projectReferences = new Dictionary<ReferenceNode, ProjectNode>();
+                List<ReferenceNode> otherReferences = new List<ReferenceNode>();
+
+                foreach (ReferenceNode refr in project.References)
+                {
+                    ProjectNode projectNode = FindProjectInSolution(refr.Name, solution);
+
+                    if (projectNode == null)
+                        otherReferences.Add(refr);
+                    else
+                        projectReferences.Add(refr, projectNode);
+                }
+                // Assembly References
+                ps.WriteLine("  <ItemGroup>");
+
+                foreach (ReferenceNode refr in otherReferences)
+                {
+                    ps.Write("    <Reference");
+                    ps.Write(" Include=\"");
+                    ps.Write(refr.Name);
+                    ps.WriteLine("\" >");
+                    ps.Write("            <Name>");
+                    ps.Write(refr.Name);
+                    ps.WriteLine("</Name>");
+
+                    if(!String.IsNullOrEmpty(refr.Path))
+                    {
+                        // Use absolute path to assembly (for determining assembly type)
+                        string absolutePath = Path.Combine(project.FullPath, refr.Path);
+                        if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "exe"))) {
+                            // Assembly is an executable (exe)
+                            ps.WriteLine("              <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "exe"));
+                        } else if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "dll"))) {
+                            // Assembly is an library (dll)
+                            ps.WriteLine("              <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+                        } else {
+                            string referencePath = Helper.MakeFilePath(refr.Path, refr.Name, "dll");
+                            kernel.Log.Write(LogType.Warning, "Reference \"{0}\": The specified file doesn't exist.", referencePath);
+                            ps.WriteLine("              <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+                        }
+                    }
+
+                    ps.WriteLine("              <Private>{0}</Private>", refr.LocalCopy);
+                    ps.WriteLine("        </Reference>");
+                }
+                ps.WriteLine("  </ItemGroup>");
+
+                //Project References
+                ps.WriteLine("  <ItemGroup>");
+                foreach (KeyValuePair<ReferenceNode, ProjectNode> pair in projectReferences)
+                {
+                    ToolInfo tool = tools[pair.Value.Language];
+                    if (tools == null)
+                        throw new UnknownLanguageException();
+
+                    string path =
+                        Helper.MakePathRelativeTo(project.FullPath,
+                                                  Helper.MakeFilePath(pair.Value.FullPath, pair.Value.Name, tool.FileExtension));
+                    ps.WriteLine("        <ProjectReference Include=\"{0}\">", path);
+
+                    // TODO: Allow reference to visual basic projects
+                    ps.WriteLine("              <Name>{0}</Name>", pair.Value.Name);
+                    ps.WriteLine("              <Project>{0}</Project>", pair.Value.Guid.ToString("B").ToUpper());
+                    ps.WriteLine("              <Package>{0}</Package>", tool.Guid.ToUpper());
+
+                    //This is the Copy Local flag in VS
+                    ps.WriteLine("              <Private>{0}</Private>", pair.Key.LocalCopy);
+
+                    ps.WriteLine("        </ProjectReference>");
+                }
+                ps.WriteLine("  </ItemGroup>");
+
+                //                                ps.WriteLine("        </Build>");
+                ps.WriteLine("  <ItemGroup>");
+
+                //                                ps.WriteLine("          <Include>");
+                List<string> list = new List<string>();
+
+                foreach (string path in project.Files)
+                {
+                    string lower = path.ToLower();
+                    if (lower.EndsWith(".resx"))
+                    {
+                        string codebehind = String.Format("{0}.Designer{1}", path.Substring(0, path.LastIndexOf('.')), toolInfo.LanguageExtension);
+                        if (!list.Contains(codebehind))
+                            list.Add(codebehind);
+                    }
+
+                }
+
+
+                foreach (string filePath in project.Files)
+                {
                     // Add the filePath with the destination as the key
                     // will use it later to form the copy parameters with Include lists
                     // for each destination
                     if (project.Files.GetBuildAction(filePath) == BuildAction.Copy)
                         continue;
-                                        //                                      if (file == "Properties\\Bind.Designer.cs")
-                                        //                                      {
-                                        //                                              Console.WriteLine("Wait a minute!");
-                                        //                                              Console.WriteLine(project.Files.GetSubType(file).ToString());
-                                        //                                      }
-                                        SubType subType = project.Files.GetSubType(filePath);
-                                        
-                                        // Visual Studio chokes on file names if forward slash is used as a path separator
-                                        // instead of backslash.  So we must make sure that all file paths written to the
-                                        // project file use \ as a path separator.
-                                        string file = filePath.Replace(@"/", @"\");
-
-                                        if (subType != SubType.Code && subType != SubType.Settings && subType != SubType.Designer
-                                            && subType != SubType.CodeBehind)
-                                        {
-                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file));
-                                                ps.WriteLine("          <SubType>Designer</SubType>");
-                                                ps.WriteLine("    </EmbeddedResource>");
-                                                //
-                                        }
-
-                                        if (subType == SubType.Designer)
-                                        {
-                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file);
-                                                
-                                                string autogen_name = file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs";
-                                                string dependent_name = filePath.Substring(0, file.LastIndexOf('.')) + ".cs";
-
-                                                // Check for a parent .cs file with the same name as this designer file
-                                                if (File.Exists(Helper.NormalizePath(dependent_name)))
-                                                {
-                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
-                                                }
-                                                else
-                                                {
-                                                        ps.WriteLine("          <Generator>ResXFileCodeGenerator</Generator>");
-                                                        ps.WriteLine("          <LastGenOutput>{0}</LastGenOutput>", Path.GetFileName(autogen_name));
-                                                        ps.WriteLine("          <SubType>" + subType + "</SubType>");
-                                                }
-                                                
-                                                ps.WriteLine("    </EmbeddedResource>");
-                                                if (File.Exists(Helper.NormalizePath(autogen_name)))
-                                                {
-                                                        ps.WriteLine("    <Compile Include=\"{0}\">", autogen_name);
-                                                        //ps.WriteLine("          <DesignTime>True</DesignTime>");
-
-                                                        // If a parent .cs file exists, link this autogen file to it. Otherwise link
-                                                        // to the designer file
-                                                        if (File.Exists(dependent_name))
-                                                        {
-                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
-                                                        }
-                                                        else
-                                                        {
-                                                                ps.WriteLine("          <AutoGen>True</AutoGen>");
-                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(filePath));
-                                                        }
-                                                        
-                                                        ps.WriteLine("    </Compile>");
-                                                }
-                                                list.Add(autogen_name);
-                                        }
-                                        if (subType == SubType.Settings)
-                                        {
-                                                ps.Write("        <{0} ", project.Files.GetBuildAction(filePath));
-                                                ps.WriteLine("Include=\"{0}\">", file);
-                                                string fileName = Path.GetFileName(filePath);
-                                                if (project.Files.GetBuildAction(filePath) == BuildAction.None)
-                                                {
-                                                        ps.WriteLine("          <Generator>SettingsSingleFileGenerator</Generator>");
-                                                        ps.WriteLine("          <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
-                                                }
-                                                else
-                                                {
-                                                        ps.WriteLine("          <SubType>Code</SubType>");
-                                                        ps.WriteLine("          <AutoGen>True</AutoGen>");
-                                                        ps.WriteLine("          <DesignTimeSharedInput>True</DesignTimeSharedInput>");
-                                                        string fileNameShort = fileName.Substring(0, fileName.LastIndexOf('.'));
-                                                        string fileNameShorter = fileNameShort.Substring(0, fileNameShort.LastIndexOf('.'));
-                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(fileNameShorter + ".settings"));
-                                                }
-                                                ps.WriteLine("    </{0}>", project.Files.GetBuildAction(filePath));
-                                        }
-                                        else if (subType != SubType.Designer)
-                                        {
-                                                string path = Helper.NormalizePath(file);
-                                                string path_lower = path.ToLower();
-
-                                                if (!list.Contains(filePath))
-                                                {
-                                                        ps.Write("        <{0} ", project.Files.GetBuildAction(filePath));
-
-                                                        int startPos = 0;
-                                                        if (project.Files.GetPreservePath(filePath))
-                                                        {
-                                                                while ((@"./\").IndexOf(file.Substring(startPos, 1)) != -1)
-                                                                        startPos++;
-
-                                                        }
-                                                        else
-                                                        {
-                                                                startPos = file.LastIndexOf(Path.GetFileName(path));
-                                                        }
-                                                        
-                                                        // be sure to write out the path with backslashes so VS recognizes
-                                                        // the file properly.
-                                                        ps.WriteLine("Include=\"{0}\">", file);
-
-                                                        int last_period_index = file.LastIndexOf('.');
+                    //                                  if (file == "Properties\\Bind.Designer.cs")
+                    //                                  {
+                    //                                          Console.WriteLine("Wait a minute!");
+                    //                                          Console.WriteLine(project.Files.GetSubType(file).ToString());
+                    //                                  }
+                    SubType subType = project.Files.GetSubType(filePath);
+
+                    // Visual Studio chokes on file names if forward slash is used as a path separator
+                    // instead of backslash.  So we must make sure that all file paths written to the
+                    // project file use \ as a path separator.
+                    string file = filePath.Replace(@"/", @"\");
+
+                    if (subType != SubType.Code && subType != SubType.Settings && subType != SubType.Designer
+                        && subType != SubType.CodeBehind)
+                    {
+                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file));
+                        ps.WriteLine("          <SubType>Designer</SubType>");
+                        ps.WriteLine("    </EmbeddedResource>");
+                        //
+                    }
+
+                    if (subType == SubType.Designer)
+                    {
+                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file);
+
+                        string autogen_name = file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs";
+                        string dependent_name = filePath.Substring(0, file.LastIndexOf('.')) + ".cs";
+
+                        // Check for a parent .cs file with the same name as this designer file
+                        if (File.Exists(Helper.NormalizePath(dependent_name)))
+                        {
+                            ps.WriteLine("              <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
+                        }
+                        else
+                        {
+                            ps.WriteLine("              <Generator>ResXFileCodeGenerator</Generator>");
+                            ps.WriteLine("              <LastGenOutput>{0}</LastGenOutput>", Path.GetFileName(autogen_name));
+                            ps.WriteLine("              <SubType>" + subType + "</SubType>");
+                        }
+
+                        ps.WriteLine("    </EmbeddedResource>");
+                        if (File.Exists(Helper.NormalizePath(autogen_name)))
+                        {
+                            ps.WriteLine("        <Compile Include=\"{0}\">", autogen_name);
+                            //ps.WriteLine("      <DesignTime>True</DesignTime>");
+
+                            // If a parent .cs file exists, link this autogen file to it. Otherwise link
+                            // to the designer file
+                            if (File.Exists(dependent_name))
+                            {
+                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
+                            }
+                            else
+                            {
+                                ps.WriteLine("          <AutoGen>True</AutoGen>");
+                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(filePath));
+                            }
+
+                            ps.WriteLine("        </Compile>");
+                        }
+                        list.Add(autogen_name);
+                    }
+                    if (subType == SubType.Settings)
+                    {
+                        ps.Write("        <{0} ", project.Files.GetBuildAction(filePath));
+                        ps.WriteLine("Include=\"{0}\">", file);
+                        string fileName = Path.GetFileName(filePath);
+                        if (project.Files.GetBuildAction(filePath) == BuildAction.None)
+                        {
+                            ps.WriteLine("              <Generator>SettingsSingleFileGenerator</Generator>");
+                            ps.WriteLine("              <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
+                        }
+                        else
+                        {
+                            ps.WriteLine("              <SubType>Code</SubType>");
+                            ps.WriteLine("              <AutoGen>True</AutoGen>");
+                            ps.WriteLine("              <DesignTimeSharedInput>True</DesignTimeSharedInput>");
+                            string fileNameShort = fileName.Substring(0, fileName.LastIndexOf('.'));
+                            string fileNameShorter = fileNameShort.Substring(0, fileNameShort.LastIndexOf('.'));
+                            ps.WriteLine("              <DependentUpon>{0}</DependentUpon>", Path.GetFileName(fileNameShorter + ".settings"));
+                        }
+                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(filePath));
+                    }
+                    else if (subType != SubType.Designer)
+                    {
+                        string path = Helper.NormalizePath(file);
+                        string path_lower = path.ToLower();
+
+                        if (!list.Contains(filePath))
+                        {
+                            ps.Write("    <{0} ", project.Files.GetBuildAction(filePath));
+
+                            int startPos = 0;
+                            if (project.Files.GetPreservePath(filePath))
+                            {
+                                while ((@"./\").IndexOf(file.Substring(startPos, 1)) != -1)
+                                    startPos++;
+
+                            }
+                            else
+                            {
+                                startPos = file.LastIndexOf(Path.GetFileName(path));
+                            }
+
+                            // be sure to write out the path with backslashes so VS recognizes
+                            // the file properly.
+                            ps.WriteLine("Include=\"{0}\">", file);
+
+                            int last_period_index = file.LastIndexOf('.');
                             string short_file_name = (last_period_index >= 0)
                                 ? file.Substring(0, last_period_index)
                                 : file;
-                                                        string extension = Path.GetExtension(path);
-                                                        // make this upper case, so that when File.Exists tests for the
-                                                        // existence of a designer file on a case-sensitive platform,
-                                                        // it is correctly identified.
-                                                        string designer_format = string.Format(".Designer{0}", extension);
-
-                                                        if (path_lower.EndsWith(designer_format.ToLowerInvariant()))
-                                                        {
-                                                                int designer_index = path.IndexOf(designer_format);
-                                                                string file_name = path.Substring(0, designer_index);
-
-                                                                // There are two corrections to the next lines:
-                                                                // 1. Fix the connection between a designer file and a form
-                                                                //        or usercontrol that don't have an associated resx file.
-                                                                // 2. Connect settings files to associated designer files.
-                                                                if (File.Exists(file_name + extension))
-                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + extension));
-                                                                else if (File.Exists(file_name + ".resx"))
-                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".resx"));
-                                                                else if (File.Exists(file_name + ".settings"))
-                                                                {
-                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".settings"));
-                                                                        ps.WriteLine("          <AutoGen>True</AutoGen>");
-                                                                        ps.WriteLine("          <DesignTimeSharedInput>True</DesignTimeSharedInput>");
-                                                                }
-                                                        }
-                                                        else if (subType == SubType.CodeBehind)
-                                                        {
-                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(short_file_name));
-                                                        }
-                                                        if (project.Files.GetIsLink(filePath))
-                                                        {
-                                                                string alias = project.Files.GetLinkPath(filePath);
-                                                                alias += file.Substring(startPos);
-                                                                alias = Helper.NormalizePath(alias);
-                                                                ps.WriteLine("          <Link>{0}</Link>", alias);
-                                                        }
-                                                        else if (project.Files.GetBuildAction(filePath) != BuildAction.None)
-                                                        {
-                                                                if (project.Files.GetBuildAction(filePath) != BuildAction.EmbeddedResource)
-                                                                {
-                                                                        ps.WriteLine("          <SubType>{0}</SubType>", subType);
-                                                                }
-                                                        }
-
-                                                        if (project.Files.GetCopyToOutput(filePath) != CopyToOutput.Never)
-                                                        {
-                                                                ps.WriteLine("          <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(filePath));
-                                                        }
-
-                                                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(filePath));
-                                                }
-                                        }
-                                }
+                            string extension = Path.GetExtension(path);
+                            // make this upper case, so that when File.Exists tests for the
+                            // existence of a designer file on a case-sensitive platform,
+                            // it is correctly identified.
+                            string designer_format = string.Format(".Designer{0}", extension);
+
+                            if (path_lower.EndsWith(designer_format.ToLowerInvariant()))
+                            {
+                                int designer_index = path.IndexOf(designer_format);
+                                string file_name = path.Substring(0, designer_index);
+
+                                // There are two corrections to the next lines:
+                                // 1. Fix the connection between a designer file and a form
+                                //        or usercontrol that don't have an associated resx file.
+                                // 2. Connect settings files to associated designer files.
+                                if (File.Exists(file_name + extension))
+                                    ps.WriteLine("              <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + extension));
+                                else if (File.Exists(file_name + ".resx"))
+                                    ps.WriteLine("              <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".resx"));
+                                else if (File.Exists(file_name + ".settings"))
+                                {
+                                    ps.WriteLine("              <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".settings"));
+                                    ps.WriteLine("              <AutoGen>True</AutoGen>");
+                                    ps.WriteLine("              <DesignTimeSharedInput>True</DesignTimeSharedInput>");
+                                }
+                            }
+                            else if (subType == SubType.CodeBehind)
+                            {
+                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(short_file_name));
+                            }
+                            if (project.Files.GetIsLink(filePath))
+                            {
+                                string alias = project.Files.GetLinkPath(filePath);
+                                alias += file.Substring(startPos);
+                                alias = Helper.NormalizePath(alias);
+                                ps.WriteLine("          <Link>{0}</Link>", alias);
+                            }
+                            else if (project.Files.GetBuildAction(filePath) != BuildAction.None)
+                            {
+                                if (project.Files.GetBuildAction(filePath) != BuildAction.EmbeddedResource)
+                                {
+                                    ps.WriteLine("              <SubType>{0}</SubType>", subType);
+                                }
+                            }
+
+                            if (project.Files.GetCopyToOutput(filePath) != CopyToOutput.Never)
+                            {
+                                ps.WriteLine("          <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(filePath));
+                            }
+
+                            ps.WriteLine("        </{0}>", project.Files.GetBuildAction(filePath));
+                        }
+                    }
+                }
                 ps.WriteLine("  </ItemGroup>");
 
                 /*
@@ -553,420 +553,420 @@ namespace Prebuild.Core.Targets
                     ps.WriteLine("  </Target>");
                 }
 
-                                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
-                                ps.WriteLine("  <PropertyGroup>");
-                                ps.WriteLine("    <PreBuildEvent>");
-                                ps.WriteLine("    </PreBuildEvent>");
-                                ps.WriteLine("    <PostBuildEvent>");
-                                ps.WriteLine("    </PostBuildEvent>");
-                                ps.WriteLine("  </PropertyGroup>");
-                                ps.WriteLine("</Project>");
-                        }
-                        #endregion
-
-                        #region User File
-
-                        ps = new StreamWriter(projectFile + ".user");
-                        using (ps)
-                        {
-                                // Get the first configuration from the project.
-                                ConfigurationNode firstConfiguration = null;
-
-                                if (project.Configurations.Count > 0)
-                                {
-                                        firstConfiguration = project.Configurations[0];
-                                }
-
-                                ps.WriteLine("<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
-                                //ps.WriteLine( "<VisualStudioProject>" );
-                                //ps.WriteLine("  <{0}>", toolInfo.XMLTag);
-                                //ps.WriteLine("        <Build>");
-                                ps.WriteLine("  <PropertyGroup>");
-                                //ps.WriteLine("          <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
-
-                                if (firstConfiguration != null)
-                                {
-                                        ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">{0}</Configuration>", firstConfiguration.Name);
-                                        ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">{0}</Platform>", firstConfiguration.Platform);
-                                }
-
-                                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
-                                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", ProductVersion);
-                                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
-                                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
-                                ps.WriteLine("  </PropertyGroup>");
-                                foreach (ConfigurationNode conf in project.Configurations)
-                                {
-                                        ps.Write("      <PropertyGroup");
-                                        ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|{1}' \"", conf.Name, conf.Platform);
-                                        ps.WriteLine(" />");
-                                }
-                                ps.WriteLine("</Project>");
-                        }
-                        #endregion
-
-                        kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private void WriteSolution(SolutionNode solution, bool writeSolutionToDisk)
-                {
-                        kernel.Log.Write("Creating {0} solution and project files", VersionName);
-
-                        foreach (SolutionNode child in solution.Solutions)
-                        {
-                                kernel.Log.Write("...Creating folder: {0}", child.Name);
-                                WriteSolution(child, false);
-                        }
-
-                        foreach (ProjectNode project in solution.Projects)
-                        {
-                                kernel.Log.Write("...Creating project: {0}", project.Name);
-                                WriteProject(solution, project);
-                        }
-
-                        foreach (DatabaseProjectNode project in solution.DatabaseProjects)
-                        {
-                                kernel.Log.Write("...Creating database project: {0}", project.Name);
-                                WriteDatabaseProject(solution, project);
-                        }
-
-                        if (writeSolutionToDisk) // only write main solution
-                        {
-                                kernel.Log.Write("");
-                                string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                                
-                                using (StreamWriter ss = new StreamWriter(solutionFile))
-                                {
-                                        kernel.CurrentWorkingDirectory.Push();
-                                        Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
-
-                                        ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
-                                        ss.WriteLine(SolutionTag);
-
-                                        WriteProjectDeclarations(ss, solution, solution);
-
-                                        ss.WriteLine("Global");
-
-                                        ss.WriteLine("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution");
-                                        foreach (ConfigurationNode conf in solution.Configurations)
-                                        {
-                                                ss.WriteLine("\t\t{0} = {0}", conf.NameAndPlatform);
-                                        }
-                                        ss.WriteLine("\tEndGlobalSection");
-
-                                        ss.WriteLine("\tGlobalSection(ProjectConfigurationPlatforms) = postSolution");
-                                        WriteConfigurationLines(solution.Configurations, solution, ss);
-                                        ss.WriteLine("\tEndGlobalSection");
-
-                                        if (solution.Solutions.Count > 0)
-                                        {
-                                                ss.WriteLine("\tGlobalSection(NestedProjects) = preSolution");
-                                                foreach (SolutionNode embeddedSolution in solution.Solutions)
-                                                {
-                                                        WriteNestedProjectMap(ss, embeddedSolution);
-                                                }
-                                                ss.WriteLine("\tEndGlobalSection");
-                                        }
-
-                                        ss.WriteLine("EndGlobal");
-                                }
-
-                                kernel.CurrentWorkingDirectory.Pop();
-                        }
-                }
-
-                private void WriteProjectDeclarations(TextWriter writer, SolutionNode actualSolution, SolutionNode embeddedSolution)
-                {
-                        foreach (SolutionNode childSolution in embeddedSolution.Solutions)
-                        {
-                                WriteEmbeddedSolution(writer, childSolution);
-                                WriteProjectDeclarations(writer, actualSolution, childSolution);
-                        }
-
-                        foreach (ProjectNode project in embeddedSolution.Projects)
-                        {
-                                WriteProject(actualSolution, writer, project);
-                        }
-
-                        foreach (DatabaseProjectNode dbProject in embeddedSolution.DatabaseProjects)
-                        {
-                                WriteProject(actualSolution, writer, dbProject);
-                        }
-
-                        if (actualSolution.Guid == embeddedSolution.Guid)
-                        {
-                                WriteSolutionFiles(actualSolution, writer);
-                        }
-                }
-
-                private static void WriteNestedProjectMap(TextWriter writer, SolutionNode embeddedSolution)
-                {
-                        foreach (ProjectNode project in embeddedSolution.Projects)
-                        {
-                                WriteNestedProject(writer, embeddedSolution, project.Guid);
-                        }
-
-                        foreach (DatabaseProjectNode dbProject in embeddedSolution.DatabaseProjects)
-                        {
-                                WriteNestedProject(writer, embeddedSolution, dbProject.Guid);
-                        }
-
-                        foreach (SolutionNode child in embeddedSolution.Solutions)
-                        {
-                                WriteNestedProject(writer, embeddedSolution, child.Guid);
-                                WriteNestedProjectMap(writer, child);
-                        }
-                }
-
-                private static void WriteNestedProject(TextWriter writer, SolutionNode solution, Guid projectGuid)
-                {
-                        WriteNestedFolder(writer, solution.Guid, projectGuid);
-                }
-
-                private static void WriteNestedFolder(TextWriter writer, Guid parentGuid, Guid childGuid)
-                {
-                        writer.WriteLine("\t\t{0} = {1}",
-                                         childGuid.ToString("B").ToUpper(),
-                                         parentGuid.ToString("B").ToUpper());
-                }
-
-                private static void WriteConfigurationLines(IEnumerable<ConfigurationNode> configurations, SolutionNode solution, TextWriter ss)
-                {
-                        foreach (ProjectNode project in solution.Projects)
-                        {
-                                foreach (ConfigurationNode conf in configurations)
-                                {
-                                        ss.WriteLine("\t\t{0}.{1}.ActiveCfg = {1}",
-                                                     project.Guid.ToString("B").ToUpper(),
-                                                     conf.NameAndPlatform);
-
-                                        ss.WriteLine("\t\t{0}.{1}.Build.0 = {1}",
-                                                     project.Guid.ToString("B").ToUpper(),
-                                                     conf.NameAndPlatform);
-                                }
-                        }
-
-                        foreach (SolutionNode child in solution.Solutions)
-                        {
-                                WriteConfigurationLines(configurations, child, ss);
-                        }
-                }
-
-                private void WriteSolutionFiles(SolutionNode solution, TextWriter ss)
-                {
-                        if(solution.Files != null && solution.Files.Count > 0)
-                                WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
-                }
-
-                private void WriteEmbeddedSolution(TextWriter writer, SolutionNode embeddedSolution)
-                {
-                        WriteProject(writer, "Folder", embeddedSolution.Guid, embeddedSolution.Name, embeddedSolution.Name, embeddedSolution.Files);
-                }
-
-                private void WriteProject(SolutionNode solution, TextWriter ss, ProjectNode project)
-                {
-                        WriteProject(ss, solution, project.Language, project.Guid, project.Name, project.FullPath);
-                }
-
-                private void WriteProject(SolutionNode solution, TextWriter ss, DatabaseProjectNode dbProject)
-                {
-                        if (solution.Files != null && solution.Files.Count > 0)
-                                WriteProject(ss, solution, "Database", dbProject.Guid, dbProject.Name, dbProject.FullPath);
-                }
-
-                const string ProjectDeclarationBeginFormat = "Project(\"{0}\") = \"{1}\", \"{2}\", \"{3}\"";
-                const string ProjectDeclarationEndFormat = "EndProject";
-
-                private void WriteProject(TextWriter ss, SolutionNode solution, string language, Guid guid, string name, string projectFullPath)
-                {
-                        if (!tools.ContainsKey(language))
-                                throw new UnknownLanguageException("Unknown .NET language: " + language);
-
-                        ToolInfo toolInfo = tools[language];
-
-                        string path = Helper.MakePathRelativeTo(solution.FullPath, projectFullPath);
-
-                        path = Helper.MakeFilePath(path, name, toolInfo.FileExtension);
-
-                        WriteProject(ss, language, guid, name, path);
-                }
-
-                private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location)
-                {
-                        WriteProject(writer, language, projectGuid, name, location, null);
-                }
-
-                private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location, FilesNode files)
-                {
-                        if (!tools.ContainsKey(language))
-                                throw new UnknownLanguageException("Unknown .NET language: " + language);
-
-                        ToolInfo toolInfo = tools[language];
-
-                        writer.WriteLine(ProjectDeclarationBeginFormat,
-                                         toolInfo.Guid,
-                                         name,
-                                         location,
-                                         projectGuid.ToString("B").ToUpper());
-
-                        if (files != null)
-                        {
-                                writer.WriteLine("\tProjectSection(SolutionItems) = preProject");
-
-                                foreach (string file in files)
-                                        writer.WriteLine("\t\t{0} = {0}", file);
-
-                                writer.WriteLine("\tEndProjectSection");
-                        }
-
-                        writer.WriteLine(ProjectDeclarationEndFormat);
-                }
-
-                private void WriteDatabaseProject(SolutionNode solution, DatabaseProjectNode project)
-                {
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "dbp");
-                        IndentedTextWriter ps = new IndentedTextWriter(new StreamWriter(projectFile), "   ");
-
-                        kernel.CurrentWorkingDirectory.Push();
-
-                        Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
-
-                        using (ps)
-                        {
-                                ps.WriteLine("# Microsoft Developer Studio Project File - Database Project");
-                                ps.WriteLine("Begin DataProject = \"{0}\"", project.Name);
-                                ps.Indent++;
-                                ps.WriteLine("MSDTVersion = \"80\"");
-                                // TODO: Use the project.Files property
-                                if (ContainsSqlFiles(Path.GetDirectoryName(projectFile)))
-                                        WriteDatabaseFoldersAndFiles(ps, Path.GetDirectoryName(projectFile));
-
-                                ps.WriteLine("Begin DBRefFolder = \"Database References\"");
-                                ps.Indent++;
-                                foreach (DatabaseReferenceNode reference in project.References)
-                                {
-                                        ps.WriteLine("Begin DBRefNode = \"{0}\"", reference.Name);
-                                        ps.Indent++;
-                                        ps.WriteLine("ConnectStr = \"{0}\"", reference.ConnectionString);
-                                        ps.WriteLine("Provider = \"{0}\"", reference.ProviderId.ToString("B").ToUpper());
-                                        //ps.WriteLine("Colorizer = 5");
-                                        ps.Indent--;
-                                        ps.WriteLine("End");
-                                }
-                                ps.Indent--;
-                                ps.WriteLine("End");
-                                ps.Indent--;
-                                ps.WriteLine("End");
-
-                                ps.Flush();
-                        }
-
-                        kernel.CurrentWorkingDirectory.Pop();
-                }
-
-                private static bool ContainsSqlFiles(string folder)
-                {
-                        if(Directory.GetFiles(folder, "*.sql").Length > 0)
-                                return true; // if the folder contains 1 .sql file, that's good enough
-
-                        foreach (string child in Directory.GetDirectories(folder))
-                        {
-                                if (ContainsSqlFiles(child))
-                                        return true; // if 1 child folder contains a .sql file, still good enough
-                        }
-
-                        return false;
-                }
-
-                private static void WriteDatabaseFoldersAndFiles(IndentedTextWriter writer, string folder)
-                {
-                        foreach (string child in Directory.GetDirectories(folder))
-                        {
-                                if (ContainsSqlFiles(child))
-                                {
-                                        writer.WriteLine("Begin Folder = \"{0}\"", Path.GetFileName(child));
-                                        writer.Indent++;
-                                        WriteDatabaseFoldersAndFiles(writer, child);
-                                        writer.Indent--;
-                                        writer.WriteLine("End");
-                                }
-                        }
-                        foreach (string file in Directory.GetFiles(folder, "*.sql"))
-                        {
-                                writer.WriteLine("Script = \"{0}\"", Path.GetFileName(file));
-                        }
-                }
-
-                private void CleanProject(ProjectNode project)
-                {
-                        kernel.Log.Write("...Cleaning project: {0}", project.Name);
-
-                        ToolInfo toolInfo = tools[project.Language];
-                        string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
-                        string userFile = projectFile + ".user";
-
-                        Helper.DeleteIfExists(projectFile);
-                        Helper.DeleteIfExists(userFile);
-                }
-
-                private void CleanSolution(SolutionNode solution)
-                {
-                        kernel.Log.Write("Cleaning {0} solution and project files", VersionName, solution.Name);
-
-                        string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
-                        string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
-
-                        Helper.DeleteIfExists(slnFile);
-                        Helper.DeleteIfExists(suoFile);
-
-                        foreach (ProjectNode project in solution.Projects)
-                        {
-                                CleanProject(project);
-                        }
-
-                        kernel.Log.Write("");
-                }
-
-                #endregion
-
-                #region ITarget Members
-
-                /// <summary>
-                /// Writes the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Write(Kernel kern)
-                {
-                        if (kern == null)
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        kernel = kern;
-                        foreach (SolutionNode sol in kernel.Solutions)
-                        {
-                                WriteSolution(sol, true);
-                        }
-                        kernel = null;
-                }
-
-                /// <summary>
-                /// Cleans the specified kern.
-                /// </summary>
-                /// <param name="kern">The kern.</param>
-                public virtual void Clean(Kernel kern)
-                {
-                        if (kern == null)
-                        {
-                                throw new ArgumentNullException("kern");
-                        }
-                        kernel = kern;
-                        foreach (SolutionNode sol in kernel.Solutions)
-                        {
-                                CleanSolution(sol);
-                        }
-                        kernel = null;
-                }
-
-                #endregion
-        }
+                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
+                ps.WriteLine("  <PropertyGroup>");
+                ps.WriteLine("    <PreBuildEvent>");
+                ps.WriteLine("    </PreBuildEvent>");
+                ps.WriteLine("    <PostBuildEvent>");
+                ps.WriteLine("    </PostBuildEvent>");
+                ps.WriteLine("  </PropertyGroup>");
+                ps.WriteLine("</Project>");
+            }
+            #endregion
+
+            #region User File
+
+            ps = new StreamWriter(projectFile + ".user");
+            using (ps)
+            {
+                // Get the first configuration from the project.
+                ConfigurationNode firstConfiguration = null;
+
+                if (project.Configurations.Count > 0)
+                {
+                    firstConfiguration = project.Configurations[0];
+                }
+
+                ps.WriteLine("<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
+                //ps.WriteLine( "<VisualStudioProject>" );
+                //ps.WriteLine("  <{0}>", toolInfo.XMLTag);
+                //ps.WriteLine("        <Build>");
+                ps.WriteLine("  <PropertyGroup>");
+                //ps.WriteLine("          <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
+
+                if (firstConfiguration != null)
+                {
+                    ps.WriteLine("        <Configuration Condition=\" '$(Configuration)' == '' \">{0}</Configuration>", firstConfiguration.Name);
+                    ps.WriteLine("        <Platform Condition=\" '$(Platform)' == '' \">{0}</Platform>", firstConfiguration.Platform);
+                }
+
+                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
+                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", ProductVersion);
+                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
+                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
+                ps.WriteLine("  </PropertyGroup>");
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ps.Write("  <PropertyGroup");
+                    ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|{1}' \"", conf.Name, conf.Platform);
+                    ps.WriteLine(" />");
+                }
+                ps.WriteLine("</Project>");
+            }
+            #endregion
+
+            kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void WriteSolution(SolutionNode solution, bool writeSolutionToDisk)
+        {
+            kernel.Log.Write("Creating {0} solution and project files", VersionName);
+
+            foreach (SolutionNode child in solution.Solutions)
+            {
+                kernel.Log.Write("...Creating folder: {0}", child.Name);
+                WriteSolution(child, false);
+            }
+
+            foreach (ProjectNode project in solution.Projects)
+            {
+                kernel.Log.Write("...Creating project: {0}", project.Name);
+                WriteProject(solution, project);
+            }
+
+            foreach (DatabaseProjectNode project in solution.DatabaseProjects)
+            {
+                kernel.Log.Write("...Creating database project: {0}", project.Name);
+                WriteDatabaseProject(solution, project);
+            }
+
+            if (writeSolutionToDisk) // only write main solution
+            {
+                kernel.Log.Write("");
+                string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+
+                using (StreamWriter ss = new StreamWriter(solutionFile))
+                {
+                    kernel.CurrentWorkingDirectory.Push();
+                    Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
+
+                    ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
+                    ss.WriteLine(SolutionTag);
+
+                    WriteProjectDeclarations(ss, solution, solution);
+
+                    ss.WriteLine("Global");
+
+                    ss.WriteLine("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution");
+                    foreach (ConfigurationNode conf in solution.Configurations)
+                    {
+                        ss.WriteLine("\t\t{0} = {0}", conf.NameAndPlatform);
+                    }
+                    ss.WriteLine("\tEndGlobalSection");
+
+                    ss.WriteLine("\tGlobalSection(ProjectConfigurationPlatforms) = postSolution");
+                    WriteConfigurationLines(solution.Configurations, solution, ss);
+                    ss.WriteLine("\tEndGlobalSection");
+
+                    if (solution.Solutions.Count > 0)
+                    {
+                        ss.WriteLine("\tGlobalSection(NestedProjects) = preSolution");
+                        foreach (SolutionNode embeddedSolution in solution.Solutions)
+                        {
+                            WriteNestedProjectMap(ss, embeddedSolution);
+                        }
+                        ss.WriteLine("\tEndGlobalSection");
+                    }
+
+                    ss.WriteLine("EndGlobal");
+                }
+
+                kernel.CurrentWorkingDirectory.Pop();
+            }
+        }
+
+        private void WriteProjectDeclarations(TextWriter writer, SolutionNode actualSolution, SolutionNode embeddedSolution)
+        {
+            foreach (SolutionNode childSolution in embeddedSolution.Solutions)
+            {
+                WriteEmbeddedSolution(writer, childSolution);
+                WriteProjectDeclarations(writer, actualSolution, childSolution);
+            }
+
+            foreach (ProjectNode project in embeddedSolution.Projects)
+            {
+                WriteProject(actualSolution, writer, project);
+            }
+
+            foreach (DatabaseProjectNode dbProject in embeddedSolution.DatabaseProjects)
+            {
+                WriteProject(actualSolution, writer, dbProject);
+            }
+
+            if (actualSolution.Guid == embeddedSolution.Guid)
+            {
+                WriteSolutionFiles(actualSolution, writer);
+            }
+        }
+
+        private static void WriteNestedProjectMap(TextWriter writer, SolutionNode embeddedSolution)
+        {
+            foreach (ProjectNode project in embeddedSolution.Projects)
+            {
+                WriteNestedProject(writer, embeddedSolution, project.Guid);
+            }
+
+            foreach (DatabaseProjectNode dbProject in embeddedSolution.DatabaseProjects)
+            {
+                WriteNestedProject(writer, embeddedSolution, dbProject.Guid);
+            }
+
+            foreach (SolutionNode child in embeddedSolution.Solutions)
+            {
+                WriteNestedProject(writer, embeddedSolution, child.Guid);
+                WriteNestedProjectMap(writer, child);
+            }
+        }
+
+        private static void WriteNestedProject(TextWriter writer, SolutionNode solution, Guid projectGuid)
+        {
+            WriteNestedFolder(writer, solution.Guid, projectGuid);
+        }
+
+        private static void WriteNestedFolder(TextWriter writer, Guid parentGuid, Guid childGuid)
+        {
+            writer.WriteLine("\t\t{0} = {1}",
+                             childGuid.ToString("B").ToUpper(),
+                             parentGuid.ToString("B").ToUpper());
+        }
+
+        private static void WriteConfigurationLines(IEnumerable<ConfigurationNode> configurations, SolutionNode solution, TextWriter ss)
+        {
+            foreach (ProjectNode project in solution.Projects)
+            {
+                foreach (ConfigurationNode conf in configurations)
+                {
+                    ss.WriteLine("\t\t{0}.{1}.ActiveCfg = {1}",
+                                 project.Guid.ToString("B").ToUpper(),
+                                 conf.NameAndPlatform);
+
+                    ss.WriteLine("\t\t{0}.{1}.Build.0 = {1}",
+                                 project.Guid.ToString("B").ToUpper(),
+                                 conf.NameAndPlatform);
+                }
+            }
+
+            foreach (SolutionNode child in solution.Solutions)
+            {
+                WriteConfigurationLines(configurations, child, ss);
+            }
+        }
+
+        private void WriteSolutionFiles(SolutionNode solution, TextWriter ss)
+        {
+            if(solution.Files != null && solution.Files.Count > 0)
+                WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
+        }
+
+        private void WriteEmbeddedSolution(TextWriter writer, SolutionNode embeddedSolution)
+        {
+            WriteProject(writer, "Folder", embeddedSolution.Guid, embeddedSolution.Name, embeddedSolution.Name, embeddedSolution.Files);
+        }
+
+        private void WriteProject(SolutionNode solution, TextWriter ss, ProjectNode project)
+        {
+            WriteProject(ss, solution, project.Language, project.Guid, project.Name, project.FullPath);
+        }
+
+        private void WriteProject(SolutionNode solution, TextWriter ss, DatabaseProjectNode dbProject)
+        {
+            if (solution.Files != null && solution.Files.Count > 0)
+                WriteProject(ss, solution, "Database", dbProject.Guid, dbProject.Name, dbProject.FullPath);
+        }
+
+        const string ProjectDeclarationBeginFormat = "Project(\"{0}\") = \"{1}\", \"{2}\", \"{3}\"";
+        const string ProjectDeclarationEndFormat = "EndProject";
+
+        private void WriteProject(TextWriter ss, SolutionNode solution, string language, Guid guid, string name, string projectFullPath)
+        {
+            if (!tools.ContainsKey(language))
+                throw new UnknownLanguageException("Unknown .NET language: " + language);
+
+            ToolInfo toolInfo = tools[language];
+
+            string path = Helper.MakePathRelativeTo(solution.FullPath, projectFullPath);
+
+            path = Helper.MakeFilePath(path, name, toolInfo.FileExtension);
+
+            WriteProject(ss, language, guid, name, path);
+        }
+
+        private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location)
+        {
+            WriteProject(writer, language, projectGuid, name, location, null);
+        }
+
+        private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location, FilesNode files)
+        {
+            if (!tools.ContainsKey(language))
+                throw new UnknownLanguageException("Unknown .NET language: " + language);
+
+            ToolInfo toolInfo = tools[language];
+
+            writer.WriteLine(ProjectDeclarationBeginFormat,
+                             toolInfo.Guid,
+                             name,
+                             location,
+                             projectGuid.ToString("B").ToUpper());
+
+            if (files != null)
+            {
+                writer.WriteLine("\tProjectSection(SolutionItems) = preProject");
+
+                foreach (string file in files)
+                    writer.WriteLine("\t\t{0} = {0}", file);
+
+                writer.WriteLine("\tEndProjectSection");
+            }
+
+            writer.WriteLine(ProjectDeclarationEndFormat);
+        }
+
+        private void WriteDatabaseProject(SolutionNode solution, DatabaseProjectNode project)
+        {
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "dbp");
+            IndentedTextWriter ps = new IndentedTextWriter(new StreamWriter(projectFile), "       ");
+
+            kernel.CurrentWorkingDirectory.Push();
+
+            Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
+
+            using (ps)
+            {
+                ps.WriteLine("# Microsoft Developer Studio Project File - Database Project");
+                ps.WriteLine("Begin DataProject = \"{0}\"", project.Name);
+                ps.Indent++;
+                ps.WriteLine("MSDTVersion = \"80\"");
+                // TODO: Use the project.Files property
+                if (ContainsSqlFiles(Path.GetDirectoryName(projectFile)))
+                    WriteDatabaseFoldersAndFiles(ps, Path.GetDirectoryName(projectFile));
+
+                ps.WriteLine("Begin DBRefFolder = \"Database References\"");
+                ps.Indent++;
+                foreach (DatabaseReferenceNode reference in project.References)
+                {
+                    ps.WriteLine("Begin DBRefNode = \"{0}\"", reference.Name);
+                    ps.Indent++;
+                    ps.WriteLine("ConnectStr = \"{0}\"", reference.ConnectionString);
+                    ps.WriteLine("Provider = \"{0}\"", reference.ProviderId.ToString("B").ToUpper());
+                    //ps.WriteLine("Colorizer = 5");
+                    ps.Indent--;
+                    ps.WriteLine("End");
+                }
+                ps.Indent--;
+                ps.WriteLine("End");
+                ps.Indent--;
+                ps.WriteLine("End");
+
+                ps.Flush();
+            }
+
+            kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private static bool ContainsSqlFiles(string folder)
+        {
+            if(Directory.GetFiles(folder, "*.sql").Length > 0)
+                return true; // if the folder contains 1 .sql file, that's good enough
+
+            foreach (string child in Directory.GetDirectories(folder))
+            {
+                if (ContainsSqlFiles(child))
+                    return true; // if 1 child folder contains a .sql file, still good enough
+            }
+
+            return false;
+        }
+
+        private static void WriteDatabaseFoldersAndFiles(IndentedTextWriter writer, string folder)
+        {
+            foreach (string child in Directory.GetDirectories(folder))
+            {
+                if (ContainsSqlFiles(child))
+                {
+                    writer.WriteLine("Begin Folder = \"{0}\"", Path.GetFileName(child));
+                    writer.Indent++;
+                    WriteDatabaseFoldersAndFiles(writer, child);
+                    writer.Indent--;
+                    writer.WriteLine("End");
+                }
+            }
+            foreach (string file in Directory.GetFiles(folder, "*.sql"))
+            {
+                writer.WriteLine("Script = \"{0}\"", Path.GetFileName(file));
+            }
+        }
+
+        private void CleanProject(ProjectNode project)
+        {
+            kernel.Log.Write("...Cleaning project: {0}", project.Name);
+
+            ToolInfo toolInfo = tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            string userFile = projectFile + ".user";
+
+            Helper.DeleteIfExists(projectFile);
+            Helper.DeleteIfExists(userFile);
+        }
+
+        private void CleanSolution(SolutionNode solution)
+        {
+            kernel.Log.Write("Cleaning {0} solution and project files", VersionName, solution.Name);
+
+            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+            string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
+
+            Helper.DeleteIfExists(slnFile);
+            Helper.DeleteIfExists(suoFile);
+
+            foreach (ProjectNode project in solution.Projects)
+            {
+                CleanProject(project);
+            }
+
+            kernel.Log.Write("");
+        }
+
+        #endregion
+
+        #region ITarget Members
+
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Write(Kernel kern)
+        {
+            if (kern == null)
+            {
+                throw new ArgumentNullException("kern");
+            }
+            kernel = kern;
+            foreach (SolutionNode sol in kernel.Solutions)
+            {
+                WriteSolution(sol, true);
+            }
+            kernel = null;
+        }
+
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Clean(Kernel kern)
+        {
+            if (kern == null)
+            {
+                throw new ArgumentNullException("kern");
+            }
+            kernel = kern;
+            foreach (SolutionNode sol in kernel.Solutions)
+            {
+                CleanSolution(sol);
+            }
+            kernel = null;
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Targets/VSVersion.cs b/Prebuild/src/Core/Targets/VSVersion.cs
index 699b5ca..a7434c6 100644
--- a/Prebuild/src/Core/Targets/VSVersion.cs
+++ b/Prebuild/src/Core/Targets/VSVersion.cs
@@ -5,16 +5,16 @@ Copyright (c) 2008-2009 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -25,30 +25,30 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 
 namespace Prebuild.Core.Targets
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum VSVersion
-        {
-                /// <summary>
-                /// Visual Studio 2002 
-                /// </summary>
-                VS70,
-                /// <summary>
-                /// Visual Studio 2003 
-                /// </summary>
-                VS71,
-                /// <summary>
-                /// Visual Studio 2005 
-                /// </summary>
-                VS80,
-                /// <summary>
-                /// Visual Studio 2008 
-                /// </summary>
-                VS90,
-                /// <summary>
-                /// Visual Studio 2010 
-                /// </summary>
-                VS10
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    public enum VSVersion
+    {
+        /// <summary>
+        /// Visual Studio 2002
+        /// </summary>
+        VS70,
+        /// <summary>
+        /// Visual Studio 2003
+        /// </summary>
+        VS71,
+        /// <summary>
+        /// Visual Studio 2005
+        /// </summary>
+        VS80,
+        /// <summary>
+        /// Visual Studio 2008
+        /// </summary>
+        VS90,
+        /// <summary>
+        /// Visual Studio 2010
+        /// </summary>
+        VS10
+    }
 }
diff --git a/Prebuild/src/Core/Targets/XcodeTarget.cs b/Prebuild/src/Core/Targets/XcodeTarget.cs
index 5393cec..d2c86a0 100644
--- a/Prebuild/src/Core/Targets/XcodeTarget.cs
+++ b/Prebuild/src/Core/Targets/XcodeTarget.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (da
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -36,7 +36,7 @@ using Prebuild.Core.Utilities;
 namespace Prebuild.Core.Targets
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [Target("xcode")]
     public class XcodeTarget : ITarget
@@ -282,7 +282,7 @@ namespace Prebuild.Core.Targets
                 }
                 //if (project.Files.GetSubType(file).ToString() != "Code")
                 //{
-                //      ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");                 
+                //      ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
 
                 ss.WriteLine("            </resources>");
                 ss.WriteLine("            <sources failonempty=\"true\">");
diff --git a/Prebuild/src/Core/UnknownLanguageException.cs b/Prebuild/src/Core/UnknownLanguageException.cs
index 607b66c..71fc885 100644
--- a/Prebuild/src/Core/UnknownLanguageException.cs
+++ b/Prebuild/src/Core/UnknownLanguageException.cs
@@ -6,12 +6,12 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -20,44 +20,44 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Prebuild.Core 
+namespace Prebuild.Core
 {
-        /// <summary>
-        /// </summary>
-        [Serializable()]
-        public class UnknownLanguageException : Exception 
-        {
-                /// <summary>
-                /// Basic exception.
-                /// </summary>
-                public UnknownLanguageException() 
-                {
-                }
+    /// <summary>
+    /// </summary>
+    [Serializable()]
+    public class UnknownLanguageException : Exception
+    {
+        /// <summary>
+        /// Basic exception.
+        /// </summary>
+        public UnknownLanguageException()
+        {
+        }
 
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public UnknownLanguageException(string message): base(message)
-                {
-                }
+        /// <summary>
+        /// Exception with specified string
+        /// </summary>
+        /// <param name="message">Exception message</param>
+        public UnknownLanguageException(string message): base(message)
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public UnknownLanguageException(string message, Exception exception) : base(message, exception)
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="exception"></param>
+        public UnknownLanguageException(string message, Exception exception) : base(message, exception)
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected UnknownLanguageException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
-        }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="context"></param>
+        protected UnknownLanguageException(SerializationInfo info, StreamingContext context) : base( info, context )
+        {
+        }
+    }
 }
diff --git a/Prebuild/src/Core/Utilities/CommandLineCollection.cs b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
index 786fa1e..5e6face 100644
--- a/Prebuild/src/Core/Utilities/CommandLineCollection.cs
+++ b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -27,126 +27,126 @@ using System.Collections;
 using System.Collections.Generic;
 
 namespace Prebuild.Core.Utilities
-{    
-        /// <summary>
-        /// The CommandLine class parses and interprets the command-line arguments passed to
-        /// prebuild.
-        /// </summary>
-        public class CommandLineCollection : IEnumerable<KeyValuePair<string, string>>
-        {
-                #region Fields
-
-                // The raw OS arguments
-                private readonly string[] m_RawArgs;
-
-                // Command-line argument storage
-                private readonly Dictionary<string, string> m_Arguments = new Dictionary<string, string>();
-        
-                #endregion
-        
-                #region Constructors
-        
-                /// <summary>
-                /// Create a new CommandLine instance and set some internal variables.
-                /// </summary>
-                public CommandLineCollection(string[] args) 
-                {
-                        m_RawArgs = args;
-                        
-                        Parse();
-                }
-
-                #endregion
-
-                #region Private Methods
-
-                private void Parse() 
-                {
-                        if(m_RawArgs.Length < 1)
-                                return;
-
-                        int idx = 0;
+{
+    /// <summary>
+    /// The CommandLine class parses and interprets the command-line arguments passed to
+    /// prebuild.
+    /// </summary>
+    public class CommandLineCollection : IEnumerable<KeyValuePair<string, string>>
+    {
+        #region Fields
+
+        // The raw OS arguments
+        private readonly string[] m_RawArgs;
+
+        // Command-line argument storage
+        private readonly Dictionary<string, string> m_Arguments = new Dictionary<string, string>();
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Create a new CommandLine instance and set some internal variables.
+        /// </summary>
+        public CommandLineCollection(string[] args)
+        {
+            m_RawArgs = args;
+
+            Parse();
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void Parse()
+        {
+            if(m_RawArgs.Length < 1)
+                return;
+
+            int idx = 0;
             string lastArg = null;
 
-                        while(idx <m_RawArgs.Length) 
-                        {
-                            string arg = m_RawArgs[idx];
-
-                                if(arg.Length > 2 && arg[0] == '/') 
-                                {
-                                        arg = arg.Substring(1);
-                                        lastArg = arg;
-                                        m_Arguments[arg] = "";
-                                } 
-                                else 
-                                {
-                                        if(lastArg != null)
-                                        {
-                                                m_Arguments[lastArg] = arg;
-                                                lastArg = null;
-                                        }
-                                }
-
-                                idx++;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Wases the passed.
-                /// </summary>
-                /// <param name="arg">The arg.</param>
-                /// <returns></returns>
-                public bool WasPassed(string arg)
-                {
-                        return (m_Arguments.ContainsKey(arg));
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets the parameter associated with the command line option
-                /// </summary>
-                /// <remarks>Returns null if option was not specified,
-                /// null string if no parameter was specified, and the value if a parameter was specified</remarks>
-                public string this[string index] 
-                {
-                        get
-                        {
-                            if(m_Arguments.ContainsKey(index))
-                                {
-                                        return (m_Arguments[index]);
-                                }
-                            return null;
-                        }
-                }
-
-                #endregion
-
-                #region IEnumerable Members
-
-                /// <summary>
-                /// Returns an enumerator that can iterate through a collection.
-                /// </summary>
-                /// <returns>
-                /// An <see cref="T:System.Collections.IDictionaryEnumerator"/>
-                /// that can be used to iterate through the collection.
-                /// </returns>
+            while(idx <m_RawArgs.Length)
+            {
+                string arg = m_RawArgs[idx];
+
+                if(arg.Length > 2 && arg[0] == '/')
+                {
+                    arg = arg.Substring(1);
+                    lastArg = arg;
+                    m_Arguments[arg] = "";
+                }
+                else
+                {
+                    if(lastArg != null)
+                    {
+                        m_Arguments[lastArg] = arg;
+                        lastArg = null;
+                    }
+                }
+
+                idx++;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Wases the passed.
+        /// </summary>
+        /// <param name="arg">The arg.</param>
+        /// <returns></returns>
+        public bool WasPassed(string arg)
+        {
+            return (m_Arguments.ContainsKey(arg));
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the parameter associated with the command line option
+        /// </summary>
+        /// <remarks>Returns null if option was not specified,
+        /// null string if no parameter was specified, and the value if a parameter was specified</remarks>
+        public string this[string index]
+        {
+            get
+            {
+                if(m_Arguments.ContainsKey(index))
+                {
+                    return (m_Arguments[index]);
+                }
+                return null;
+            }
+        }
+
+        #endregion
+
+        #region IEnumerable Members
+
+        /// <summary>
+        /// Returns an enumerator that can iterate through a collection.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Collections.IDictionaryEnumerator"/>
+        /// that can be used to iterate through the collection.
+        /// </returns>
         public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-                {
-                    return m_Arguments.GetEnumerator();
-                }
+        {
+            return m_Arguments.GetEnumerator();
+        }
 
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
 
-            #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Utilities/CurrentDirectory.cs b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
index 9624c35..d743d83 100644
--- a/Prebuild/src/Core/Utilities/CurrentDirectory.cs
+++ b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -28,41 +28,41 @@ using System.Collections.Generic;
 
 namespace Prebuild.Core.Utilities
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public class CurrentDirectory
-        {
-                #region Fields
+    /// <summary>
+    ///
+    /// </summary>
+    public class CurrentDirectory
+    {
+        #region Fields
 
-                private readonly Stack<string> m_Stack = new Stack<string>();
+        private readonly Stack<string> m_Stack = new Stack<string>();
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Pushes this instance.
-                /// </summary>
-                public void Push()
-                {
-                        m_Stack.Push(Environment.CurrentDirectory);
-                }
+        /// <summary>
+        /// Pushes this instance.
+        /// </summary>
+        public void Push()
+        {
+            m_Stack.Push(Environment.CurrentDirectory);
+        }
 
-                /// <summary>
-                /// Pops this instance.
-                /// </summary>
-                public void Pop()
-                {
-                        if(m_Stack.Count < 1)
-                        {
-                                return;
-                        }
-            
-                        string cwd = m_Stack.Pop();
-                        Helper.SetCurrentDir(cwd);
-                }
+        /// <summary>
+        /// Pops this instance.
+        /// </summary>
+        public void Pop()
+        {
+            if(m_Stack.Count < 1)
+            {
+                return;
+            }
 
-                #endregion
-        }
+            string cwd = m_Stack.Pop();
+            Helper.SetCurrentDir(cwd);
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Utilities/Helper.cs b/Prebuild/src/Core/Utilities/Helper.cs
index 8c3e968..a440e58 100644
--- a/Prebuild/src/Core/Utilities/Helper.cs
+++ b/Prebuild/src/Core/Utilities/Helper.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -35,541 +35,541 @@ using Prebuild.Core.Nodes;
 
 namespace Prebuild.Core.Utilities
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public class Helper
-        {
-                #region Fields
-
-                static bool checkForOSVariables;
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public static bool CheckForOSVariables
-                {
-                        get
-                        {
-                                return checkForOSVariables;
-                        }
-                        set
-                        {
-                                checkForOSVariables = value;
-                        }
-                }
-
-                #endregion
-        
-                #region Public Methods
-
-                #region String Parsing
-
-                public delegate string StringLookup(string key);
-
-                /// <summary>
-                /// Gets a collection of StringLocationPair objects that represent the matches
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="beforeGroup">The before group.</param>
-                /// <param name="afterGroup">The after group.</param>
-                /// <param name="includeDelimitersInSubstrings">if set to <c>true</c> [include delimiters in substrings].</param>
-                /// <returns></returns>
-                public static StringCollection FindGroups(string target, string beforeGroup, string afterGroup, bool includeDelimitersInSubstrings) 
-                {
-                        if( beforeGroup == null )
-                        {
-                                throw new ArgumentNullException("beforeGroup");
-                        }
-                        if( afterGroup == null )
-                        {
-                                throw new ArgumentNullException("afterGroup");
-                        }
-                        StringCollection results = new StringCollection();
-                        if(target == null || target.Length == 0)
-                        {
-                                return results;
-                        }
-
-                        int beforeMod = 0;
-                        int afterMod = 0;
-                        if(includeDelimitersInSubstrings) 
-                        {
-                                //be sure to not exlude the delims
-                                beforeMod = beforeGroup.Length;
-                                afterMod = afterGroup.Length;
-                        }
-                        int startIndex = 0;
-                        while((startIndex = target.IndexOf(beforeGroup,startIndex)) != -1) {
-                                int endIndex = target.IndexOf(afterGroup,startIndex);//the index of the char after it
-                                if(endIndex == -1)
-                                {
-                                        break;
-                                }
-                                int length = endIndex - startIndex - beforeGroup.Length;//move to the first char in the string
-                                string substring = substring = target.Substring(startIndex + beforeGroup.Length - beforeMod,
-                                        length - afterMod);
-
-                                results.Add(substring);
-                                //results.Add(new StringLocationPair(substring,startIndex));
-                                startIndex = endIndex + 1;
-                                //the Interpolate*() methods will not work if expressions are expandded inside expression due to an optimization
-                                //so start after endIndex
-                                
-                        }
-                        return results;
-                }
-
-                /// <summary>
-                /// Replaces the groups.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="beforeGroup">The before group.</param>
-                /// <param name="afterGroup">The after group.</param>
-                /// <param name="lookup">The lookup.</param>
-                /// <returns></returns>
-                public static string ReplaceGroups(string target, string beforeGroup, string afterGroup, StringLookup lookup) {
-                        if( target == null )
-                        {
-                                throw new ArgumentNullException("target");
-                        }
-                        //int targetLength = target.Length;
-                        StringCollection strings = FindGroups(target,beforeGroup,afterGroup,false);
-                        if( lookup == null )
-                        {
-                                throw new ArgumentNullException("lookup");
-                        }
-                        foreach(string substring in strings) 
-                        {
-                                target = target.Replace(beforeGroup + substring + afterGroup, lookup(substring) );
-                        }
-                        return target;
-                }
-
-                /// <summary>
-                /// Replaces ${var} statements in a string with the corresonding values as detirmined by the lookup delegate
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="lookup">The lookup.</param>
-                /// <returns></returns>
-                public static string InterpolateForVariables(string target, StringLookup lookup) 
-                {
-                        return ReplaceGroups(target, "${" , "}" , lookup);
-                }
-
-                /// <summary>
-                /// Replaces ${var} statements in a string with the corresonding environment variable with name var
-                /// </summary>
-                /// <param name="target"></param>
-                /// <returns></returns>
-                public static string InterpolateForEnvironmentVariables(string target) 
-                {
-                        return InterpolateForVariables(target, new StringLookup(Environment.GetEnvironmentVariable));
-                }
-
-                #endregion
-
-                /// <summary>
-                /// Translates the value.
-                /// </summary>
-                /// <param name="translateType">Type of the translate.</param>
-                /// <param name="translationItem">The translation item.</param>
-                /// <returns></returns>
-                public static object TranslateValue(Type translateType, string translationItem)
-                {
-                        if(translationItem == null)
-                        {
-                                return null;
-                        }
-
-                        try
-                        {
-                                string lowerVal = translationItem.ToLower();
-                                if(translateType == typeof(bool))
-                                {
-                                        return (lowerVal == "true" || lowerVal == "1" || lowerVal == "y" || lowerVal == "yes" || lowerVal == "on");
-                                }
-                                else if(translateType == typeof(int))
-                                {
-                                        return (Int32.Parse(translationItem));
-                                }
-                                else
-                                {
-                                        return translationItem;
-                                }
-                        }
-                        catch(FormatException)
-                        {
-                                return null;
-                        }
-                }
-
-                /// <summary>
-                /// Deletes if exists.
-                /// </summary>
-                /// <param name="file">The file.</param>
-                /// <returns></returns>
-                public static bool DeleteIfExists(string file)
-                {
-                        string resFile = null;
-                        try
-                        {
-                                resFile = ResolvePath(file);
-                        }
-                        catch(ArgumentException)
-                        {
-                                return false;
-                        }
-
-                        if(!File.Exists(resFile))
-                        {
-                                return false;
-                        }
-
-                        File.Delete(resFile);
-                        return true;
-                }
+    /// <summary>
+    ///
+    /// </summary>
+    public class Helper
+    {
+        #region Fields
+
+        static bool checkForOSVariables;
+
+        /// <summary>
+        ///
+        /// </summary>
+        public static bool CheckForOSVariables
+        {
+            get
+            {
+                return checkForOSVariables;
+            }
+            set
+            {
+                checkForOSVariables = value;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        #region String Parsing
+
+        public delegate string StringLookup(string key);
+
+        /// <summary>
+        /// Gets a collection of StringLocationPair objects that represent the matches
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="beforeGroup">The before group.</param>
+        /// <param name="afterGroup">The after group.</param>
+        /// <param name="includeDelimitersInSubstrings">if set to <c>true</c> [include delimiters in substrings].</param>
+        /// <returns></returns>
+        public static StringCollection FindGroups(string target, string beforeGroup, string afterGroup, bool includeDelimitersInSubstrings)
+        {
+            if( beforeGroup == null )
+            {
+                throw new ArgumentNullException("beforeGroup");
+            }
+            if( afterGroup == null )
+            {
+                throw new ArgumentNullException("afterGroup");
+            }
+            StringCollection results = new StringCollection();
+            if(target == null || target.Length == 0)
+            {
+                return results;
+            }
+
+            int beforeMod = 0;
+            int afterMod = 0;
+            if(includeDelimitersInSubstrings)
+            {
+                //be sure to not exlude the delims
+                beforeMod = beforeGroup.Length;
+                afterMod = afterGroup.Length;
+            }
+            int startIndex = 0;
+            while((startIndex = target.IndexOf(beforeGroup,startIndex)) != -1) {
+                int endIndex = target.IndexOf(afterGroup,startIndex);//the index of the char after it
+                if(endIndex == -1)
+                {
+                    break;
+                }
+                int length = endIndex - startIndex - beforeGroup.Length;//move to the first char in the string
+                string substring = substring = target.Substring(startIndex + beforeGroup.Length - beforeMod,
+                    length - afterMod);
+
+                results.Add(substring);
+                //results.Add(new StringLocationPair(substring,startIndex));
+                startIndex = endIndex + 1;
+                //the Interpolate*() methods will not work if expressions are expandded inside expression due to an optimization
+                //so start after endIndex
+
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Replaces the groups.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="beforeGroup">The before group.</param>
+        /// <param name="afterGroup">The after group.</param>
+        /// <param name="lookup">The lookup.</param>
+        /// <returns></returns>
+        public static string ReplaceGroups(string target, string beforeGroup, string afterGroup, StringLookup lookup) {
+            if( target == null )
+            {
+                throw new ArgumentNullException("target");
+            }
+            //int targetLength = target.Length;
+            StringCollection strings = FindGroups(target,beforeGroup,afterGroup,false);
+            if( lookup == null )
+            {
+                throw new ArgumentNullException("lookup");
+            }
+            foreach(string substring in strings)
+            {
+                target = target.Replace(beforeGroup + substring + afterGroup, lookup(substring) );
+            }
+            return target;
+        }
+
+        /// <summary>
+        /// Replaces ${var} statements in a string with the corresonding values as detirmined by the lookup delegate
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="lookup">The lookup.</param>
+        /// <returns></returns>
+        public static string InterpolateForVariables(string target, StringLookup lookup)
+        {
+            return ReplaceGroups(target, "${" , "}" , lookup);
+        }
+
+        /// <summary>
+        /// Replaces ${var} statements in a string with the corresonding environment variable with name var
+        /// </summary>
+        /// <param name="target"></param>
+        /// <returns></returns>
+        public static string InterpolateForEnvironmentVariables(string target)
+        {
+            return InterpolateForVariables(target, new StringLookup(Environment.GetEnvironmentVariable));
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Translates the value.
+        /// </summary>
+        /// <param name="translateType">Type of the translate.</param>
+        /// <param name="translationItem">The translation item.</param>
+        /// <returns></returns>
+        public static object TranslateValue(Type translateType, string translationItem)
+        {
+            if(translationItem == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                string lowerVal = translationItem.ToLower();
+                if(translateType == typeof(bool))
+                {
+                    return (lowerVal == "true" || lowerVal == "1" || lowerVal == "y" || lowerVal == "yes" || lowerVal == "on");
+                }
+                else if(translateType == typeof(int))
+                {
+                    return (Int32.Parse(translationItem));
+                }
+                else
+                {
+                    return translationItem;
+                }
+            }
+            catch(FormatException)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Deletes if exists.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        /// <returns></returns>
+        public static bool DeleteIfExists(string file)
+        {
+            string resFile = null;
+            try
+            {
+                resFile = ResolvePath(file);
+            }
+            catch(ArgumentException)
+            {
+                return false;
+            }
+
+            if(!File.Exists(resFile))
+            {
+                return false;
+            }
+
+            File.Delete(resFile);
+            return true;
+        }
 
         static readonly char seperator = Path.DirectorySeparatorChar;
 
-                // This little gem was taken from the NeL source, thanks guys!
-                /// <summary>
-                /// Makes a relative path
-                /// </summary>
-                /// <param name="startPath">Path to start from</param>
-                /// <param name="endPath">Path to end at</param>
-                /// <returns>Path that will get from startPath to endPath</returns>
-                public static string MakePathRelativeTo(string startPath, string endPath)
-                {
-                        string tmp = NormalizePath(startPath, seperator);
-                        string src = NormalizePath(endPath, seperator);
-                        string prefix = "";
-
-                        while(true)
-                        {
-                                if((String.Compare(tmp, 0, src, 0, tmp.Length) == 0))
-                                {
-                                        string ret;
-                                        int size = tmp.Length;
-                                        if(size == src.Length)
-                                        {
-                                                return "./";
-                                        }
+        // This little gem was taken from the NeL source, thanks guys!
+        /// <summary>
+        /// Makes a relative path
+        /// </summary>
+        /// <param name="startPath">Path to start from</param>
+        /// <param name="endPath">Path to end at</param>
+        /// <returns>Path that will get from startPath to endPath</returns>
+        public static string MakePathRelativeTo(string startPath, string endPath)
+        {
+            string tmp = NormalizePath(startPath, seperator);
+            string src = NormalizePath(endPath, seperator);
+            string prefix = "";
+
+            while(true)
+            {
+                if((String.Compare(tmp, 0, src, 0, tmp.Length) == 0))
+                {
+                    string ret;
+                    int size = tmp.Length;
+                    if(size == src.Length)
+                    {
+                        return "./";
+                    }
                     if((src.Length > tmp.Length) && src[tmp.Length - 1] != seperator)
-                                        {
-                                        }
-                                        else
-                                        {
-                                                ret = prefix + endPath.Substring(size, endPath.Length - size);
-                                                ret = ret.Trim();
+                    {
+                    }
+                    else
+                    {
+                        ret = prefix + endPath.Substring(size, endPath.Length - size);
+                        ret = ret.Trim();
                         if(ret[0] == seperator)
-                                                {
-                                                        ret = "." + ret;
-                                                }
+                        {
+                            ret = "." + ret;
+                        }
 
-                                                return NormalizePath(ret);
-                                        }
-                                        
-                                }
+                        return NormalizePath(ret);
+                    }
 
-                                if(tmp.Length < 2)
-                                {
-                                        break;
-                                }
+                }
+
+                if(tmp.Length < 2)
+                {
+                    break;
+                }
 
                 int lastPos = tmp.LastIndexOf(seperator, tmp.Length - 2);
                 int prevPos = tmp.IndexOf(seperator);
 
-                                if((lastPos == prevPos) || (lastPos == -1))
-                                {
-                                        break;
-                                }
-
-                                tmp = tmp.Substring(0, lastPos + 1);
-                                prefix += ".." + seperator.ToString();
-                        }
-
-                        return endPath;
-                }
-
-                /// <summary>
-                /// Resolves the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string ResolvePath(string path)
-                {
-                        string tmpPath = NormalizePath(path);
-                        if(tmpPath.Length < 1)
-                        {
-                                tmpPath = ".";
-                        }
-            
-                        tmpPath = Path.GetFullPath(tmpPath);
-                        if(!File.Exists(tmpPath) && !Directory.Exists(tmpPath))
-                        {
-                                throw new ArgumentException("Path could not be resolved: " + tmpPath);
-                        }
-
-                        return tmpPath;
-                }
-
-                /// <summary>
-                /// Normalizes the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="separatorCharacter">The separator character.</param>
-                /// <returns></returns>
-                public static string NormalizePath(string path, char separatorCharacter)
-                {
-                        if(path == null || path == "" || path.Length < 1)
-                        {
-                                return "";
-                        }
-
-                        string tmpPath = path.Replace('\\', '/');
-                        tmpPath = tmpPath.Replace('/', separatorCharacter);
-                        return tmpPath;
-                }
-
-                /// <summary>
-                /// Normalizes the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string NormalizePath(string path)
-                {
-                        return NormalizePath(path, Path.DirectorySeparatorChar);
-                }
-        
-                /// <summary>
-                /// Ends the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="separatorCharacter">The separator character.</param>
-                /// <returns></returns>
-                public static string EndPath(string path, char separatorCharacter)
-                {
-                        if(path == null || path == "" || path.Length < 1)
-                        {
-                                return "";
-                        }
-
-                        if(!path.EndsWith(separatorCharacter.ToString()))
-                        {
-                                return (path + separatorCharacter);
-                        }
-
-                        return path;
-                }
-
-                /// <summary>
-                /// Ends the path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <returns></returns>
-                public static string EndPath(string path)
-                {
-                        return EndPath(path, Path.DirectorySeparatorChar);
-                }
-
-                /// <summary>
-                /// Makes the file path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="name">The name.</param>
-                /// <param name="ext">The ext.</param>
-                /// <returns></returns>
-                public static string MakeFilePath(string path, string name, string ext)
-                {
-                        string ret = EndPath(NormalizePath(path));
-            
-                        if( name == null )
-                        {
-                                throw new ArgumentNullException("name");
-                        }
-
-                        ret += name;
-                        if(!name.EndsWith("." + ext))
-                        {
-                                ret += "." + ext;
-                        }
-            
+                if((lastPos == prevPos) || (lastPos == -1))
+                {
+                    break;
+                }
+
+                tmp = tmp.Substring(0, lastPos + 1);
+                prefix += ".." + seperator.ToString();
+            }
+
+            return endPath;
+        }
+
+        /// <summary>
+        /// Resolves the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns></returns>
+        public static string ResolvePath(string path)
+        {
+            string tmpPath = NormalizePath(path);
+            if(tmpPath.Length < 1)
+            {
+                tmpPath = ".";
+            }
+
+            tmpPath = Path.GetFullPath(tmpPath);
+            if(!File.Exists(tmpPath) && !Directory.Exists(tmpPath))
+            {
+                throw new ArgumentException("Path could not be resolved: " + tmpPath);
+            }
+
+            return tmpPath;
+        }
+
+        /// <summary>
+        /// Normalizes the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="separatorCharacter">The separator character.</param>
+        /// <returns></returns>
+        public static string NormalizePath(string path, char separatorCharacter)
+        {
+            if(path == null || path == "" || path.Length < 1)
+            {
+                return "";
+            }
+
+            string tmpPath = path.Replace('\\', '/');
+            tmpPath = tmpPath.Replace('/', separatorCharacter);
+            return tmpPath;
+        }
+
+        /// <summary>
+        /// Normalizes the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns></returns>
+        public static string NormalizePath(string path)
+        {
+            return NormalizePath(path, Path.DirectorySeparatorChar);
+        }
+
+        /// <summary>
+        /// Ends the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="separatorCharacter">The separator character.</param>
+        /// <returns></returns>
+        public static string EndPath(string path, char separatorCharacter)
+        {
+            if(path == null || path == "" || path.Length < 1)
+            {
+                return "";
+            }
+
+            if(!path.EndsWith(separatorCharacter.ToString()))
+            {
+                return (path + separatorCharacter);
+            }
+
+            return path;
+        }
+
+        /// <summary>
+        /// Ends the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns></returns>
+        public static string EndPath(string path)
+        {
+            return EndPath(path, Path.DirectorySeparatorChar);
+        }
+
+        /// <summary>
+        /// Makes the file path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="name">The name.</param>
+        /// <param name="ext">The ext.</param>
+        /// <returns></returns>
+        public static string MakeFilePath(string path, string name, string ext)
+        {
+            string ret = EndPath(NormalizePath(path));
+
+            if( name == null )
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            ret += name;
+            if(!name.EndsWith("." + ext))
+            {
+                ret += "." + ext;
+            }
+
             //foreach(char c in Path.GetInvalidPathChars())
             //{
             //    ret = ret.Replace(c, '_');
             //}
 
-                        return ret;
-                }
-
-                /// <summary>
-                /// Makes the file path.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                /// <param name="name">The name.</param>
-                /// <returns></returns>
-                public static string MakeFilePath(string path, string name)
-                {
-                        string ret = EndPath(NormalizePath(path));
-            
-                        if( name == null )
-                        {
-                                throw new ArgumentNullException("name");
-                        }
-
-                        ret += name;
+            return ret;
+        }
+
+        /// <summary>
+        /// Makes the file path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="name">The name.</param>
+        /// <returns></returns>
+        public static string MakeFilePath(string path, string name)
+        {
+            string ret = EndPath(NormalizePath(path));
+
+            if( name == null )
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            ret += name;
 
             //foreach (char c in Path.GetInvalidPathChars())
             //{
             //    ret = ret.Replace(c, '_');
             //}
 
-                        return ret;
-                }
+            return ret;
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="path"></param>
-                /// <returns></returns>
-                public static string MakeReferencePath(string path)
-                {
-                        string ret = EndPath(NormalizePath(path));
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string MakeReferencePath(string path)
+        {
+            string ret = EndPath(NormalizePath(path));
 
             //foreach (char c in Path.GetInvalidPathChars())
             //{
             //    ret = ret.Replace(c, '_');
             //}
 
-                        return ret;
-                }
-
-                /// <summary>
-                /// Sets the current dir.
-                /// </summary>
-                /// <param name="path">The path.</param>
-                public static void SetCurrentDir(string path)
-                {
-                        if( path == null )
-                        {
-                                throw new ArgumentNullException("path");
-                        }
-                        if(path.Length < 1)
-                        {
-                                return;
-                        }
-
-                        Environment.CurrentDirectory = path;
-                }
-
-                /// <summary>
-                /// Checks the type.
-                /// </summary>
-                /// <param name="typeToCheck">The type to check.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="inter">The inter.</param>
-                /// <returns></returns>
-                public static object CheckType(Type typeToCheck, Type attr, Type inter)
-                {
-                        if(typeToCheck == null || attr == null)
-                        {
-                                return null;
-                        }
-
-                        object[] attrs = typeToCheck.GetCustomAttributes(attr, false);
-                        if(attrs == null || attrs.Length < 1)
-                        {
-                                return null;
-                        }
-                        if( inter == null )
-                        {
-                                throw new ArgumentNullException("inter");
-                        }
-
-                        if(typeToCheck.GetInterface(inter.FullName) == null)
-                        {
-                                return null;
-                        }
-
-                        return attrs[0];
-                }
-
-                /// <summary>
-                /// Attributes the value.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="def">The def.</param>
-                /// <returns></returns>
-                public static string AttributeValue(XmlNode node, string attr, string def)
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(node.Attributes[attr] == null)
-                        {
-                                return def;
-                        }
-                        string val = node.Attributes[attr].Value;
-                        if(!CheckForOSVariables)
-                        {
-                                return val;
-                        }
-
-                        return InterpolateForEnvironmentVariables(val);
-                }
-
-                /// <summary>
-                /// Parses the boolean.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="defaultValue">if set to <c>true</c> [default value].</param>
-                /// <returns></returns>
-                public static bool ParseBoolean(XmlNode node, string attr, bool defaultValue) 
-                {
-                        if( node == null )
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        if(node.Attributes[attr] == null)
-                        {
-                                return defaultValue;
-                        }
-                        return bool.Parse(node.Attributes[attr].Value);
-                }
-
-                /// <summary>
-                /// Enums the attribute value.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                /// <param name="attr">The attr.</param>
-                /// <param name="enumType">Type of the enum.</param>
-                /// <param name="def">The def.</param>
-                /// <returns></returns>
-                public static object EnumAttributeValue(XmlNode node, string attr, Type enumType, object def)
-                {
-                        if( def == null )
-                        {
-                                throw new ArgumentNullException("def");
-                        }
-                        string val = AttributeValue(node, attr, def.ToString());
-                        return Enum.Parse(enumType, val, true);
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="assemblyName"></param>
-                /// <param name="projectType"></param>
-                /// <returns></returns>
-                public static string AssemblyFullName(string assemblyName, ProjectType projectType)
-                {
-                        return assemblyName + (projectType == ProjectType.Library ? ".dll" : ".exe");
-                }
-
-                #endregion
-        }
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the current dir.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        public static void SetCurrentDir(string path)
+        {
+            if( path == null )
+            {
+                throw new ArgumentNullException("path");
+            }
+            if(path.Length < 1)
+            {
+                return;
+            }
+
+            Environment.CurrentDirectory = path;
+        }
+
+        /// <summary>
+        /// Checks the type.
+        /// </summary>
+        /// <param name="typeToCheck">The type to check.</param>
+        /// <param name="attr">The attr.</param>
+        /// <param name="inter">The inter.</param>
+        /// <returns></returns>
+        public static object CheckType(Type typeToCheck, Type attr, Type inter)
+        {
+            if(typeToCheck == null || attr == null)
+            {
+                return null;
+            }
+
+            object[] attrs = typeToCheck.GetCustomAttributes(attr, false);
+            if(attrs == null || attrs.Length < 1)
+            {
+                return null;
+            }
+            if( inter == null )
+            {
+                throw new ArgumentNullException("inter");
+            }
+
+            if(typeToCheck.GetInterface(inter.FullName) == null)
+            {
+                return null;
+            }
+
+            return attrs[0];
+        }
+
+        /// <summary>
+        /// Attributes the value.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        /// <param name="attr">The attr.</param>
+        /// <param name="def">The def.</param>
+        /// <returns></returns>
+        public static string AttributeValue(XmlNode node, string attr, string def)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+            if(node.Attributes[attr] == null)
+            {
+                return def;
+            }
+            string val = node.Attributes[attr].Value;
+            if(!CheckForOSVariables)
+            {
+                return val;
+            }
+
+            return InterpolateForEnvironmentVariables(val);
+        }
+
+        /// <summary>
+        /// Parses the boolean.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        /// <param name="attr">The attr.</param>
+        /// <param name="defaultValue">if set to <c>true</c> [default value].</param>
+        /// <returns></returns>
+        public static bool ParseBoolean(XmlNode node, string attr, bool defaultValue)
+        {
+            if( node == null )
+            {
+                throw new ArgumentNullException("node");
+            }
+            if(node.Attributes[attr] == null)
+            {
+                return defaultValue;
+            }
+            return bool.Parse(node.Attributes[attr].Value);
+        }
+
+        /// <summary>
+        /// Enums the attribute value.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        /// <param name="attr">The attr.</param>
+        /// <param name="enumType">Type of the enum.</param>
+        /// <param name="def">The def.</param>
+        /// <returns></returns>
+        public static object EnumAttributeValue(XmlNode node, string attr, Type enumType, object def)
+        {
+            if( def == null )
+            {
+                throw new ArgumentNullException("def");
+            }
+            string val = AttributeValue(node, attr, def.ToString());
+            return Enum.Parse(enumType, val, true);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="assemblyName"></param>
+        /// <param name="projectType"></param>
+        /// <returns></returns>
+        public static string AssemblyFullName(string assemblyName, ProjectType projectType)
+        {
+            return assemblyName + (projectType == ProjectType.Library ? ".dll" : ".exe");
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/Utilities/Log.cs b/Prebuild/src/Core/Utilities/Log.cs
index 4df3def..cd95633 100644
--- a/Prebuild/src/Core/Utilities/Log.cs
+++ b/Prebuild/src/Core/Utilities/Log.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -28,74 +28,74 @@ using System.IO;
 
 namespace Prebuild.Core.Utilities
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        public enum LogType
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None,
-                /// <summary>
-                /// 
-                /// </summary>
-                Info,
-                /// <summary>
-                /// 
-                /// </summary>
-                Warning,
-                /// <summary>
-                /// 
-                /// </summary>
-                Error
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    public enum LogType
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        None,
+        /// <summary>
+        ///
+        /// </summary>
+        Info,
+        /// <summary>
+        ///
+        /// </summary>
+        Warning,
+        /// <summary>
+        ///
+        /// </summary>
+        Error
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [Flags]
-        public enum LogTargets
-        {
-                /// <summary>
-                /// 
-                /// </summary>
-                None = 0,
-                /// <summary>
-                /// 
-                /// </summary>
-                Null = 1,
-                /// <summary>
-                /// 
-                /// </summary>
-                File = 2,
-                /// <summary>
-                /// 
-                /// </summary>
-                Console = 4
-        }
+    /// <summary>
+    ///
+    /// </summary>
+    [Flags]
+    public enum LogTargets
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        None = 0,
+        /// <summary>
+        ///
+        /// </summary>
+        Null = 1,
+        /// <summary>
+        ///
+        /// </summary>
+        File = 2,
+        /// <summary>
+        ///
+        /// </summary>
+        Console = 4
+    }
 
-        /// <summary>
-        /// Summary description for Log.
-        /// </summary>
-        public class Log : IDisposable
-        {
-                #region Fields
+    /// <summary>
+    /// Summary description for Log.
+    /// </summary>
+    public class Log : IDisposable
+    {
+        #region Fields
 
-                private TextWriter m_Writer;
-                private LogTargets m_Target = LogTargets.Null;
-                bool disposed;
+        private TextWriter m_Writer;
+        private LogTargets m_Target = LogTargets.Null;
+        bool disposed;
 
-                #endregion
+        #endregion
 
-                #region Constructors
+        #region Constructors
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="Log"/> class.
-                /// </summary>
-                /// <param name="target">The target.</param>
-                /// <param name="fileName">Name of the file.</param>
-                public Log(LogTargets target, string fileName)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Log"/> class.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="fileName">Name of the file.</param>
+        public Log(LogTargets target, string fileName)
         {
             m_Target = target;
 
@@ -111,166 +111,166 @@ namespace Prebuild.Core.Utilities
             }
         }
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                /// <summary>
-                /// Writes this instance.
-                /// </summary>
-                public void Write() 
-                {
-                        Write(string.Empty);
-                }
+        /// <summary>
+        /// Writes this instance.
+        /// </summary>
+        public void Write()
+        {
+            Write(string.Empty);
+        }
 
-                /// <summary>
-                /// Writes the specified MSG.
-                /// </summary>
-                /// <param name="msg">The MSG.</param>
-                public void Write(string msg) 
-                {
-                        if((m_Target & LogTargets.Null) != 0)
-                        {
-                                return;
-                        }
+        /// <summary>
+        /// Writes the specified MSG.
+        /// </summary>
+        /// <param name="msg">The MSG.</param>
+        public void Write(string msg)
+        {
+            if((m_Target & LogTargets.Null) != 0)
+            {
+                return;
+            }
 
-                        if((m_Target & LogTargets.Console) != 0)
-                        {
-                                Console.WriteLine(msg);
-                        }
-                        if((m_Target & LogTargets.File) != 0 && m_Writer != null)
-                        {
-                                m_Writer.WriteLine(msg);
-                        }
-                }
+            if((m_Target & LogTargets.Console) != 0)
+            {
+                Console.WriteLine(msg);
+            }
+            if((m_Target & LogTargets.File) != 0 && m_Writer != null)
+            {
+                m_Writer.WriteLine(msg);
+            }
+        }
 
-                /// <summary>
-                /// Writes the specified format.
-                /// </summary>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public void Write(string format, params object[] args)
-                {
-                        Write(string.Format(format,args));
-                }
+        /// <summary>
+        /// Writes the specified format.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <param name="args">The args.</param>
+        public void Write(string format, params object[] args)
+        {
+            Write(string.Format(format,args));
+        }
 
-                /// <summary>
-                /// Writes the specified type.
-                /// </summary>
-                /// <param name="type">The type.</param>
-                /// <param name="format">The format.</param>
-                /// <param name="args">The args.</param>
-                public void Write(LogType type, string format, params object[] args)
-                {
-                        if((m_Target & LogTargets.Null) != 0)
-                        {
-                                return;
-                        }
+        /// <summary>
+        /// Writes the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="format">The format.</param>
+        /// <param name="args">The args.</param>
+        public void Write(LogType type, string format, params object[] args)
+        {
+            if((m_Target & LogTargets.Null) != 0)
+            {
+                return;
+            }
 
-                        string str = "";
-                        switch(type) 
-                        {
-                                case LogType.Info:
-                                        str = "[I] "; 
-                                        break;
-                                case LogType.Warning:
-                                        str = "[!] "; 
-                                        break;
-                                case LogType.Error:
-                                        str = "[X] "; 
-                                        break;
-                        }
+            string str = "";
+            switch(type)
+            {
+                case LogType.Info:
+                    str = "[I] ";
+                    break;
+                case LogType.Warning:
+                    str = "[!] ";
+                    break;
+                case LogType.Error:
+                    str = "[X] ";
+                    break;
+            }
 
-                        Write(str + format,args);
-                }
+            Write(str + format,args);
+        }
 
-                /// <summary>
-                /// Writes the exception.
-                /// </summary>
-                /// <param name="type">The type.</param>
-                /// <param name="ex">The ex.</param>
-                public void WriteException(LogType type, Exception ex)
-                {
-                        if(ex != null)
-                        {
-                                Write(type, ex.Message);
-                                //#if DEBUG
-                                m_Writer.WriteLine("Exception @{0} stack trace [[", ex.TargetSite.Name);
-                                m_Writer.WriteLine(ex.StackTrace);
-                                m_Writer.WriteLine("]]");
-                                //#endif
-                        }
-                }
+        /// <summary>
+        /// Writes the exception.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="ex">The ex.</param>
+        public void WriteException(LogType type, Exception ex)
+        {
+            if(ex != null)
+            {
+                Write(type, ex.Message);
+                //#if DEBUG
+                m_Writer.WriteLine("Exception @{0} stack trace [[", ex.TargetSite.Name);
+                m_Writer.WriteLine(ex.StackTrace);
+                m_Writer.WriteLine("]]");
+                //#endif
+            }
+        }
 
-                /// <summary>
-                /// Flushes this instance.
-                /// </summary>
-                public void Flush()
-                {
-                        if(m_Writer != null)
-                        {
-                                m_Writer.Flush();
-                        }
-                }
+        /// <summary>
+        /// Flushes this instance.
+        /// </summary>
+        public void Flush()
+        {
+            if(m_Writer != null)
+            {
+                m_Writer.Flush();
+            }
+        }
 
-                #endregion
+        #endregion
 
-                #region IDisposable Members
+        #region IDisposable Members
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or
+        /// resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
 
-                /// <summary>
-                /// Performs application-defined tasks associated with freeing, releasing, or
-                /// resetting unmanaged resources.
-                /// </summary>
-                public void Dispose()
-                {
-                        Dispose(true);
-                        GC.SuppressFinalize(this);
-                }
+        /// <summary>
+        /// Dispose objects
+        /// </summary>
+        /// <param name="disposing">
+        /// If true, it will dispose close the handle
+        /// </param>
+        /// <remarks>
+        /// Will dispose managed and unmanaged resources.
+        /// </remarks>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!this.disposed)
+            {
+                if (disposing)
+                {
+                    if (m_Writer != null)
+                    {
+                        m_Writer.Close();
+                        m_Writer = null;
+                    }
+                }
+            }
+            this.disposed = true;
+        }
 
-                /// <summary>
-                /// Dispose objects
-                /// </summary>
-                /// <param name="disposing">
-                /// If true, it will dispose close the handle
-                /// </param>
-                /// <remarks>
-                /// Will dispose managed and unmanaged resources.
-                /// </remarks>
-                protected virtual void Dispose(bool disposing)
-                {
-                        if (!this.disposed)
-                        {
-                                if (disposing)
-                                {
-                                        if (m_Writer != null)
-                                        {
-                                                m_Writer.Close();
-                                                m_Writer = null;
-                                        }
-                                }
-                        }
-                        this.disposed = true;
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        ~Log()
+        {
+            this.Dispose(false);
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                ~Log()
-                {
-                        this.Dispose(false);
-                }
-                
-                /// <summary>
-                /// Closes and destroys this object
-                /// </summary>
-                /// <remarks>
-                /// Same as Dispose(true)
-                /// </remarks>
-                public void Close() 
-                {
-                        Dispose();
-                }
+        /// <summary>
+        /// Closes and destroys this object
+        /// </summary>
+        /// <remarks>
+        /// Same as Dispose(true)
+        /// </remarks>
+        public void Close()
+        {
+            Dispose();
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Core/WarningException.cs b/Prebuild/src/Core/WarningException.cs
index b7c3668..721f43d 100644
--- a/Prebuild/src/Core/WarningException.cs
+++ b/Prebuild/src/Core/WarningException.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 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. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
+* 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.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -28,57 +28,57 @@ using System.Runtime.Serialization;
 
 namespace Prebuild.Core
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Serializable]
-        public class WarningException : Exception
-        {
-                #region Constructors
+    /// <summary>
+    ///
+    /// </summary>
+    [Serializable]
+    public class WarningException : Exception
+    {
+        #region Constructors
 
-                /// <summary>
-                /// 
-                /// </summary>
-                public WarningException()
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        public WarningException()
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="format"></param>
-                /// <param name="args"></param>
-                public WarningException(string format, params object[] args)
-                        : base(String.Format(format, args))
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="format"></param>
+        /// <param name="args"></param>
+        public WarningException(string format, params object[] args)
+            : base(String.Format(format, args))
+        {
+        }
 
-                /// <summary>
-                /// Exception with specified string
-                /// </summary>
-                /// <param name="message">Exception message</param>
-                public WarningException(string message): base(message)
-                {
-                }
+        /// <summary>
+        /// Exception with specified string
+        /// </summary>
+        /// <param name="message">Exception message</param>
+        public WarningException(string message): base(message)
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="message"></param>
-                /// <param name="exception"></param>
-                public WarningException(string message, Exception exception) : base(message, exception)
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="exception"></param>
+        public WarningException(string message, Exception exception) : base(message, exception)
+        {
+        }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="info"></param>
-                /// <param name="context"></param>
-                protected WarningException(SerializationInfo info, StreamingContext context) : base( info, context )
-                {
-                }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="context"></param>
+        protected WarningException(SerializationInfo info, StreamingContext context) : base( info, context )
+        {
+        }
 
-                #endregion
-        }
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Prebuild.cs b/Prebuild/src/Prebuild.cs
index 35a5dfa..996dea0 100644
--- a/Prebuild/src/Prebuild.cs
+++ b/Prebuild/src/Prebuild.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005	Matthew	Holmes (matthew@wildfiregames.com),	Dan	Moorehea
 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. 
-* The name of the author may not be     used to endorse or promote products     derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,     
-BUT     NOT     LIMITED TO,     THE     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* 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.
+* The name of the author may not be     used to endorse or promote products     derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
@@ -42,50 +42,50 @@ using System.EnterpriseServices.Internal;
 using Prebuild.Core;
 using Prebuild.Core.Utilities;
 
-namespace Prebuild 
+namespace Prebuild
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        class Prebuild
-        {
-                #region Main
-
-                [STAThread]
-                static void     Main(string[] args)     
-                {
-                        Kernel  kernel = null;
-                        try     
-                        {
-                                kernel = Kernel.Instance;
-                                kernel.Initialize(LogTargets.File | LogTargets.Console, args);
-                                bool exit =     false;
-
-                                if(kernel.CommandLine.WasPassed("usage")) 
-                                {
-                                        exit = true;
-                                        OutputUsage();
-                                }
-                                if(kernel.CommandLine.WasPassed("showtargets")) 
-                                {
-                                        exit = true;
-                                        OutputTargets(kernel);
-                                }
-                                if(kernel.CommandLine.WasPassed("install")) 
-                                {
-                                        exit = true;
-                                        InstallAssembly(kernel);
-                                }
-                                if(kernel.CommandLine.WasPassed("remove")) 
-                                {
-                                        exit = true;
-                                        RemoveAssembly(kernel);
-                                }
-
-                                if(!exit)
-                                {
-                                        kernel.Process();
-                                }
+    /// <summary>
+    ///
+    /// </summary>
+    class Prebuild
+    {
+        #region Main
+
+        [STAThread]
+        static void     Main(string[] args)
+        {
+            Kernel      kernel = null;
+            try
+            {
+                kernel = Kernel.Instance;
+                kernel.Initialize(LogTargets.File | LogTargets.Console, args);
+                bool exit =     false;
+
+                if(kernel.CommandLine.WasPassed("usage"))
+                {
+                    exit = true;
+                    OutputUsage();
+                }
+                if(kernel.CommandLine.WasPassed("showtargets"))
+                {
+                    exit = true;
+                    OutputTargets(kernel);
+                }
+                if(kernel.CommandLine.WasPassed("install"))
+                {
+                    exit = true;
+                    InstallAssembly(kernel);
+                }
+                if(kernel.CommandLine.WasPassed("remove"))
+                {
+                    exit = true;
+                    RemoveAssembly(kernel);
+                }
+
+                if(!exit)
+                {
+                    kernel.Process();
+                }
             }
 #if !DEBUG
             catch (Exception ex)
@@ -96,70 +96,70 @@ namespace Prebuild
 #endif
             finally
             {
-                                if(kernel != null && kernel.PauseAfterFinish)   
-                                {
-                                        Console.WriteLine("\nPress enter to continue...");
-                                        Console.ReadLine();
-                                }
-                        }
-                }
-
-                #endregion
-
-                #region Private Methods
-
-                private static void InstallAssembly(Kernel kernel)
-                {
-                        Publish publish = new Publish();
-                        string file = kernel.CommandLine["install"];
+                if(kernel != null && kernel.PauseAfterFinish)
+                {
+                    Console.WriteLine("\nPress enter to continue...");
+                    Console.ReadLine();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private static void InstallAssembly(Kernel kernel)
+        {
+            Publish publish = new Publish();
+            string file = kernel.CommandLine["install"];
             //Console.WriteLine(".."+file+"..");
-                        publish.GacInstall(file);
-                }
-
-                private static void RemoveAssembly(Kernel kernel)
-                {
-                        Publish publish = new Publish();
-                        string file = kernel.CommandLine["remove"];
-                        publish.GacRemove(file);
-                }
-
-                private static void     OutputUsage() 
-                {
-                        Console.WriteLine("Usage: prebuild /target <target> [options]");
-                        Console.WriteLine("Available command-line switches:");
-                        Console.WriteLine();
-                        Console.WriteLine("/target          Target for Prebuild");
-                        Console.WriteLine("/clean           Clean the build files for the given target");
-                        Console.WriteLine("/file            XML file to process");
-                        Console.WriteLine("/log             Log file to write to");
-                        Console.WriteLine("/ppo             Pre-process the file, but perform no other processing");
-                        Console.WriteLine("/pause           Pauses the application after execution to view the output");
-                        Console.WriteLine("/yes             Default to yes to any questions asked");
-                        Console.WriteLine("/install         Install assembly into the GAC");
-                        Console.WriteLine("/remove          Remove assembly from the GAC");
-                        Console.WriteLine();
-                        Console.WriteLine("See 'prebuild /showtargets for a list of available targets");
-                        Console.WriteLine("See readme.txt or check out http://dnpb.sourceforge.net for more information");
-                        Console.WriteLine();
-                }
-
-                private static void     OutputTargets(Kernel kern)
-                {
-                        Console.WriteLine("Targets available in Prebuild:");
-                        Console.WriteLine("");
-                        if(kern.Targets.Keys.Count > 0)
-                        {
-                                string[] targs = new string[kern.Targets.Keys.Count];
-                                kern.Targets.Keys.CopyTo(targs, 0);
-                                Array.Sort(targs);
-                                foreach(string target in targs)
-                                {
-                                        Console.WriteLine(target);
-                                }
-                        }
-                        Console.WriteLine("");
-                }
-                
-                #endregion
-        }
+            publish.GacInstall(file);
+        }
+
+        private static void RemoveAssembly(Kernel kernel)
+        {
+            Publish publish = new Publish();
+            string file = kernel.CommandLine["remove"];
+            publish.GacRemove(file);
+        }
+
+        private static void     OutputUsage()
+        {
+            Console.WriteLine("Usage: prebuild /target <target> [options]");
+            Console.WriteLine("Available command-line switches:");
+            Console.WriteLine();
+            Console.WriteLine("/target          Target for Prebuild");
+            Console.WriteLine("/clean           Clean the build files for the given target");
+            Console.WriteLine("/file            XML file to process");
+            Console.WriteLine("/log             Log file to write to");
+            Console.WriteLine("/ppo             Pre-process the file, but perform no other processing");
+            Console.WriteLine("/pause           Pauses the application after execution to view the output");
+            Console.WriteLine("/yes             Default to yes to any questions asked");
+            Console.WriteLine("/install         Install assembly into the GAC");
+            Console.WriteLine("/remove          Remove assembly from the GAC");
+            Console.WriteLine();
+            Console.WriteLine("See 'prebuild /showtargets for a list of available targets");
+            Console.WriteLine("See readme.txt or check out http://dnpb.sourceforge.net for more information");
+            Console.WriteLine();
+        }
+
+        private static void     OutputTargets(Kernel kern)
+        {
+            Console.WriteLine("Targets available in Prebuild:");
+            Console.WriteLine("");
+            if(kern.Targets.Keys.Count > 0)
+            {
+                string[] targs = new string[kern.Targets.Keys.Count];
+                kern.Targets.Keys.CopyTo(targs, 0);
+                Array.Sort(targs);
+                foreach(string target in targs)
+                {
+                    Console.WriteLine(target);
+                }
+            }
+            Console.WriteLine("");
+        }
+
+        #endregion
+    }
 }
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index 013743d..f9d90bb 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -52,7 +52,7 @@ using System.Resources;
 [assembly: CLSCompliant(true)]
 
 //
-// 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.
 //
@@ -77,34 +77,34 @@ using System.Resources;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Revision and Build Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
 //
-// In order to sign your assembly you must specify a key to use. Refer to the 
+// In order to sign your assembly you must specify a key to use. Refer to the
 // Microsoft .NET Framework documentation for more information on assembly signing.
 //
-// Use the attributes below to control which key is used for signing. 
+// Use the attributes below to control which key is used for signing.
 //
-// Notes: 
+// Notes:
 //   (*) If no key is specified, the assembly is not signed.
 //   (*) KeyName refers to a key that has been installed in the Crypto Service
 //       Provider (CSP) on your machine. KeyFile refers to a file which contains
 //       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
+//   (*) If the KeyFile and the KeyName values are both specified, the
 //       following processing occurs:
 //       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
 //           in the KeyFile is installed into the CSP and used.
 //   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
 //       When specifying the KeyFile, the location of the KeyFile should be
 //       relative to the project output directory which is
 //       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
+//       located in the project directory, you would specify the AssemblyKeyFile
 //       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
diff --git a/ThirdParty/SmartThreadPool/CallerThreadContext.cs b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
index e63add5..925c39b 100644
--- a/ThirdParty/SmartThreadPool/CallerThreadContext.cs
+++ b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
@@ -13,125 +13,125 @@ namespace Amib.Threading.Internal
 {
 #region CallerThreadContext class
 
-        /// <summary>
-        /// This class stores the caller call context in order to restore
-        /// it when the work item is executed in the thread pool environment. 
-        /// </summary>
-        internal class CallerThreadContext 
-        {
+    /// <summary>
+    /// This class stores the caller call context in order to restore
+    /// it when the work item is executed in the thread pool environment.
+    /// </summary>
+    internal class CallerThreadContext
+    {
 #region Prepare reflection information
 
-                // Cached type information.
-                private static readonly MethodInfo getLogicalCallContextMethodInfo =
-                        typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+        // Cached type information.
+        private static readonly MethodInfo getLogicalCallContextMethodInfo =
+            typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
 
-                private static readonly MethodInfo setLogicalCallContextMethodInfo =
-                        typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+        private static readonly MethodInfo setLogicalCallContextMethodInfo =
+            typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
 
-                private static string HttpContextSlotName = GetHttpContextSlotName();
+        private static string HttpContextSlotName = GetHttpContextSlotName();
 
-                private static string GetHttpContextSlotName()
-                {
-                        FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
+        private static string GetHttpContextSlotName()
+        {
+            FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
 
             if (fi != null)
             {
                 return (string) fi.GetValue(null);
             }
 
-                    return "HttpContext";
-                }
+            return "HttpContext";
+        }
 
         #endregion
 
 #region Private fields
 
-                private HttpContext _httpContext;
-                private LogicalCallContext _callContext;
+        private HttpContext _httpContext;
+        private LogicalCallContext _callContext;
 
         #endregion
 
-                /// <summary>
-                /// Constructor
-                /// </summary>
-                private CallerThreadContext()
-                {
-                }
-
-                public bool CapturedCallContext
-                {
-                        get
-                        {
-                                return (null != _callContext);
-                        }
-                }
-
-                public bool CapturedHttpContext
-                {
-                        get
-                        {
-                                return (null != _httpContext);
-                        }
-                }
-
-                /// <summary>
-                /// Captures the current thread context
-                /// </summary>
-                /// <returns></returns>
-                public static CallerThreadContext Capture(
-                        bool captureCallContext, 
-                        bool captureHttpContext)
-                {
-                        Debug.Assert(captureCallContext || captureHttpContext);
-
-                        CallerThreadContext callerThreadContext = new CallerThreadContext();
-
-                        // TODO: In NET 2.0, redo using the new feature of ExecutionContext class - Capture()
-                        // Capture Call Context
-                        if(captureCallContext && (getLogicalCallContextMethodInfo != null))
-                        {
-                                callerThreadContext._callContext = (LogicalCallContext)getLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, null);
-                                if (callerThreadContext._callContext != null)
-                                {
-                                        callerThreadContext._callContext = (LogicalCallContext)callerThreadContext._callContext.Clone();
-                                }
-                        }
-
-                        // Capture httpContext
-                        if (captureHttpContext && (null != HttpContext.Current))
-                        {
-                                callerThreadContext._httpContext = HttpContext.Current;
-                        }
-
-                        return callerThreadContext;
-                }
-
-                /// <summary>
-                /// Applies the thread context stored earlier
-                /// </summary>
-                /// <param name="callerThreadContext"></param>
-                public static void Apply(CallerThreadContext callerThreadContext)
-                {
-                        if (null == callerThreadContext) 
-                        {
-                                throw new ArgumentNullException("callerThreadContext");                 
-                        }
-
-                        // Todo: In NET 2.0, redo using the new feature of ExecutionContext class - Run()
-                        // Restore call context
-                        if ((callerThreadContext._callContext != null) && (setLogicalCallContextMethodInfo != null))
-                        {
-                                setLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, new object[] { callerThreadContext._callContext });
-                        }
-
-                        // Restore HttpContext 
-                        if (callerThreadContext._httpContext != null)
-                        {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        private CallerThreadContext()
+        {
+        }
+
+        public bool CapturedCallContext
+        {
+            get
+            {
+                return (null != _callContext);
+            }
+        }
+
+        public bool CapturedHttpContext
+        {
+            get
+            {
+                return (null != _httpContext);
+            }
+        }
+
+        /// <summary>
+        /// Captures the current thread context
+        /// </summary>
+        /// <returns></returns>
+        public static CallerThreadContext Capture(
+            bool captureCallContext,
+            bool captureHttpContext)
+        {
+            Debug.Assert(captureCallContext || captureHttpContext);
+
+            CallerThreadContext callerThreadContext = new CallerThreadContext();
+
+            // TODO: In NET 2.0, redo using the new feature of ExecutionContext class - Capture()
+            // Capture Call Context
+            if(captureCallContext && (getLogicalCallContextMethodInfo != null))
+            {
+                callerThreadContext._callContext = (LogicalCallContext)getLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, null);
+                if (callerThreadContext._callContext != null)
+                {
+                    callerThreadContext._callContext = (LogicalCallContext)callerThreadContext._callContext.Clone();
+                }
+            }
+
+            // Capture httpContext
+            if (captureHttpContext && (null != HttpContext.Current))
+            {
+                callerThreadContext._httpContext = HttpContext.Current;
+            }
+
+            return callerThreadContext;
+        }
+
+        /// <summary>
+        /// Applies the thread context stored earlier
+        /// </summary>
+        /// <param name="callerThreadContext"></param>
+        public static void Apply(CallerThreadContext callerThreadContext)
+        {
+            if (null == callerThreadContext)
+            {
+                throw new ArgumentNullException("callerThreadContext");
+            }
+
+            // Todo: In NET 2.0, redo using the new feature of ExecutionContext class - Run()
+            // Restore call context
+            if ((callerThreadContext._callContext != null) && (setLogicalCallContextMethodInfo != null))
+            {
+                setLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, new object[] { callerThreadContext._callContext });
+            }
+
+            // Restore HttpContext
+            if (callerThreadContext._httpContext != null)
+            {
                 HttpContext.Current = callerThreadContext._httpContext;
-                                //CallContext.SetData(HttpContextSlotName, callerThreadContext._httpContext);
-                        }
-                }
-        }
+                //CallContext.SetData(HttpContextSlotName, callerThreadContext._httpContext);
+            }
+        }
+    }
 
     #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/EventWaitHandle.cs b/ThirdParty/SmartThreadPool/EventWaitHandle.cs
index 25be07a..b7983cd 100644
--- a/ThirdParty/SmartThreadPool/EventWaitHandle.cs
+++ b/ThirdParty/SmartThreadPool/EventWaitHandle.cs
@@ -36,34 +36,34 @@ namespace Amib.Threading.Internal
             return waitHandle.WaitOne(millisecondsTimeout, exitContext);
         }
 
-            private static IntPtr[] PrepareNativeHandles(WaitHandle[] waitHandles)
-            {
-                IntPtr[] nativeHandles = new IntPtr[waitHandles.Length];
-                for (int i = 0; i < waitHandles.Length; i++)
-                {
+        private static IntPtr[] PrepareNativeHandles(WaitHandle[] waitHandles)
+        {
+            IntPtr[] nativeHandles = new IntPtr[waitHandles.Length];
+            for (int i = 0; i < waitHandles.Length; i++)
+            {
                 nativeHandles[i] = waitHandles[i].Handle;
-                }
-                return nativeHandles;
-            }
+            }
+            return nativeHandles;
+        }
 
-            public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
-            {
+        public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
             uint timeout = millisecondsTimeout < 0 ? INFINITE : (uint)millisecondsTimeout;
 
             IntPtr[] nativeHandles = PrepareNativeHandles(waitHandles);
 
-                int result = WaitForMultipleObjects((uint)waitHandles.Length, nativeHandles, true, timeout);
+            int result = WaitForMultipleObjects((uint)waitHandles.Length, nativeHandles, true, timeout);
 
             if (result == WAIT_TIMEOUT || result == WAIT_FAILED)
             {
                 return false;
             }
 
-                return true;
-            }
+            return true;
+        }
 
 
-            public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
         {
             uint timeout = millisecondsTimeout < 0 ? INFINITE : (uint)millisecondsTimeout;
 
@@ -90,7 +90,7 @@ namespace Amib.Threading.Internal
 
             return WaitAny(waitHandles, millisecondsTimeout, false);
         }
- 
+
         #endregion
 
         #region External methods
diff --git a/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs b/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
index 3c9c849..ece24de 100644
--- a/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
+++ b/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
@@ -10,7 +10,7 @@ namespace Amib.Threading.Internal
     /// <summary>
     /// EventWaitHandleFactory class.
     /// This is a static class that creates AutoResetEvent and ManualResetEvent objects.
-    /// In WindowCE the WaitForMultipleObjects API fails to use the Handle property 
+    /// In WindowCE the WaitForMultipleObjects API fails to use the Handle property
     /// of XxxResetEvent. It can use only handles that were created by the CreateEvent API.
     /// Consequently this class creates the needed XxxResetEvent and replaces the handle if
     /// it's a WindowsCE OS.
@@ -57,7 +57,7 @@ namespace Amib.Threading.Internal
         /// <param name="initialState">The initial state of the event</param>
         private static void ReplaceEventHandle(WaitHandle waitHandle, bool manualReset, bool initialState)
         {
-            // Store the old handle 
+            // Store the old handle
             IntPtr oldHandle = waitHandle.Handle;
 
             // Create a new event
@@ -67,7 +67,7 @@ namespace Amib.Threading.Internal
             waitHandle.Handle = newHandle;
 
             // Close the old event
-            CloseHandle (oldHandle);        
+            CloseHandle (oldHandle);
         }
 
         [DllImport("coredll.dll", SetLastError = true)]
diff --git a/ThirdParty/SmartThreadPool/Interfaces.cs b/ThirdParty/SmartThreadPool/Interfaces.cs
index 513422f..8cc23a0 100644
--- a/ThirdParty/SmartThreadPool/Interfaces.cs
+++ b/ThirdParty/SmartThreadPool/Interfaces.cs
@@ -3,18 +3,18 @@ using System.Threading;
 
 namespace Amib.Threading
 {
-        #region Delegates
-
-        /// <summary>
-        /// A delegate that represents the method to run as the work item
-        /// </summary>
-        /// <param name="state">A state object for the method to run</param>
-        public delegate object WorkItemCallback(object state);
-
-        /// <summary>
-        /// A delegate to call after the WorkItemCallback completed
-        /// </summary>
-        /// <param name="wir">The work item result object</param>
+    #region Delegates
+
+    /// <summary>
+    /// A delegate that represents the method to run as the work item
+    /// </summary>
+    /// <param name="state">A state object for the method to run</param>
+    public delegate object WorkItemCallback(object state);
+
+    /// <summary>
+    /// A delegate to call after the WorkItemCallback completed
+    /// </summary>
+    /// <param name="wir">The work item result object</param>
     public delegate void PostExecuteWorkItemCallback(IWorkItemResult wir);
 
     /// <summary>
@@ -23,56 +23,56 @@ namespace Amib.Threading
     /// <param name="wir">The work item result object</param>
     public delegate void PostExecuteWorkItemCallback<TResult>(IWorkItemResult<TResult> wir);
 
-        /// <summary>
-        /// A delegate to call when a WorkItemsGroup becomes idle
-        /// </summary>
-        /// <param name="workItemsGroup">A reference to the WorkItemsGroup that became idle</param>
-        public delegate void WorkItemsGroupIdleHandler(IWorkItemsGroup workItemsGroup);
+    /// <summary>
+    /// A delegate to call when a WorkItemsGroup becomes idle
+    /// </summary>
+    /// <param name="workItemsGroup">A reference to the WorkItemsGroup that became idle</param>
+    public delegate void WorkItemsGroupIdleHandler(IWorkItemsGroup workItemsGroup);
 
     /// <summary>
-    /// A delegate to call after a thread is created, but before 
+    /// A delegate to call after a thread is created, but before
     /// it's first use.
     /// </summary>
     public delegate void ThreadInitializationHandler();
 
     /// <summary>
-    /// A delegate to call when a thread is about to exit, after 
+    /// A delegate to call when a thread is about to exit, after
     /// it is no longer belong to the pool.
     /// </summary>
     public delegate void ThreadTerminationHandler();
 
-        #endregion
+    #endregion
 
-        #region WorkItem Priority
+    #region WorkItem Priority
 
     /// <summary>
     /// Defines the availeable priorities of a work item.
     /// The higher the priority a work item has, the sooner
     /// it will be executed.
     /// </summary>
-        public enum WorkItemPriority
-        {
-                Lowest,
-                BelowNormal,
-                Normal,
-                AboveNormal,
-                Highest,
-        }
+    public enum WorkItemPriority
+    {
+        Lowest,
+        BelowNormal,
+        Normal,
+        AboveNormal,
+        Highest,
+    }
 
-        #endregion
+    #endregion
 
-        #region IWorkItemsGroup interface 
+    #region IWorkItemsGroup interface
 
-        /// <summary>
-        /// IWorkItemsGroup interface
+    /// <summary>
+    /// IWorkItemsGroup interface
     /// Created by SmartThreadPool.CreateWorkItemsGroup()
-        /// </summary>
-        public interface IWorkItemsGroup
-        {
-                /// <summary>
-                /// Get/Set the name of the WorkItemsGroup
-                /// </summary>
-                string Name { get; set; }
+    /// </summary>
+    public interface IWorkItemsGroup
+    {
+        /// <summary>
+        /// Get/Set the name of the WorkItemsGroup
+        /// </summary>
+        string Name { get; set; }
 
         /// <summary>
         /// Get/Set the maximum number of workitem that execute cocurrency on the thread pool
@@ -115,14 +115,14 @@ namespace Amib.Threading
         /// <summary>
         /// Wait for all work item to complete.
         /// </summary>
-                void WaitForIdle();
+        void WaitForIdle();
 
         /// <summary>
         /// Wait for all work item to complete, until timeout expired
         /// </summary>
         /// <param name="timeout">How long to wait for the work items to complete</param>
         /// <returns>Returns true if work items completed within the timeout, otherwise false.</returns>
-                bool WaitForIdle(TimeSpan timeout);
+        bool WaitForIdle(TimeSpan timeout);
 
         /// <summary>
         /// Wait for all work item to complete, until timeout expired
@@ -150,7 +150,7 @@ namespace Amib.Threading
         /// Queue a work item
         /// </summary>
         /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item result</returns>        
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback);
 
         /// <summary>
@@ -166,7 +166,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state);
@@ -176,7 +176,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="workItemPriority">The work item priority</param>
         /// <returns>Returns a work item result</returns>
@@ -187,7 +187,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -200,7 +200,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -214,7 +214,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -228,7 +228,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -252,7 +252,7 @@ namespace Amib.Threading
         /// <param name="workItemInfo">Work item information</param>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state);
@@ -328,72 +328,72 @@ namespace Amib.Threading
         /// <summary>
         /// Queue a work item.
         /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object.
         /// its GetResult() returns a TResult object</returns>
         IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func);
 
         /// <summary>
         /// Queue a work item.
         /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object.
         /// its GetResult() returns a TResult object</returns>
         IWorkItemResult<TResult> QueueWorkItem<T, TResult>(Func<T, TResult> func, T arg);
 
         /// <summary>
         /// Queue a work item.
         /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object.
         /// its GetResult() returns a TResult object</returns>
         IWorkItemResult<TResult> QueueWorkItem<T1, T2, TResult>(Func<T1, T2, TResult> func, T1 arg1, T2 arg2);
 
         /// <summary>
         /// Queue a work item.
         /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object.
         /// its GetResult() returns a TResult object</returns>
         IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, TResult>(Func<T1, T2, T3, TResult> func, T1 arg1, T2 arg2, T3 arg3);
 
         /// <summary>
         /// Queue a work item.
         /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object.
         /// its GetResult() returns a TResult object</returns>
         IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, T4, TResult>(Func<T1, T2, T3, T4, TResult> func, T1 arg1, T2 arg2, T3 arg3, T4 arg4);
 
         #endregion
     }
 
-        #endregion
+    #endregion
 
-        #region CallToPostExecute enumerator
+    #region CallToPostExecute enumerator
 
-        [Flags]
-        public enum CallToPostExecute
-        {
+    [Flags]
+    public enum CallToPostExecute
+    {
         /// <summary>
         /// Never call to the PostExecute call back
         /// </summary>
-                Never                    = 0x00,
+        Never                    = 0x00,
 
         /// <summary>
         /// Call to the PostExecute only when the work item is cancelled
         /// </summary>
-                WhenWorkItemCanceled     = 0x01,
+        WhenWorkItemCanceled     = 0x01,
 
         /// <summary>
         /// Call to the PostExecute only when the work item is not cancelled
         /// </summary>
-                WhenWorkItemNotCanceled  = 0x02,
+        WhenWorkItemNotCanceled  = 0x02,
 
         /// <summary>
         /// Always call to the PostExecute
         /// </summary>
-                Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
-        }
+        Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
+    }
 
-        #endregion
+    #endregion
 
-        #region IWorkItemResult interface
+    #region IWorkItemResult interface
 
     /// <summary>
     /// The common interface of IWorkItemResult and IWorkItemResult&lt;T&gt;
@@ -421,159 +421,159 @@ namespace Amib.Threading
     {
     }
 
-        /// <summary>
+    /// <summary>
     /// IWorkItemResult&lt;TResult&gt; interface.
     /// Created when a Func&lt;TResult&gt; work item is queued.
-        /// </summary>
+    /// </summary>
     public interface IWorkItemResult<TResult> : IWaitableResult
-        {
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits.
-                /// </summary>
-                /// <returns>The result of the work item</returns>
+    {
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits.
+        /// </summary>
+        /// <returns>The result of the work item</returns>
         TResult GetResult();
 
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout.
-                /// </summary>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout.
+        /// </summary>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+            int millisecondsTimeout,
+            bool exitContext);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout.
+        /// </summary>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+            TimeSpan timeout,
+            bool exitContext);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// </summary>
+        /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        /// On cancel throws WorkItemCancelException
+        TResult GetResult(
+            int millisecondsTimeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// </summary>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        /// On cancel throws WorkItemCancelException
         TResult GetResult(
-                        int millisecondsTimeout,
-                        bool exitContext);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout.
-                /// </summary>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
-        TResult GetResult(                      
-                        TimeSpan timeout,
-                        bool exitContext);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
-                /// </summary>
-                /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
-                /// On cancel throws WorkItemCancelException
-        TResult GetResult(                      
-                        int millisecondsTimeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
-                /// </summary>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
-                /// On cancel throws WorkItemCancelException
-        TResult GetResult(                      
-                        TimeSpan timeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits.
-                /// </summary>
-                /// <param name="e">Filled with the exception if one was thrown</param>
-                /// <returns>The result of the work item</returns>
+            TimeSpan timeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits.
+        /// </summary>
+        /// <param name="e">Filled with the exception if one was thrown</param>
+        /// <returns>The result of the work item</returns>
         TResult GetResult(out Exception e);
 
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout.
-                /// </summary>
-                /// <param name="millisecondsTimeout"></param>
-                /// <param name="exitContext"></param>
-                /// <param name="e">Filled with the exception if one was thrown</param>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout.
+        /// </summary>
+        /// <param name="millisecondsTimeout"></param>
+        /// <param name="exitContext"></param>
+        /// <param name="e">Filled with the exception if one was thrown</param>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+            int millisecondsTimeout,
+            bool exitContext,
+            out Exception e);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout.
+        /// </summary>
+        /// <param name="exitContext"></param>
+        /// <param name="e">Filled with the exception if one was thrown</param>
+        /// <param name="timeout"></param>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+            TimeSpan timeout,
+            bool exitContext,
+            out Exception e);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// </summary>
+        /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
+        /// <param name="e">Filled with the exception if one was thrown</param>
+        /// <returns>The result of the work item</returns>
+        /// On timeout throws WorkItemTimeoutException
+        /// On cancel throws WorkItemCancelException
+        TResult GetResult(
+            int millisecondsTimeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle,
+            out Exception e);
+
+        /// <summary>
+        /// Get the result of the work item.
+        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// </summary>
+        /// <returns>The result of the work item</returns>
+        /// <param name="cancelWaitHandle"></param>
+        /// <param name="e">Filled with the exception if one was thrown</param>
+        /// <param name="timeout"></param>
+        /// <param name="exitContext"></param>
+        /// On timeout throws WorkItemTimeoutException
+        /// On cancel throws WorkItemCancelException
         TResult GetResult(
-                        int millisecondsTimeout,
-                        bool exitContext,
-                        out Exception e);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout.
-                /// </summary>
-                /// <param name="exitContext"></param>
-                /// <param name="e">Filled with the exception if one was thrown</param>
-                /// <param name="timeout"></param>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
-        TResult GetResult(                      
-                        TimeSpan timeout,
-                        bool exitContext,
-                        out Exception e);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
-                /// </summary>
-                /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
-                /// <param name="e">Filled with the exception if one was thrown</param>
-                /// <returns>The result of the work item</returns>
-                /// On timeout throws WorkItemTimeoutException
-                /// On cancel throws WorkItemCancelException
-        TResult GetResult(                      
-                        int millisecondsTimeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle,
-                        out Exception e);
-
-                /// <summary>
-                /// Get the result of the work item.
-                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
-                /// </summary>
-                /// <returns>The result of the work item</returns>
-                /// <param name="cancelWaitHandle"></param>
-                /// <param name="e">Filled with the exception if one was thrown</param>
-                /// <param name="timeout"></param>
-                /// <param name="exitContext"></param>
-                /// On timeout throws WorkItemTimeoutException
-                /// On cancel throws WorkItemCancelException
-        TResult GetResult(                      
-                        TimeSpan timeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle,
-                        out Exception e);
-
-                /// <summary>
-                /// Gets an indication whether the asynchronous operation has completed.
-                /// </summary>
-                bool IsCompleted { get; }
-
-                /// <summary>
-                /// Gets an indication whether the asynchronous operation has been canceled.
-                /// </summary>
-                bool IsCanceled { get; }
-
-                /// <summary>
-                /// Gets the user-defined object that contains context data 
+            TimeSpan timeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle,
+            out Exception e);
+
+        /// <summary>
+        /// Gets an indication whether the asynchronous operation has completed.
+        /// </summary>
+        bool IsCompleted { get; }
+
+        /// <summary>
+        /// Gets an indication whether the asynchronous operation has been canceled.
+        /// </summary>
+        bool IsCanceled { get; }
+
+        /// <summary>
+        /// Gets the user-defined object that contains context data
         /// for the work item method.
-                /// </summary>
-                object State { get; }
+        /// </summary>
+        object State { get; }
 
-                /// <summary>
+        /// <summary>
         /// Same as Cancel(false).
-                /// </summary>
+        /// </summary>
         bool Cancel();
 
         /// <summary>
@@ -582,7 +582,7 @@ namespace Amib.Threading
         /// If the work item is completed, it will remain completed
         /// If the work item is in progress then the user can check the SmartThreadPool.IsWorkItemCanceled
         ///   property to check if the work item has been cancelled. If the abortExecution is set to true then
-        ///   the Smart Thread Pool will send an AbortException to the running thread to stop the execution 
+        ///   the Smart Thread Pool will send an AbortException to the running thread to stop the execution
         ///   of the work item. When an in progress work item is canceled its GetResult will throw WorkItemCancelException.
         /// If the work item is already cancelled it will remain cancelled
         /// </summary>
@@ -590,23 +590,23 @@ namespace Amib.Threading
         /// <returns>Returns true if the work item was not completed, otherwise false.</returns>
         bool Cancel(bool abortExecution);
 
-                /// <summary>
-                /// Get the work item's priority
-                /// </summary>
-                WorkItemPriority WorkItemPriority { get; }
+        /// <summary>
+        /// Get the work item's priority
+        /// </summary>
+        WorkItemPriority WorkItemPriority { get; }
 
-                /// <summary>
-                /// Return the result, same as GetResult()
-                /// </summary>
+        /// <summary>
+        /// Return the result, same as GetResult()
+        /// </summary>
         TResult Result { get; }
 
-                /// <summary>
-                /// Returns the exception if occured otherwise returns null.
-                /// </summary>
-                object Exception { get; }
-        }
+        /// <summary>
+        /// Returns the exception if occured otherwise returns null.
+        /// </summary>
+        object Exception { get; }
+    }
 
-        #endregion
+    #endregion
 
     #region .NET 3.5
 
diff --git a/ThirdParty/SmartThreadPool/InternalInterfaces.cs b/ThirdParty/SmartThreadPool/InternalInterfaces.cs
index 0072e10..3055117 100644
--- a/ThirdParty/SmartThreadPool/InternalInterfaces.cs
+++ b/ThirdParty/SmartThreadPool/InternalInterfaces.cs
@@ -16,7 +16,7 @@ namespace Amib.Threading.Internal
     {
         /// <summary>
         /// This method is intent for internal use.
-        /// </summary>   
+        /// </summary>
         IWorkItemResult GetWorkItemResult();
     }
 
diff --git a/ThirdParty/SmartThreadPool/PriorityQueue.cs b/ThirdParty/SmartThreadPool/PriorityQueue.cs
index 409c879..3ea6084 100644
--- a/ThirdParty/SmartThreadPool/PriorityQueue.cs
+++ b/ThirdParty/SmartThreadPool/PriorityQueue.cs
@@ -5,235 +5,235 @@ using System.Diagnostics;
 
 namespace Amib.Threading.Internal
 {
-        #region PriorityQueue class
-
-        /// <summary>
-        /// PriorityQueue class
-        /// This class is not thread safe because we use external lock
-        /// </summary>
-        public sealed class PriorityQueue : IEnumerable
-        {
-                #region Private members
-
-                /// <summary>
-                /// The number of queues, there is one for each type of priority
-                /// </summary>
-                private const int _queuesCount = WorkItemPriority.Highest-WorkItemPriority.Lowest+1;
-
-                /// <summary>
-                /// Work items queues. There is one for each type of priority
-                /// </summary>
+    #region PriorityQueue class
+
+    /// <summary>
+    /// PriorityQueue class
+    /// This class is not thread safe because we use external lock
+    /// </summary>
+    public sealed class PriorityQueue : IEnumerable
+    {
+        #region Private members
+
+        /// <summary>
+        /// The number of queues, there is one for each type of priority
+        /// </summary>
+        private const int _queuesCount = WorkItemPriority.Highest-WorkItemPriority.Lowest+1;
+
+        /// <summary>
+        /// Work items queues. There is one for each type of priority
+        /// </summary>
         private readonly LinkedList<IHasWorkItemPriority>[] _queues = new LinkedList<IHasWorkItemPriority>[_queuesCount];
 
-                /// <summary>
-                /// The total number of work items within the queues 
-                /// </summary>
-                private int _workItemsCount;
+        /// <summary>
+        /// The total number of work items within the queues
+        /// </summary>
+        private int _workItemsCount;
 
-                /// <summary>
-                /// Use with IEnumerable interface
-                /// </summary>
-                private int _version;
+        /// <summary>
+        /// Use with IEnumerable interface
+        /// </summary>
+        private int _version;
 
-                #endregion
+        #endregion
 
-                #region Contructor
+        #region Contructor
 
-                public PriorityQueue()
-                {
-                        for(int i = 0; i < _queues.Length; ++i)
-                        {
+        public PriorityQueue()
+        {
+            for(int i = 0; i < _queues.Length; ++i)
+            {
                 _queues[i] = new LinkedList<IHasWorkItemPriority>();
-                        }
-                }
-
-                #endregion
-
-                #region Methods
-
-                /// <summary>
-                /// Enqueue a work item.
-                /// </summary>
-                /// <param name="workItem">A work item</param>
-                public void Enqueue(IHasWorkItemPriority workItem)
-                {
-                        Debug.Assert(null != workItem);
-
-                        int queueIndex = _queuesCount-(int)workItem.WorkItemPriority-1;
-                        Debug.Assert(queueIndex >= 0);
-                        Debug.Assert(queueIndex < _queuesCount);
-
-                        _queues[queueIndex].AddLast(workItem);
-                        ++_workItemsCount;
-                        ++_version;
-                }
-
-                /// <summary>
-                /// Dequeque a work item.
-                /// </summary>
-                /// <returns>Returns the next work item</returns>
-                public IHasWorkItemPriority Dequeue()
-                {
-                        IHasWorkItemPriority workItem = null;
-
-                        if(_workItemsCount > 0)
-                        {
-                                int queueIndex = GetNextNonEmptyQueue(-1);
-                                Debug.Assert(queueIndex >= 0);
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Enqueue a work item.
+        /// </summary>
+        /// <param name="workItem">A work item</param>
+        public void Enqueue(IHasWorkItemPriority workItem)
+        {
+            Debug.Assert(null != workItem);
+
+            int queueIndex = _queuesCount-(int)workItem.WorkItemPriority-1;
+            Debug.Assert(queueIndex >= 0);
+            Debug.Assert(queueIndex < _queuesCount);
+
+            _queues[queueIndex].AddLast(workItem);
+            ++_workItemsCount;
+            ++_version;
+        }
+
+        /// <summary>
+        /// Dequeque a work item.
+        /// </summary>
+        /// <returns>Returns the next work item</returns>
+        public IHasWorkItemPriority Dequeue()
+        {
+            IHasWorkItemPriority workItem = null;
+
+            if(_workItemsCount > 0)
+            {
+                int queueIndex = GetNextNonEmptyQueue(-1);
+                Debug.Assert(queueIndex >= 0);
                 workItem = _queues[queueIndex].First.Value;
-                                _queues[queueIndex].RemoveFirst();
-                                Debug.Assert(null != workItem);
-                                --_workItemsCount;
-                                ++_version;
-                        }
-
-                        return workItem;
-                }
-
-                /// <summary>
-                /// Find the next non empty queue starting at queue queueIndex+1
-                /// </summary>
-                /// <param name="queueIndex">The index-1 to start from</param>
-                /// <returns>
-                /// The index of the next non empty queue or -1 if all the queues are empty
-                /// </returns>
-                private int GetNextNonEmptyQueue(int queueIndex)
-                {
-                        for(int i = queueIndex+1; i < _queuesCount; ++i)
-                        {
-                                if(_queues[i].Count > 0)
-                                {
-                                        return i;
-                                }
-                        }
-                        return -1;
-                }
-
-                /// <summary>
-                /// The number of work items 
-                /// </summary>
-                public int Count
-                {
-                        get
-                        {
-                                return _workItemsCount;
-                        }
-                }
-
-                /// <summary>
-                /// Clear all the work items 
-                /// </summary>
-                public void Clear()
-                {
-                        if (_workItemsCount > 0)
-                        {
-                                foreach(LinkedList<IHasWorkItemPriority> queue in _queues)
-                                {
-                                        queue.Clear();
-                                }
-                                _workItemsCount = 0;
-                                ++_version;
-                        }
-                }
-
-                #endregion
-
-                #region IEnumerable Members
-
-                /// <summary>
-                /// Returns an enumerator to iterate over the work items
-                /// </summary>
-                /// <returns>Returns an enumerator</returns>
-                public IEnumerator GetEnumerator()
-                {
-                        return new PriorityQueueEnumerator(this);
-                }
-
-                #endregion
-
-                #region PriorityQueueEnumerator
-
-                /// <summary>
-                /// The class the implements the enumerator
-                /// </summary>
-                private class PriorityQueueEnumerator : IEnumerator
-                {
-                        private readonly PriorityQueue _priorityQueue;
-                        private int _version;
-                        private int _queueIndex;
-                        private IEnumerator _enumerator;
-
-                        public PriorityQueueEnumerator(PriorityQueue priorityQueue)
-                        {
-                                _priorityQueue = priorityQueue;
-                                _version = _priorityQueue._version;
-                                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
-                                if (_queueIndex >= 0)
-                                {
-                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                                }
-                                else
-                                {
-                                        _enumerator = null;
-                                }
-                        }
-
-                        #region IEnumerator Members
-
-                        public void Reset()
-                        {
-                                _version = _priorityQueue._version;
-                                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
-                                if (_queueIndex >= 0)
-                                {
-                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                                }
-                                else
-                                {
-                                        _enumerator = null;
-                                }
-                        }
-
-                        public object Current
-                        {
-                                get
-                                {
-                                        Debug.Assert(null != _enumerator);
-                                        return _enumerator.Current;
-                                }
-                        }
-
-                        public bool MoveNext()
-                        {
-                                if (null == _enumerator)
-                                {
-                                        return false;
-                                }
-
-                                if(_version != _priorityQueue._version)
-                                {
-                                        throw new InvalidOperationException("The collection has been modified");
-
-                                }
-                                if (!_enumerator.MoveNext())
-                                {
-                                        _queueIndex = _priorityQueue.GetNextNonEmptyQueue(_queueIndex);
-                                        if(-1 == _queueIndex)
-                                        {
-                                                return false;
-                                        }
-                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                                        _enumerator.MoveNext();
-                                        return true;
-                                }
-                                return true;
-                        }
-
-                        #endregion
-                }
-
-                #endregion
-        }
-
-        #endregion
+                _queues[queueIndex].RemoveFirst();
+                Debug.Assert(null != workItem);
+                --_workItemsCount;
+                ++_version;
+            }
+
+            return workItem;
+        }
+
+        /// <summary>
+        /// Find the next non empty queue starting at queue queueIndex+1
+        /// </summary>
+        /// <param name="queueIndex">The index-1 to start from</param>
+        /// <returns>
+        /// The index of the next non empty queue or -1 if all the queues are empty
+        /// </returns>
+        private int GetNextNonEmptyQueue(int queueIndex)
+        {
+            for(int i = queueIndex+1; i < _queuesCount; ++i)
+            {
+                if(_queues[i].Count > 0)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// The number of work items
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return _workItemsCount;
+            }
+        }
+
+        /// <summary>
+        /// Clear all the work items
+        /// </summary>
+        public void Clear()
+        {
+            if (_workItemsCount > 0)
+            {
+                foreach(LinkedList<IHasWorkItemPriority> queue in _queues)
+                {
+                    queue.Clear();
+                }
+                _workItemsCount = 0;
+                ++_version;
+            }
+        }
+
+        #endregion
+
+        #region IEnumerable Members
+
+        /// <summary>
+        /// Returns an enumerator to iterate over the work items
+        /// </summary>
+        /// <returns>Returns an enumerator</returns>
+        public IEnumerator GetEnumerator()
+        {
+            return new PriorityQueueEnumerator(this);
+        }
+
+        #endregion
+
+        #region PriorityQueueEnumerator
+
+        /// <summary>
+        /// The class the implements the enumerator
+        /// </summary>
+        private class PriorityQueueEnumerator : IEnumerator
+        {
+            private readonly PriorityQueue _priorityQueue;
+            private int _version;
+            private int _queueIndex;
+            private IEnumerator _enumerator;
+
+            public PriorityQueueEnumerator(PriorityQueue priorityQueue)
+            {
+                _priorityQueue = priorityQueue;
+                _version = _priorityQueue._version;
+                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
+                if (_queueIndex >= 0)
+                {
+                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                }
+                else
+                {
+                    _enumerator = null;
+                }
+            }
+
+            #region IEnumerator Members
+
+            public void Reset()
+            {
+                _version = _priorityQueue._version;
+                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
+                if (_queueIndex >= 0)
+                {
+                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                }
+                else
+                {
+                    _enumerator = null;
+                }
+            }
+
+            public object Current
+            {
+                get
+                {
+                    Debug.Assert(null != _enumerator);
+                    return _enumerator.Current;
+                }
+            }
+
+            public bool MoveNext()
+            {
+                if (null == _enumerator)
+                {
+                    return false;
+                }
+
+                if(_version != _priorityQueue._version)
+                {
+                    throw new InvalidOperationException("The collection has been modified");
+
+                }
+                if (!_enumerator.MoveNext())
+                {
+                    _queueIndex = _priorityQueue.GetNextNonEmptyQueue(_queueIndex);
+                    if(-1 == _queueIndex)
+                    {
+                        return false;
+                    }
+                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                    _enumerator.MoveNext();
+                    return true;
+                }
+                return true;
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+
+    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
index 0663d1d..bd68499 100644
--- a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
+++ b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
@@ -26,188 +26,188 @@ namespace Amib.Threading.Internal
 #if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
 
     internal enum STPPerformanceCounterType
-        {
-                // Fields
-                ActiveThreads                           = 0,
-                InUseThreads                            = 1,
-                OverheadThreads                         = 2,
-                OverheadThreadsPercent          = 3,
-                OverheadThreadsPercentBase      = 4,
-
-                WorkItems                                       = 5,
-                WorkItemsInQueue                        = 6,
-                WorkItemsProcessed                      = 7,
-
-                WorkItemsQueuedPerSecond        = 8,
-                WorkItemsProcessedPerSecond     = 9,
-
-                AvgWorkItemWaitTime                     = 10,
-                AvgWorkItemWaitTimeBase         = 11,
-
-                AvgWorkItemProcessTime          = 12,
-                AvgWorkItemProcessTimeBase      = 13,
-
-                WorkItemsGroups                         = 14,
-
-                LastCounter                                     = 14,
-        }
- 
-
-        /// <summary>
-        /// Summary description for STPPerformanceCounter.
-        /// </summary>
-        internal class STPPerformanceCounter
-        {
-                // Fields
-                private readonly PerformanceCounterType _pcType;
-                protected string _counterHelp;
-                protected string _counterName;
-
-                // Methods
-                public STPPerformanceCounter(
-                        string counterName, 
-                        string counterHelp, 
-                        PerformanceCounterType pcType)
-                {
-                        _counterName = counterName;
-                        _counterHelp = counterHelp;
-                        _pcType = pcType;
-                }
-
-                public void AddCounterToCollection(CounterCreationDataCollection counterData)
-                {
-                        CounterCreationData counterCreationData = new CounterCreationData(
-                                _counterName, 
-                                _counterHelp, 
-                                _pcType);
-
-                        counterData.Add(counterCreationData);
-                }
- 
-                // Properties
-                public string Name
-                {
-                        get
-                        {
-                                return _counterName;
-                        }
-                }
-        }
-
-        internal class STPPerformanceCounters
-        {
-                // Fields
-                internal STPPerformanceCounter[] _stpPerformanceCounters;
-                private static readonly STPPerformanceCounters _instance;
-                internal const string _stpCategoryHelp = "SmartThreadPool performance counters";
-                internal const string _stpCategoryName = "SmartThreadPool";
-
-                // Methods
-                static STPPerformanceCounters()
-                {
-                        _instance = new STPPerformanceCounters();
-                }
- 
-                private STPPerformanceCounters()
-                {
-                        STPPerformanceCounter[] stpPerformanceCounters = new STPPerformanceCounter[] 
-                                { 
-                                        new STPPerformanceCounter("Active threads", "The current number of available in the thread pool.", PerformanceCounterType.NumberOfItems32), 
-                                        new STPPerformanceCounter("In use threads", "The current number of threads that execute a work item.", PerformanceCounterType.NumberOfItems32), 
-                                        new STPPerformanceCounter("Overhead threads", "The current number of threads that are active, but are not in use.", PerformanceCounterType.NumberOfItems32), 
-                                        new STPPerformanceCounter("% overhead threads", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawFraction), 
-                                        new STPPerformanceCounter("% overhead threads base", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawBase), 
-
-                                        new STPPerformanceCounter("Work Items", "The number of work items in the Smart Thread Pool. Both queued and processed.", PerformanceCounterType.NumberOfItems32), 
-                                        new STPPerformanceCounter("Work Items in queue", "The current number of work items in the queue", PerformanceCounterType.NumberOfItems32), 
-                                        new STPPerformanceCounter("Work Items processed", "The number of work items already processed", PerformanceCounterType.NumberOfItems32), 
-
-                                        new STPPerformanceCounter("Work Items queued/sec", "The number of work items queued per second", PerformanceCounterType.RateOfCountsPerSecond32), 
-                                        new STPPerformanceCounter("Work Items processed/sec", "The number of work items processed per second", PerformanceCounterType.RateOfCountsPerSecond32), 
-
-                                        new STPPerformanceCounter("Avg. Work Item wait time/sec", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageCount64), 
-                                        new STPPerformanceCounter("Avg. Work Item wait time base", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageBase), 
-
-                                        new STPPerformanceCounter("Avg. Work Item process time/sec", "The average time it takes to process a work item.", PerformanceCounterType.AverageCount64), 
-                                        new STPPerformanceCounter("Avg. Work Item process time base", "The average time it takes to process a work item.", PerformanceCounterType.AverageBase), 
-
-                                        new STPPerformanceCounter("Work Items Groups", "The current number of work item groups associated with the Smart Thread Pool.", PerformanceCounterType.NumberOfItems32), 
-                                };
-
-                        _stpPerformanceCounters = stpPerformanceCounters;
-                        SetupCategory();
-                }
- 
-                private void SetupCategory()
-                {
-                        if (!PerformanceCounterCategory.Exists(_stpCategoryName))
-                        {
-                                CounterCreationDataCollection counters = new CounterCreationDataCollection();
-
-                                for (int i = 0; i < _stpPerformanceCounters.Length; i++)
-                                {
-                                        _stpPerformanceCounters[i].AddCounterToCollection(counters);
-                                }
-
-                                PerformanceCounterCategory.Create(
-                                        _stpCategoryName, 
-                                        _stpCategoryHelp, 
+    {
+        // Fields
+        ActiveThreads                           = 0,
+        InUseThreads                            = 1,
+        OverheadThreads                         = 2,
+        OverheadThreadsPercent          = 3,
+        OverheadThreadsPercentBase      = 4,
+
+        WorkItems                                       = 5,
+        WorkItemsInQueue                        = 6,
+        WorkItemsProcessed                      = 7,
+
+        WorkItemsQueuedPerSecond        = 8,
+        WorkItemsProcessedPerSecond     = 9,
+
+        AvgWorkItemWaitTime                     = 10,
+        AvgWorkItemWaitTimeBase         = 11,
+
+        AvgWorkItemProcessTime          = 12,
+        AvgWorkItemProcessTimeBase      = 13,
+
+        WorkItemsGroups                         = 14,
+
+        LastCounter                                     = 14,
+    }
+
+
+    /// <summary>
+    /// Summary description for STPPerformanceCounter.
+    /// </summary>
+    internal class STPPerformanceCounter
+    {
+        // Fields
+        private readonly PerformanceCounterType _pcType;
+        protected string _counterHelp;
+        protected string _counterName;
+
+        // Methods
+        public STPPerformanceCounter(
+            string counterName,
+            string counterHelp,
+            PerformanceCounterType pcType)
+        {
+            _counterName = counterName;
+            _counterHelp = counterHelp;
+            _pcType = pcType;
+        }
+
+        public void AddCounterToCollection(CounterCreationDataCollection counterData)
+        {
+            CounterCreationData counterCreationData = new CounterCreationData(
+                _counterName,
+                _counterHelp,
+                _pcType);
+
+            counterData.Add(counterCreationData);
+        }
+
+        // Properties
+        public string Name
+        {
+            get
+            {
+                return _counterName;
+            }
+        }
+    }
+
+    internal class STPPerformanceCounters
+    {
+        // Fields
+        internal STPPerformanceCounter[] _stpPerformanceCounters;
+        private static readonly STPPerformanceCounters _instance;
+        internal const string _stpCategoryHelp = "SmartThreadPool performance counters";
+        internal const string _stpCategoryName = "SmartThreadPool";
+
+        // Methods
+        static STPPerformanceCounters()
+        {
+            _instance = new STPPerformanceCounters();
+        }
+
+        private STPPerformanceCounters()
+        {
+            STPPerformanceCounter[] stpPerformanceCounters = new STPPerformanceCounter[]
+                {
+                    new STPPerformanceCounter("Active threads", "The current number of available in the thread pool.", PerformanceCounterType.NumberOfItems32),
+                    new STPPerformanceCounter("In use threads", "The current number of threads that execute a work item.", PerformanceCounterType.NumberOfItems32),
+                    new STPPerformanceCounter("Overhead threads", "The current number of threads that are active, but are not in use.", PerformanceCounterType.NumberOfItems32),
+                    new STPPerformanceCounter("% overhead threads", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawFraction),
+                    new STPPerformanceCounter("% overhead threads base", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawBase),
+
+                    new STPPerformanceCounter("Work Items", "The number of work items in the Smart Thread Pool. Both queued and processed.", PerformanceCounterType.NumberOfItems32),
+                    new STPPerformanceCounter("Work Items in queue", "The current number of work items in the queue", PerformanceCounterType.NumberOfItems32),
+                    new STPPerformanceCounter("Work Items processed", "The number of work items already processed", PerformanceCounterType.NumberOfItems32),
+
+                    new STPPerformanceCounter("Work Items queued/sec", "The number of work items queued per second", PerformanceCounterType.RateOfCountsPerSecond32),
+                    new STPPerformanceCounter("Work Items processed/sec", "The number of work items processed per second", PerformanceCounterType.RateOfCountsPerSecond32),
+
+                    new STPPerformanceCounter("Avg. Work Item wait time/sec", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageCount64),
+                    new STPPerformanceCounter("Avg. Work Item wait time base", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageBase),
+
+                    new STPPerformanceCounter("Avg. Work Item process time/sec", "The average time it takes to process a work item.", PerformanceCounterType.AverageCount64),
+                    new STPPerformanceCounter("Avg. Work Item process time base", "The average time it takes to process a work item.", PerformanceCounterType.AverageBase),
+
+                    new STPPerformanceCounter("Work Items Groups", "The current number of work item groups associated with the Smart Thread Pool.", PerformanceCounterType.NumberOfItems32),
+                };
+
+            _stpPerformanceCounters = stpPerformanceCounters;
+            SetupCategory();
+        }
+
+        private void SetupCategory()
+        {
+            if (!PerformanceCounterCategory.Exists(_stpCategoryName))
+            {
+                CounterCreationDataCollection counters = new CounterCreationDataCollection();
+
+                for (int i = 0; i < _stpPerformanceCounters.Length; i++)
+                {
+                    _stpPerformanceCounters[i].AddCounterToCollection(counters);
+                }
+
+                PerformanceCounterCategory.Create(
+                    _stpCategoryName,
+                    _stpCategoryHelp,
                     PerformanceCounterCategoryType.MultiInstance,
-                                        counters);
-                                        
-                        }
-                }
- 
-                // Properties
-                public static STPPerformanceCounters Instance
-                {
-                        get
-                        {
-                                return _instance;
-                        }
-                }
-        }
-
-        internal class STPInstancePerformanceCounter : IDisposable
-        {
-                // Fields
+                    counters);
+
+            }
+        }
+
+        // Properties
+        public static STPPerformanceCounters Instance
+        {
+            get
+            {
+                return _instance;
+            }
+        }
+     }
+
+    internal class STPInstancePerformanceCounter : IDisposable
+    {
+        // Fields
         private bool _isDisposed;
-                private PerformanceCounter _pcs;
+        private PerformanceCounter _pcs;
 
-                // Methods
-                protected STPInstancePerformanceCounter()
-                {
+        // Methods
+        protected STPInstancePerformanceCounter()
+        {
             _isDisposed = false;
-                }
-
-                public STPInstancePerformanceCounter(
-                        string instance, 
-                        STPPerformanceCounterType spcType) : this()
-                {
-                        STPPerformanceCounters counters = STPPerformanceCounters.Instance;
-                        _pcs = new PerformanceCounter(
-                                STPPerformanceCounters._stpCategoryName, 
-                                counters._stpPerformanceCounters[(int) spcType].Name, 
-                                instance, 
-                                false);
-                        _pcs.RawValue = _pcs.RawValue;
-                }
-
-
-                public void Close()
-                {
-                        if (_pcs != null)
-                        {
-                                _pcs.RemoveInstance();
-                                _pcs.Close();
-                                _pcs = null;
-                        }
-                }
- 
-                public void Dispose()
-                {
+        }
+
+        public STPInstancePerformanceCounter(
+            string instance,
+            STPPerformanceCounterType spcType) : this()
+        {
+            STPPerformanceCounters counters = STPPerformanceCounters.Instance;
+            _pcs = new PerformanceCounter(
+                STPPerformanceCounters._stpCategoryName,
+                counters._stpPerformanceCounters[(int) spcType].Name,
+                instance,
+                false);
+            _pcs.RawValue = _pcs.RawValue;
+        }
+
+
+        public void Close()
+        {
+            if (_pcs != null)
+            {
+                _pcs.RemoveInstance();
+                _pcs.Close();
+                _pcs = null;
+            }
+        }
+
+        public void Dispose()
+        {
             Dispose(true);
-                }
+        }
 
         public virtual void Dispose(bool disposing)
         {
@@ -220,90 +220,90 @@ namespace Amib.Threading.Internal
             }
             _isDisposed = true;
         }
- 
-                public virtual void Increment()
-                {
-                        _pcs.Increment();
-                }
- 
-                public virtual void IncrementBy(long val)
-                {
-                        _pcs.IncrementBy(val);
-                }
-
-                public virtual void Set(long val)
-                {
-                        _pcs.RawValue = val;
-                }
-        }
-
-        internal class STPInstanceNullPerformanceCounter : STPInstancePerformanceCounter
-        {
-                // Methods
-                public override void Increment() {}
-                public override void IncrementBy(long value) {}
-                public override void Set(long val) {}
-        }
-
-
-
-        internal class STPInstancePerformanceCounters : ISTPInstancePerformanceCounters
-        {
+
+        public virtual void Increment()
+        {
+            _pcs.Increment();
+        }
+
+        public virtual void IncrementBy(long val)
+        {
+            _pcs.IncrementBy(val);
+        }
+
+        public virtual void Set(long val)
+        {
+            _pcs.RawValue = val;
+        }
+    }
+
+    internal class STPInstanceNullPerformanceCounter : STPInstancePerformanceCounter
+    {
+        // Methods
+        public override void Increment() {}
+        public override void IncrementBy(long value) {}
+        public override void Set(long val) {}
+    }
+
+
+
+    internal class STPInstancePerformanceCounters : ISTPInstancePerformanceCounters
+    {
         private bool _isDisposed;
-                // Fields
-                private STPInstancePerformanceCounter[] _pcs;
-                private static readonly STPInstancePerformanceCounter _stpInstanceNullPerformanceCounter;
-
-                // Methods
-                static STPInstancePerformanceCounters()
-                {
-                        _stpInstanceNullPerformanceCounter = new STPInstanceNullPerformanceCounter();
-                }
- 
-                public STPInstancePerformanceCounters(string instance)
-                {
+        // Fields
+        private STPInstancePerformanceCounter[] _pcs;
+        private static readonly STPInstancePerformanceCounter _stpInstanceNullPerformanceCounter;
+
+        // Methods
+        static STPInstancePerformanceCounters()
+        {
+            _stpInstanceNullPerformanceCounter = new STPInstanceNullPerformanceCounter();
+        }
+
+        public STPInstancePerformanceCounters(string instance)
+        {
             _isDisposed = false;
-                        _pcs = new STPInstancePerformanceCounter[(int)STPPerformanceCounterType.LastCounter];
+            _pcs = new STPInstancePerformanceCounter[(int)STPPerformanceCounterType.LastCounter];
 
             // Call the STPPerformanceCounters.Instance so the static constructor will
             // intialize the STPPerformanceCounters singleton.
-                        STPPerformanceCounters.Instance.GetHashCode();
-
-                        for (int i = 0; i < _pcs.Length; i++)
-                        {
-                                if (instance != null)
-                                {
-                                        _pcs[i] = new STPInstancePerformanceCounter(
-                                                instance, 
-                                                (STPPerformanceCounterType) i);
-                                }
-                                else
-                                {
-                                        _pcs[i] = _stpInstanceNullPerformanceCounter;
-                                }
-                        }
-                }
- 
-
-                public void Close()
-                {
-                        if (null != _pcs)
-                        {
-                                for (int i = 0; i < _pcs.Length; i++)
-                                {
+            STPPerformanceCounters.Instance.GetHashCode();
+
+            for (int i = 0; i < _pcs.Length; i++)
+            {
+                if (instance != null)
+                {
+                    _pcs[i] = new STPInstancePerformanceCounter(
+                        instance,
+                        (STPPerformanceCounterType) i);
+                }
+                else
+                {
+                    _pcs[i] = _stpInstanceNullPerformanceCounter;
+                }
+            }
+        }
+
+
+        public void Close()
+        {
+            if (null != _pcs)
+            {
+                for (int i = 0; i < _pcs.Length; i++)
+                {
                     if (null != _pcs[i])
                     {
                         _pcs[i].Dispose();
                     }
-                                }
-                                _pcs = null;
-                        }
-                }
+                }
+                _pcs = null;
+            }
+        }
 
-                public void Dispose()
-                {
+        public void Dispose()
+        {
             Dispose(true);
-                }
+        }
 
         public virtual void Dispose(bool disposing)
         {
@@ -316,62 +316,62 @@ namespace Amib.Threading.Internal
             }
             _isDisposed = true;
         }
- 
-                private STPInstancePerformanceCounter GetCounter(STPPerformanceCounterType spcType)
-                {
-                        return _pcs[(int) spcType];
-                }
-
-                public void SampleThreads(long activeThreads, long inUseThreads)
-                {
-                        GetCounter(STPPerformanceCounterType.ActiveThreads).Set(activeThreads);
-                        GetCounter(STPPerformanceCounterType.InUseThreads).Set(inUseThreads);
-                        GetCounter(STPPerformanceCounterType.OverheadThreads).Set(activeThreads-inUseThreads);
-
-                        GetCounter(STPPerformanceCounterType.OverheadThreadsPercentBase).Set(activeThreads-inUseThreads);
-                        GetCounter(STPPerformanceCounterType.OverheadThreadsPercent).Set(inUseThreads);
-                }
-
-                public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
-                {
-                        GetCounter(STPPerformanceCounterType.WorkItems).Set(workItemsQueued+workItemsProcessed);
-                        GetCounter(STPPerformanceCounterType.WorkItemsInQueue).Set(workItemsQueued);
-                        GetCounter(STPPerformanceCounterType.WorkItemsProcessed).Set(workItemsProcessed);
-
-                        GetCounter(STPPerformanceCounterType.WorkItemsQueuedPerSecond).Set(workItemsQueued);
-                        GetCounter(STPPerformanceCounterType.WorkItemsProcessedPerSecond).Set(workItemsProcessed);
-                }
-
-                public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
-                {
-                        GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTime).IncrementBy((long)workItemWaitTime.TotalMilliseconds);
-                        GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTimeBase).Increment();
-                }
-
-                public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
-                {
-                        GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTime).IncrementBy((long)workItemProcessTime.TotalMilliseconds);
-                        GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTimeBase).Increment();
-                }
+
+        private STPInstancePerformanceCounter GetCounter(STPPerformanceCounterType spcType)
+        {
+            return _pcs[(int) spcType];
+        }
+
+        public void SampleThreads(long activeThreads, long inUseThreads)
+        {
+            GetCounter(STPPerformanceCounterType.ActiveThreads).Set(activeThreads);
+            GetCounter(STPPerformanceCounterType.InUseThreads).Set(inUseThreads);
+            GetCounter(STPPerformanceCounterType.OverheadThreads).Set(activeThreads-inUseThreads);
+
+            GetCounter(STPPerformanceCounterType.OverheadThreadsPercentBase).Set(activeThreads-inUseThreads);
+            GetCounter(STPPerformanceCounterType.OverheadThreadsPercent).Set(inUseThreads);
+        }
+
+        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
+        {
+            GetCounter(STPPerformanceCounterType.WorkItems).Set(workItemsQueued+workItemsProcessed);
+            GetCounter(STPPerformanceCounterType.WorkItemsInQueue).Set(workItemsQueued);
+            GetCounter(STPPerformanceCounterType.WorkItemsProcessed).Set(workItemsProcessed);
+
+            GetCounter(STPPerformanceCounterType.WorkItemsQueuedPerSecond).Set(workItemsQueued);
+            GetCounter(STPPerformanceCounterType.WorkItemsProcessedPerSecond).Set(workItemsProcessed);
+        }
+
+        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
+        {
+            GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTime).IncrementBy((long)workItemWaitTime.TotalMilliseconds);
+            GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTimeBase).Increment();
+        }
+
+        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
+        {
+            GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTime).IncrementBy((long)workItemProcessTime.TotalMilliseconds);
+            GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTimeBase).Increment();
+        }
     }
 #endif
 
     internal class NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
-        {
-                private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
-
-                public static NullSTPInstancePerformanceCounters Instance
-                {
-                        get { return _instance; }
-                }
-
-                public void Close() {}
-                public void Dispose() {}
- 
-                public void SampleThreads(long activeThreads, long inUseThreads) {}
-                public void SampleWorkItems(long workItemsQueued, long workItemsProcessed) {}
-                public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime) {}
-                public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime) {}
+    {
+        private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
+
+        public static NullSTPInstancePerformanceCounters Instance
+        {
+            get { return _instance; }
+        }
+
+         public void Close() {}
+        public void Dispose() {}
+
+        public void SampleThreads(long activeThreads, long inUseThreads) {}
+        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed) {}
+        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime) {}
+        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime) {}
         public long InUseThreads
         {
             get { return 0; }
@@ -391,7 +391,7 @@ namespace Amib.Threading.Internal
         {
             get { return 0; }
         }
-        }
+    }
 
     internal class LocalSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
     {
diff --git a/ThirdParty/SmartThreadPool/STPStartInfo.cs b/ThirdParty/SmartThreadPool/STPStartInfo.cs
index 96fa094..8ea547c 100644
--- a/ThirdParty/SmartThreadPool/STPStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/STPStartInfo.cs
@@ -3,9 +3,9 @@ using System.Threading;
 
 namespace Amib.Threading
 {
-        /// <summary>
-        /// Summary description for STPStartInfo.
-        /// </summary>
+    /// <summary>
+    /// Summary description for STPStartInfo.
+    /// </summary>
     public class STPStartInfo : WIGStartInfo
     {
         private int _idleTimeout = SmartThreadPool.DefaultIdleTimeout;
@@ -31,7 +31,7 @@ namespace Amib.Threading
             _minWorkerThreads = SmartThreadPool.DefaultMinWorkerThreads;
         }
 
-            public STPStartInfo(STPStartInfo stpStartInfo)
+        public STPStartInfo(STPStartInfo stpStartInfo)
             : base(stpStartInfo)
         {
             _idleTimeout = stpStartInfo.IdleTimeout;
@@ -48,63 +48,63 @@ namespace Amib.Threading
             _apartmentState = stpStartInfo._apartmentState;
 #endif
         }
-          
-            /// <summary>
-            /// Get/Set the idle timeout in milliseconds.
-            /// If a thread is idle (starved) longer than IdleTimeout then it may quit.
-            /// </summary>
-            public virtual int IdleTimeout
-            {
-                get { return _idleTimeout; }
-                set 
+
+        /// <summary>
+        /// Get/Set the idle timeout in milliseconds.
+        /// If a thread is idle (starved) longer than IdleTimeout then it may quit.
+        /// </summary>
+        public virtual int IdleTimeout
+        {
+            get { return _idleTimeout; }
+            set
             {
                 ThrowIfReadOnly();
-                _idleTimeout = value; 
+                _idleTimeout = value;
             }
-            }
+        }
 
 
-            /// <summary>
-            /// Get/Set the lower limit of threads in the pool.
-            /// </summary>
-            public virtual int MinWorkerThreads
-            {
-                get { return _minWorkerThreads; }
-                set 
+        /// <summary>
+        /// Get/Set the lower limit of threads in the pool.
+        /// </summary>
+        public virtual int MinWorkerThreads
+        {
+            get { return _minWorkerThreads; }
+            set
             {
                 ThrowIfReadOnly();
-                _minWorkerThreads = value; 
+                _minWorkerThreads = value;
             }
-            }
+        }
 
 
-            /// <summary>
-            /// Get/Set the upper limit of threads in the pool.
-            /// </summary>
-            public virtual int MaxWorkerThreads
-            {
-                get { return _maxWorkerThreads; }
-                set 
+        /// <summary>
+        /// Get/Set the upper limit of threads in the pool.
+        /// </summary>
+        public virtual int MaxWorkerThreads
+        {
+            get { return _maxWorkerThreads; }
+            set
             {
                 ThrowIfReadOnly();
-                _maxWorkerThreads = value; 
+                _maxWorkerThreads = value;
             }
-            }
+        }
 
 #if !(WINDOWS_PHONE)
-            /// <summary>
-            /// Get/Set the scheduling priority of the threads in the pool.
-            /// The Os handles the scheduling.
-            /// </summary>
-            public virtual ThreadPriority ThreadPriority
-            {
-                get { return _threadPriority; }
-                set 
+        /// <summary>
+        /// Get/Set the scheduling priority of the threads in the pool.
+        /// The Os handles the scheduling.
+        /// </summary>
+        public virtual ThreadPriority ThreadPriority
+        {
+            get { return _threadPriority; }
+            set
             {
                 ThrowIfReadOnly();
-                _threadPriority = value; 
+                _threadPriority = value;
             }
-            }
+        }
 #endif
         /// <summary>
         /// Get/Set the thread pool name. Threads will get names depending on this.
@@ -118,50 +118,50 @@ namespace Amib.Threading
             }
         }
 
-            /// <summary>
-            /// Get/Set the performance counter instance name of this SmartThreadPool
-            /// The default is null which indicate not to use performance counters at all.
-            /// </summary>
-            public virtual string PerformanceCounterInstanceName
-            {
-                get { return _performanceCounterInstanceName; }
-                set 
+        /// <summary>
+        /// Get/Set the performance counter instance name of this SmartThreadPool
+        /// The default is null which indicate not to use performance counters at all.
+        /// </summary>
+        public virtual string PerformanceCounterInstanceName
+        {
+            get { return _performanceCounterInstanceName; }
+            set
             {
                 ThrowIfReadOnly();
-                _performanceCounterInstanceName = value; 
+                _performanceCounterInstanceName = value;
             }
-            }
+        }
 
         /// <summary>
         /// Enable/Disable the local performance counter.
-        /// This enables the user to get some performance information about the SmartThreadPool 
+        /// This enables the user to get some performance information about the SmartThreadPool
         /// without using Windows performance counters. (Useful on WindowsCE, Silverlight, etc.)
         /// The default is false.
         /// </summary>
         public virtual bool EnableLocalPerformanceCounters
-            {
-                get { return _enableLocalPerformanceCounters; }
-                set 
-                        { 
-                                ThrowIfReadOnly(); 
-                                _enableLocalPerformanceCounters = value; 
-                        }
-            }
+        {
+            get { return _enableLocalPerformanceCounters; }
+            set
+            {
+                ThrowIfReadOnly();
+                _enableLocalPerformanceCounters = value;
+            }
+        }
 
         /// <summary>
         /// Get/Set backgroundness of thread in thread pool.
         /// </summary>
-            public virtual bool AreThreadsBackground
-            {
-                get { return _areThreadsBackground; }
-                set
-                {
-                    ThrowIfReadOnly ();
-                    _areThreadsBackground = value;
-                }
-            }
-
-            /// <summary>
+        public virtual bool AreThreadsBackground
+         {
+             get { return _areThreadsBackground; }
+             set
+             {
+                 ThrowIfReadOnly ();
+                 _areThreadsBackground = value;
+             }
+         }
+
+        /// <summary>
         /// Get a readonly version of this STPStartInfo.
         /// </summary>
         /// <returns>Returns a readonly reference to this STPStartInfo</returns>
@@ -185,10 +185,10 @@ namespace Amib.Threading
                 ThrowIfReadOnly();
                 _apartmentState = value;
             }
-        } 
+        }
 
 #if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-        
+
         /// <summary>
         /// Get/Set the max stack size of threads in the thread pool
         /// </summary>
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
index d9502bb..4713332 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
@@ -26,15 +26,15 @@ namespace Amib.Threading
             /// <summary>
             /// A reference from each thread in the thread pool to its SmartThreadPool
             /// object container.
-            /// With this variable a thread can know whatever it belongs to a 
+            /// With this variable a thread can know whatever it belongs to a
             /// SmartThreadPool.
             /// </summary>
             private readonly SmartThreadPool _associatedSmartThreadPool;
 
             /// <summary>
-            /// A reference to the current work item a thread from the thread pool 
+            /// A reference to the current work item a thread from the thread pool
             /// is executing.
-            /// </summary>            
+            /// </summary>
             public WorkItem CurrentWorkItem { get; set; }
 
             public ThreadEntry(SmartThreadPool stp)
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
index 297e20e..7cc7fbf 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -3,7 +3,7 @@
 // Smart Thread Pool
 // 7 Aug 2004 - Initial release
 //
-// 14 Sep 2004 - Bug fixes 
+// 14 Sep 2004 - Bug fixes
 //
 // 15 Oct 2004 - Added new features
 //              - Work items return result.
@@ -18,13 +18,13 @@
 //      - Added finalizers.
 //              - Changed Exceptions so they are serializable.
 //              - Fixed the bug in one of the SmartThreadPool constructors.
-//              - Changed the SmartThreadPool.WaitAll() so it will support any number of waiters. 
+//              - Changed the SmartThreadPool.WaitAll() so it will support any number of waiters.
 //        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
 //              - Added PostExecute with options on which cases to call it.
 //      - Added option to dispose of the state objects.
 //      - Added a WaitForIdle() method that waits until the work items queue is empty.
 //      - Added an STPStartInfo class for the initialization of the thread pool.
-//      - Changed exception handling so if a work item throws an exception it 
+//      - Changed exception handling so if a work item throws an exception it
 //        is rethrown at GetResult(), rather then firing an UnhandledException event.
 //        Note that PostExecute exception are always ignored.
 //
@@ -32,10 +32,10 @@
 //              - Fixed lost of work items bug
 //
 // 3 Jul 2005: Changes.
-//      - Fixed bug where Enqueue() throws an exception because PopWaiter() returned null, hardly reconstructed. 
+//      - Fixed bug where Enqueue() throws an exception because PopWaiter() returned null, hardly reconstructed.
 //
 // 16 Aug 2005: Changes.
-//              - Fixed bug where the InUseThreads becomes negative when canceling work items. 
+//              - Fixed bug where the InUseThreads becomes negative when canceling work items.
 //
 // 31 Jan 2006 - Changes:
 //              - Added work items priority
@@ -45,7 +45,7 @@
 //              - Changed SmartThreadPool.WaitAll() behavior so when it gets empty array
 //                it returns true rather then throwing an exception.
 //              - Added option to start the STP and the WIG as suspended
-//              - Exception behavior changed, the real exception is returned by an 
+//              - Exception behavior changed, the real exception is returned by an
 //                inner exception
 //              - Added option to keep the Http context of the caller thread. (Thanks to Steven T.)
 //              - Added performance counters
@@ -54,17 +54,17 @@
 // 13 Feb 2006 - Changes:
 //              - Added a call to the dispose of the Performance Counter so
 //                their won't be a Performance Counter leak.
-//              - Added exception catch in case the Performance Counters cannot 
+//              - Added exception catch in case the Performance Counters cannot
 //                be created.
 //
 // 17 May 2008 - Changes:
 //      - Changed the dispose behavior and removed the Finalizers.
 //      - Enabled the change of the MaxThreads and MinThreads at run time.
-//      - Enabled the change of the Concurrency of a IWorkItemsGroup at run 
-//        time If the IWorkItemsGroup is a SmartThreadPool then the Concurrency 
-//        refers to the MaxThreads. 
+//      - Enabled the change of the Concurrency of a IWorkItemsGroup at run
+//        time If the IWorkItemsGroup is a SmartThreadPool then the Concurrency
+//        refers to the MaxThreads.
 //      - Improved the cancel behavior.
-//      - Added events for thread creation and termination. 
+//      - Added events for thread creation and termination.
 //      - Fixed the HttpContext context capture.
 //      - Changed internal collections so they use generic collections
 //      - Added IsIdle flag to the SmartThreadPool and IWorkItemsGroup
@@ -83,7 +83,7 @@
 //
 // 20 August 2012 - Changes:
 //      - Added set name to threads
-//      - Fixed the WorkItemsQueue.Dequeue. 
+//      - Fixed the WorkItemsQueue.Dequeue.
 //        Replaced while (!Monitor.TryEnter(this)); with lock(this) { ... }
 //      - Fixed SmartThreadPool.Pipe
 //      - Added IsBackground option to threads
@@ -92,7 +92,7 @@
 //
 // 24 August 2012 - Changes:
 //      - Enabled cancel abort after cancel. See: http://smartthreadpool.codeplex.com/discussions/345937 by alecswan
-//      - Added option to set MaxStackSize of threads 
+//      - Added option to set MaxStackSize of threads
 
 #endregion
 
@@ -108,77 +108,77 @@ using Amib.Threading.Internal;
 
 namespace Amib.Threading
 {
-        #region SmartThreadPool class
-        /// <summary>
-        /// Smart thread pool class.
-        /// </summary>
-        public partial class SmartThreadPool : WorkItemsGroupBase, IDisposable
-        {
-                #region Public Default Constants
-
-                /// <summary>
-                /// Default minimum number of threads the thread pool contains. (0)
-                /// </summary>
-                public const int DefaultMinWorkerThreads = 0;
-
-                /// <summary>
-                /// Default maximum number of threads the thread pool contains. (25)
-                /// </summary>
-                public const int DefaultMaxWorkerThreads = 25;
-
-                /// <summary>
-                /// Default idle timeout in milliseconds. (One minute)
-                /// </summary>
-                public const int DefaultIdleTimeout = 60*1000; // One minute
-
-                /// <summary>
-                /// Indicate to copy the security context of the caller and then use it in the call. (false)
-                /// </summary>
-                public const bool DefaultUseCallerCallContext = false; 
-
-                /// <summary>
-                /// Indicate to copy the HTTP context of the caller and then use it in the call. (false)
-                /// </summary>
-                public const bool DefaultUseCallerHttpContext = false;
-
-                /// <summary>
-                /// Indicate to dispose of the state objects if they support the IDispose interface. (false)
-                /// </summary>
-                public const bool DefaultDisposeOfStateObjects = false; 
-
-                /// <summary>
+    #region SmartThreadPool class
+    /// <summary>
+    /// Smart thread pool class.
+    /// </summary>
+    public partial class SmartThreadPool : WorkItemsGroupBase, IDisposable
+    {
+        #region Public Default Constants
+
+        /// <summary>
+        /// Default minimum number of threads the thread pool contains. (0)
+        /// </summary>
+        public const int DefaultMinWorkerThreads = 0;
+
+        /// <summary>
+        /// Default maximum number of threads the thread pool contains. (25)
+        /// </summary>
+        public const int DefaultMaxWorkerThreads = 25;
+
+        /// <summary>
+        /// Default idle timeout in milliseconds. (One minute)
+        /// </summary>
+        public const int DefaultIdleTimeout = 60*1000; // One minute
+
+        /// <summary>
+        /// Indicate to copy the security context of the caller and then use it in the call. (false)
+        /// </summary>
+        public const bool DefaultUseCallerCallContext = false;
+
+        /// <summary>
+        /// Indicate to copy the HTTP context of the caller and then use it in the call. (false)
+        /// </summary>
+        public const bool DefaultUseCallerHttpContext = false;
+
+        /// <summary>
+        /// Indicate to dispose of the state objects if they support the IDispose interface. (false)
+        /// </summary>
+        public const bool DefaultDisposeOfStateObjects = false;
+
+        /// <summary>
         /// The default option to run the post execute (CallToPostExecute.Always)
-                /// </summary>
-                public const CallToPostExecute DefaultCallToPostExecute = CallToPostExecute.Always;
+        /// </summary>
+        public const CallToPostExecute DefaultCallToPostExecute = CallToPostExecute.Always;
 
-                /// <summary>
-                /// The default post execute method to run. (None)
-                /// When null it means not to call it.
-                /// </summary>
-                public static readonly PostExecuteWorkItemCallback DefaultPostExecuteWorkItemCallback;
+        /// <summary>
+        /// The default post execute method to run. (None)
+        /// When null it means not to call it.
+        /// </summary>
+        public static readonly PostExecuteWorkItemCallback DefaultPostExecuteWorkItemCallback;
 
-                /// <summary>
+        /// <summary>
         /// The default work item priority (WorkItemPriority.Normal)
-                /// </summary>
-                public const WorkItemPriority DefaultWorkItemPriority = WorkItemPriority.Normal;
+        /// </summary>
+        public const WorkItemPriority DefaultWorkItemPriority = WorkItemPriority.Normal;
 
-                /// <summary>
-                /// The default is to work on work items as soon as they arrive
-                /// and not to wait for the start. (false)
-                /// </summary>
-                public const bool DefaultStartSuspended = false;
+        /// <summary>
+        /// The default is to work on work items as soon as they arrive
+        /// and not to wait for the start. (false)
+        /// </summary>
+        public const bool DefaultStartSuspended = false;
 
-                /// <summary>
+        /// <summary>
         /// The default name to use for the performance counters instance. (null)
-                /// </summary>
-                public static readonly string DefaultPerformanceCounterInstanceName;
+        /// </summary>
+        public static readonly string DefaultPerformanceCounterInstanceName;
 
 #if !(WINDOWS_PHONE)
 
-                /// <summary>
+        /// <summary>
         /// The default thread priority (ThreadPriority.Normal)
-                /// </summary>
-                public const ThreadPriority DefaultThreadPriority = ThreadPriority.Normal;
+        /// </summary>
+        public const ThreadPriority DefaultThreadPriority = ThreadPriority.Normal;
 #endif
         /// <summary>
         /// The default thread pool name. (SmartThreadPool)
@@ -203,37 +203,37 @@ namespace Amib.Threading
 
 #if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
         /// <summary>
-        /// The default apartment state of a thread in the thread pool. 
-        /// The default is ApartmentState.Unknown which means the STP will not 
+        /// The default apartment state of a thread in the thread pool.
+        /// The default is ApartmentState.Unknown which means the STP will not
         /// set the apartment of the thread. It will use the .NET default.
         /// </summary>
         public const ApartmentState DefaultApartmentState = ApartmentState.Unknown;
 #endif
 
-                #endregion
+        #endregion
 
         #region Member Variables
 
-                /// <summary>
-                /// Dictionary of all the threads in the thread pool.
-                /// </summary>
+        /// <summary>
+        /// Dictionary of all the threads in the thread pool.
+        /// </summary>
         private readonly SynchronizedDictionary<Thread, ThreadEntry> _workerThreads = new SynchronizedDictionary<Thread, ThreadEntry>();
 
-                /// <summary>
-                /// Queue of work items.
-                /// </summary>
-                private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
+        /// <summary>
+        /// Queue of work items.
+        /// </summary>
+        private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
 
-                /// <summary>
-                /// Count the work items handled.
-                /// Used by the performance counter.
-                /// </summary>
-                private int _workItemsProcessed;
+        /// <summary>
+        /// Count the work items handled.
+        /// Used by the performance counter.
+        /// </summary>
+        private int _workItemsProcessed;
 
-                /// <summary>
-                /// Number of threads that currently work (not idle).
-                /// </summary>
-                private int _inUseWorkerThreads;
+        /// <summary>
+        /// Number of threads that currently work (not idle).
+        /// </summary>
+        private int _inUseWorkerThreads;
 
         /// <summary>
         /// Stores a copy of the original STPStartInfo.
@@ -241,51 +241,51 @@ namespace Amib.Threading
         /// </summary>
         private STPStartInfo _stpStartInfo;
 
-                /// <summary>
-                /// Total number of work items that are stored in the work items queue 
-                /// plus the work items that the threads in the pool are working on.
-                /// </summary>
-                private int _currentWorkItemsCount;
+        /// <summary>
+        /// Total number of work items that are stored in the work items queue
+        /// plus the work items that the threads in the pool are working on.
+        /// </summary>
+        private int _currentWorkItemsCount;
 
-                /// <summary>
-                /// Signaled when the thread pool is idle, i.e. no thread is busy
-                /// and the work items queue is empty
-                /// </summary>
-                //private ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
-                private ManualResetEvent _isIdleWaitHandle = EventWaitHandleFactory.CreateManualResetEvent(true);
+        /// <summary>
+        /// Signaled when the thread pool is idle, i.e. no thread is busy
+        /// and the work items queue is empty
+        /// </summary>
+        //private ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
+        private ManualResetEvent _isIdleWaitHandle = EventWaitHandleFactory.CreateManualResetEvent(true);
 
-                /// <summary>
-                /// An event to signal all the threads to quit immediately.
-                /// </summary>
-                //private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
-                private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
+        /// <summary>
+        /// An event to signal all the threads to quit immediately.
+        /// </summary>
+        //private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
+        private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
 
         /// <summary>
         /// A flag to indicate if the Smart Thread Pool is now suspended.
         /// </summary>
         private bool _isSuspended;
 
-                /// <summary>
-                /// A flag to indicate the threads to quit.
-                /// </summary>
-                private bool _shutdown;
-
-                /// <summary>
-                /// Counts the threads created in the pool.
-                /// It is used to name the threads.
-                /// </summary>
-                private int _threadCounter;
-
-                /// <summary>
-                /// Indicate that the SmartThreadPool has been disposed
-                /// </summary>
-                private bool _isDisposed;
-
-                /// <summary>
-                /// Holds all the WorkItemsGroup instaces that have at least one 
-                /// work item int the SmartThreadPool
-                /// This variable is used in case of Shutdown
-                /// </summary>
+        /// <summary>
+        /// A flag to indicate the threads to quit.
+        /// </summary>
+        private bool _shutdown;
+
+        /// <summary>
+        /// Counts the threads created in the pool.
+        /// It is used to name the threads.
+        /// </summary>
+        private int _threadCounter;
+
+        /// <summary>
+        /// Indicate that the SmartThreadPool has been disposed
+        /// </summary>
+        private bool _isDisposed;
+
+        /// <summary>
+        /// Holds all the WorkItemsGroup instaces that have at least one
+        /// work item int the SmartThreadPool
+        /// This variable is used in case of Shutdown
+        /// </summary>
         private readonly SynchronizedDictionary<IWorkItemsGroup, IWorkItemsGroup> _workItemsGroups = new SynchronizedDictionary<IWorkItemsGroup, IWorkItemsGroup>();
 
         /// <summary>
@@ -305,7 +305,7 @@ namespace Amib.Threading
         private ISTPInstancePerformanceCounters _localPCs = NullSTPInstancePerformanceCounters.Instance;
 
 
-#if (WINDOWS_PHONE) 
+#if (WINDOWS_PHONE)
         private static readonly Dictionary<int, ThreadEntry> _threadEntries = new Dictionary<int, ThreadEntry>();
 #elif (_WINDOWS_CE)
         private static LocalDataStoreSlot _threadEntrySlot = Thread.AllocateDataSlot();
@@ -316,13 +316,13 @@ namespace Amib.Threading
 #endif
 
         /// <summary>
-        /// An event to call after a thread is created, but before 
+        /// An event to call after a thread is created, but before
         /// it's first use.
         /// </summary>
         private event ThreadInitializationHandler _onThreadInitialization;
 
         /// <summary>
-        /// An event to call when a thread is about to exit, after 
+        /// An event to call when a thread is about to exit, after
         /// it is no longer belong to the pool.
         /// </summary>
         private event ThreadTerminationHandler _onThreadTermination;
@@ -332,7 +332,7 @@ namespace Amib.Threading
         #region Per thread properties
 
         /// <summary>
-        /// A reference to the current work item a thread from the thread pool 
+        /// A reference to the current work item a thread from the thread pool
         /// is executing.
         /// </summary>
         internal static ThreadEntry CurrentThreadEntry
@@ -383,78 +383,78 @@ namespace Amib.Threading
         #region Construction and Finalization
 
         /// <summary>
-                /// Constructor
-                /// </summary>
-                public SmartThreadPool()
-                {
+        /// Constructor
+        /// </summary>
+        public SmartThreadPool()
+        {
             _stpStartInfo = new STPStartInfo();
             Initialize();
-                }
-
-                /// <summary>
-                /// Constructor
-                /// </summary>
-                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-                public SmartThreadPool(int idleTimeout)
-                {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+        public SmartThreadPool(int idleTimeout)
+        {
             _stpStartInfo = new STPStartInfo
             {
                 IdleTimeout = idleTimeout,
             };
-                        Initialize();
-                }
-
-                /// <summary>
-                /// Constructor
-                /// </summary>
-                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-                /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
-                public SmartThreadPool(
-                        int idleTimeout,
-                        int maxWorkerThreads)
-                {
+            Initialize();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+        /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
+        public SmartThreadPool(
+            int idleTimeout,
+            int maxWorkerThreads)
+        {
             _stpStartInfo = new STPStartInfo
             {
                 IdleTimeout = idleTimeout,
                 MaxWorkerThreads = maxWorkerThreads,
             };
-                        Initialize();
-                }
-
-                /// <summary>
-                /// Constructor
-                /// </summary>
-                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-                /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
-                /// <param name="minWorkerThreads">Lower limit of threads in the pool</param>
-                public SmartThreadPool(
-                        int idleTimeout,
-                        int maxWorkerThreads,
-                        int minWorkerThreads)
-                {
+            Initialize();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+        /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
+        /// <param name="minWorkerThreads">Lower limit of threads in the pool</param>
+        public SmartThreadPool(
+            int idleTimeout,
+            int maxWorkerThreads,
+            int minWorkerThreads)
+        {
             _stpStartInfo = new STPStartInfo
             {
                 IdleTimeout = idleTimeout,
                 MaxWorkerThreads = maxWorkerThreads,
                 MinWorkerThreads = minWorkerThreads,
             };
-                        Initialize();
-                }
+            Initialize();
+        }
 
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="stpStartInfo">A SmartThreadPool configuration that overrides the default behavior</param>
-                public SmartThreadPool(STPStartInfo stpStartInfo)
-                {
-                        _stpStartInfo = new STPStartInfo(stpStartInfo);
-                        Initialize();
-                }
-
-                private void Initialize()
-                {
+        public SmartThreadPool(STPStartInfo stpStartInfo)
+        {
+            _stpStartInfo = new STPStartInfo(stpStartInfo);
+            Initialize();
+        }
+
+        private void Initialize()
+        {
             Name = _stpStartInfo.ThreadPoolName;
-                        ValidateSTPStartInfo();
+            ValidateSTPStartInfo();
 
             // _stpStartInfoRW stores a read/write copy of the STPStartInfo.
             // Actually only MaxWorkerThreads and MinWorkerThreads are overwritten
@@ -462,8 +462,8 @@ namespace Amib.Threading
             _isSuspended = _stpStartInfo.StartSuspended;
 
 #if (_WINDOWS_CE) || (_SILVERLIGHT) || (_MONO) || (WINDOWS_PHONE)
-                        if (null != _stpStartInfo.PerformanceCounterInstanceName)
-                        {
+            if (null != _stpStartInfo.PerformanceCounterInstanceName)
+            {
                 throw new NotSupportedException("Performance counters are not implemented for Compact Framework/Silverlight/Mono, instead use StpStartInfo.EnableLocalPerformanceCounters");
             }
 #else
@@ -486,110 +486,110 @@ namespace Amib.Threading
                 _localPCs = new LocalSTPInstancePerformanceCounters();
             }
 
-                    // If the STP is not started suspended then start the threads.
+            // If the STP is not started suspended then start the threads.
             if (!_isSuspended)
             {
                 StartOptimalNumberOfThreads();
             }
-                }
+        }
 
-                private void StartOptimalNumberOfThreads()
-                {
-                        int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
+        private void StartOptimalNumberOfThreads()
+        {
+            int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
             threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
             threadsCount -= _workerThreads.Count;
             if (threadsCount > 0)
             {
                 StartThreads(threadsCount);
             }
-                }
+        }
 
-                private void ValidateSTPStartInfo()
-                {
+        private void ValidateSTPStartInfo()
+        {
             if (_stpStartInfo.MinWorkerThreads < 0)
-                        {
-                                throw new ArgumentOutOfRangeException(
-                                        "MinWorkerThreads", "MinWorkerThreads cannot be negative");
-                        }
+            {
+                throw new ArgumentOutOfRangeException(
+                    "MinWorkerThreads", "MinWorkerThreads cannot be negative");
+            }
 
             if (_stpStartInfo.MaxWorkerThreads <= 0)
-                        {
-                                throw new ArgumentOutOfRangeException(
-                                        "MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
-                        }
+            {
+                throw new ArgumentOutOfRangeException(
+                    "MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
+            }
 
             if (_stpStartInfo.MinWorkerThreads > _stpStartInfo.MaxWorkerThreads)
-                        {
-                                throw new ArgumentOutOfRangeException(
-                                        "MinWorkerThreads, maxWorkerThreads", 
-                                        "MaxWorkerThreads must be greater or equal to MinWorkerThreads");
-                        }
-                }
-
-                private static void ValidateCallback(Delegate callback)
-                {
-                        if(callback.GetInvocationList().Length > 1)
-                        {
-                                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
-                        }
-                }
-
-                #endregion
-
-                #region Thread Processing
-
-                /// <summary>
-                /// Waits on the queue for a work item, shutdown, or timeout.
-                /// </summary>
-                /// <returns>
-                /// Returns the WaitingCallback or null in case of timeout or shutdown.
-                /// </returns>
-                private WorkItem Dequeue()
-                {
-                        WorkItem workItem =
+            {
+                throw new ArgumentOutOfRangeException(
+                    "MinWorkerThreads, maxWorkerThreads",
+                    "MaxWorkerThreads must be greater or equal to MinWorkerThreads");
+            }
+        }
+
+        private static void ValidateCallback(Delegate callback)
+        {
+            if(callback.GetInvocationList().Length > 1)
+            {
+                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
+            }
+        }
+
+        #endregion
+
+        #region Thread Processing
+
+        /// <summary>
+        /// Waits on the queue for a work item, shutdown, or timeout.
+        /// </summary>
+        /// <returns>
+        /// Returns the WaitingCallback or null in case of timeout or shutdown.
+        /// </returns>
+        private WorkItem Dequeue()
+        {
+            WorkItem workItem =
                 _workItemsQueue.DequeueWorkItem(_stpStartInfo.IdleTimeout, _shuttingDownEvent);
 
-                        return workItem;
-                }
+            return workItem;
+        }
 
-                /// <summary>
-                /// Put a new work item in the queue
-                /// </summary>
-                /// <param name="workItem">A work item to queue</param>
-                internal override void Enqueue(WorkItem workItem)
-                {
-                        // Make sure the workItem is not null
-                        Debug.Assert(null != workItem);
+        /// <summary>
+        /// Put a new work item in the queue
+        /// </summary>
+        /// <param name="workItem">A work item to queue</param>
+        internal override void Enqueue(WorkItem workItem)
+        {
+            // Make sure the workItem is not null
+            Debug.Assert(null != workItem);
 
-                        IncrementWorkItemsCount();
+            IncrementWorkItemsCount();
 
             workItem.CanceledSmartThreadPool = _canceledSmartThreadPool;
-                        _workItemsQueue.EnqueueWorkItem(workItem);
-                        workItem.WorkItemIsQueued();
-
-                        // If all the threads are busy then try to create a new one
-                        if (_currentWorkItemsCount > _workerThreads.Count) 
-                        {
-                                StartThreads(1);
-                        }
-                }
-
-                private void IncrementWorkItemsCount()
-                {
-                        _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+            _workItemsQueue.EnqueueWorkItem(workItem);
+            workItem.WorkItemIsQueued();
+
+            // If all the threads are busy then try to create a new one
+            if (_currentWorkItemsCount > _workerThreads.Count)
+            {
+                StartThreads(1);
+            }
+        }
+
+        private void IncrementWorkItemsCount()
+        {
+            _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
             _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
 
-                        int count = Interlocked.Increment(ref _currentWorkItemsCount);
-                        //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
-                        if (count == 1) 
-                        {
+            int count = Interlocked.Increment(ref _currentWorkItemsCount);
+            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
+            if (count == 1)
+            {
                 IsIdle = false;
                 _isIdleWaitHandle.Reset();
-                        }
-                }
+            }
+        }
 
-                private void DecrementWorkItemsCount()
-                {
+        private void DecrementWorkItemsCount()
+        {
             int count = Interlocked.Decrement(ref _currentWorkItemsCount);
             //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
             if (count == 0)
@@ -602,81 +602,81 @@ namespace Amib.Threading
 
             if (!_shutdown)
             {
-                            // The counter counts even if the work item was cancelled
-                            _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+                // The counter counts even if the work item was cancelled
+                _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
                 _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
             }
 
-                }
-
-                internal void RegisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
-                {
-                        _workItemsGroups[workItemsGroup] = workItemsGroup;
-                }
-
-                internal void UnregisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
-                {
-                        if (_workItemsGroups.Contains(workItemsGroup))
-                        {
-                                _workItemsGroups.Remove(workItemsGroup);
-                        }
-                }
-
-                /// <summary>
-                /// Inform that the current thread is about to quit or quiting.
-                /// The same thread may call this method more than once.
-                /// </summary>
-                private void InformCompleted()
-                {
-                        // There is no need to lock the two methods together 
-                        // since only the current thread removes itself
-                        // and the _workerThreads is a synchronized dictionary
-                        if (_workerThreads.Contains(Thread.CurrentThread))
-                        {
-                                _workerThreads.Remove(Thread.CurrentThread);
-                                _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+        }
+
+        internal void RegisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
+        {
+            _workItemsGroups[workItemsGroup] = workItemsGroup;
+        }
+
+        internal void UnregisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
+        {
+            if (_workItemsGroups.Contains(workItemsGroup))
+            {
+                _workItemsGroups.Remove(workItemsGroup);
+            }
+        }
+
+        /// <summary>
+        /// Inform that the current thread is about to quit or quiting.
+        /// The same thread may call this method more than once.
+        /// </summary>
+        private void InformCompleted()
+        {
+            // There is no need to lock the two methods together
+            // since only the current thread removes itself
+            // and the _workerThreads is a synchronized dictionary
+            if (_workerThreads.Contains(Thread.CurrentThread))
+            {
+                _workerThreads.Remove(Thread.CurrentThread);
+                _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
                 _localPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
-                        }
-                }
-
-                /// <summary>
-                /// Starts new threads
-                /// </summary>
-                /// <param name="threadsCount">The number of threads to start</param>
-                private void StartThreads(int threadsCount)
-                {
+            }
+        }
+
+        /// <summary>
+        /// Starts new threads
+        /// </summary>
+        /// <param name="threadsCount">The number of threads to start</param>
+        private void StartThreads(int threadsCount)
+        {
             if (_isSuspended)
-                        {
-                                return;
-                        }
-
-                        lock(_workerThreads.SyncRoot)
-                        {
-                                // Don't start threads on shut down
-                                if (_shutdown)
-                                {
-                                        return;
-                                }
-
-                                for(int i = 0; i < threadsCount; ++i)
-                                {
-                                        // Don't create more threads then the upper limit
+            {
+                return;
+            }
+
+            lock(_workerThreads.SyncRoot)
+            {
+                // Don't start threads on shut down
+                if (_shutdown)
+                {
+                    return;
+                }
+
+                for(int i = 0; i < threadsCount; ++i)
+                {
+                    // Don't create more threads then the upper limit
                     if (_workerThreads.Count >= _stpStartInfo.MaxWorkerThreads)
-                                        {
-                                                return;
-                                        }
+                    {
+                        return;
+                    }
 
                     // Create a new thread
 
 #if (_SILVERLIGHT) || (WINDOWS_PHONE)
-                                        Thread workerThread = new Thread(ProcessQueuedItems);
+                    Thread workerThread = new Thread(ProcessQueuedItems);
 #else
                     Thread workerThread =
                         _stpStartInfo.MaxStackSize.HasValue
                         ? new Thread(ProcessQueuedItems, _stpStartInfo.MaxStackSize.Value)
                         : new Thread(ProcessQueuedItems);
 #endif
-                                        // Configure the new thread and start it
+                    // Configure the new thread and start it
                     workerThread.IsBackground = _stpStartInfo.AreThreadsBackground;
 
 #if !(_SILVERLIGHT) && !(_WINDOWS_CE) && !(WINDOWS_PHONE)
@@ -697,32 +697,32 @@ namespace Amib.Threading
                     // Add it to the dictionary and update its creation time.
                     _workerThreads[workerThread] = new ThreadEntry(this);
 
-                                        _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                    _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
                     _localPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// A worker thread method that processes work items from the work items queue.
-                /// </summary>
-                private void ProcessQueuedItems()
-                {
+                }
+            }
+        }
+
+        /// <summary>
+        /// A worker thread method that processes work items from the work items queue.
+        /// </summary>
+        private void ProcessQueuedItems()
+        {
             // Keep the entry of the dictionary as thread's variable to avoid the synchronization locks
             // of the dictionary.
             CurrentThreadEntry = _workerThreads[Thread.CurrentThread];
 
             FireOnThreadInitialization();
 
-                        try
-                        {
-                                bool bInUseWorkerThreadsWasIncremented = false;
+            try
+            {
+                bool bInUseWorkerThreadsWasIncremented = false;
 
-                                // Process until shutdown.
-                                while(!_shutdown)
-                                {
-                                        // Update the last time this thread was seen alive.
-                                        // It's good for debugging.
+                // Process until shutdown.
+                while(!_shutdown)
+                {
+                    // Update the last time this thread was seen alive.
+                    // It's good for debugging.
                     CurrentThreadEntry.IAmAlive();
 
                     // The following block handles the when the MaxWorkerThreads has been
@@ -744,166 +744,166 @@ namespace Amib.Threading
                         }
                     }
 
-                                        // Wait for a work item, shutdown, or timeout
-                                        WorkItem workItem = Dequeue();
+                    // Wait for a work item, shutdown, or timeout
+                    WorkItem workItem = Dequeue();
 
-                                        // Update the last time this thread was seen alive.
-                                        // It's good for debugging.
+                    // Update the last time this thread was seen alive.
+                    // It's good for debugging.
                     CurrentThreadEntry.IAmAlive();
 
-                                        // On timeout or shut down.
-                                        if (null == workItem)
-                                        {
-                                                // Double lock for quit.
+                    // On timeout or shut down.
+                    if (null == workItem)
+                    {
+                        // Double lock for quit.
                         if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
-                                                {
-                                                        lock(_workerThreads.SyncRoot)
-                                                        {
+                        {
+                            lock(_workerThreads.SyncRoot)
+                            {
                                 if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
-                                                                {
-                                                                        // Inform that the thread is quiting and then quit.
-                                                                        // This method must be called within this lock or else
-                                                                        // more threads will quit and the thread pool will go
-                                                                        // below the lower limit.
-                                                                        InformCompleted();
-                                                                        break;
-                                                                }
-                                                        }
-                                                }
-                                        }
-
-                                        // If we didn't quit then skip to the next iteration.
-                                        if (null == workItem)
-                                        {
-                                                continue;
-                                        }
-
-                                        try 
-                                        {
-                                                // Initialize the value to false
-                                                bInUseWorkerThreadsWasIncremented = false;
+                                {
+                                    // Inform that the thread is quiting and then quit.
+                                    // This method must be called within this lock or else
+                                    // more threads will quit and the thread pool will go
+                                    // below the lower limit.
+                                    InformCompleted();
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    // If we didn't quit then skip to the next iteration.
+                    if (null == workItem)
+                    {
+                        continue;
+                    }
+
+                    try
+                    {
+                        // Initialize the value to false
+                        bInUseWorkerThreadsWasIncremented = false;
 
                         // Set the Current Work Item of the thread.
-                        // Store the Current Work Item  before the workItem.StartingWorkItem() is called, 
-                        // so WorkItem.Cancel can work when the work item is between InQueue and InProgress 
+                        // Store the Current Work Item  before the workItem.StartingWorkItem() is called,
+                        // so WorkItem.Cancel can work when the work item is between InQueue and InProgress
                         // states.
-                        // If the work item has been cancelled BEFORE the workItem.StartingWorkItem() 
+                        // If the work item has been cancelled BEFORE the workItem.StartingWorkItem()
                         // (work item is in InQueue state) then workItem.StartingWorkItem() will return false.
                         // If the work item has been cancelled AFTER the workItem.StartingWorkItem() then
                         // (work item is in InProgress state) then the thread will be aborted
                         CurrentThreadEntry.CurrentWorkItem = workItem;
 
-                                                // Change the state of the work item to 'in progress' if possible.
-                                                // We do it here so if the work item has been canceled we won't 
-                                                // increment the _inUseWorkerThreads.
-                                                // The cancel mechanism doesn't delete items from the queue,  
-                                                // it marks the work item as canceled, and when the work item
-                                                // is dequeued, we just skip it.
-                                                // If the post execute of work item is set to always or to
-                                                // call when the work item is canceled then the StartingWorkItem()
-                                                // will return true, so the post execute can run.
-                                                if (!workItem.StartingWorkItem())
-                                                {
-                                                        continue;
-                                                }
-
-                                                // Execute the callback.  Make sure to accurately
-                                                // record how many callbacks are currently executing.
-                                                int inUseWorkerThreads = Interlocked.Increment(ref _inUseWorkerThreads);
-                                                _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                        // Change the state of the work item to 'in progress' if possible.
+                        // We do it here so if the work item has been canceled we won't
+                        // increment the _inUseWorkerThreads.
+                        // The cancel mechanism doesn't delete items from the queue,
+                        // it marks the work item as canceled, and when the work item
+                        // is dequeued, we just skip it.
+                        // If the post execute of work item is set to always or to
+                        // call when the work item is canceled then the StartingWorkItem()
+                        // will return true, so the post execute can run.
+                        if (!workItem.StartingWorkItem())
+                        {
+                            continue;
+                        }
+
+                        // Execute the callback.  Make sure to accurately
+                        // record how many callbacks are currently executing.
+                        int inUseWorkerThreads = Interlocked.Increment(ref _inUseWorkerThreads);
+                        _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
                         _localPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
 
-                                                // Mark that the _inUseWorkerThreads incremented, so in the finally{}
-                                                // statement we will decrement it correctly.
-                                                bInUseWorkerThreadsWasIncremented = true;
+                        // Mark that the _inUseWorkerThreads incremented, so in the finally{}
+                        // statement we will decrement it correctly.
+                        bInUseWorkerThreadsWasIncremented = true;
 
                         workItem.FireWorkItemStarted();
 
-                                                ExecuteWorkItem(workItem);
-                                        }
-                                        catch(Exception ex)
-                                        {
+                        ExecuteWorkItem(workItem);
+                    }
+                    catch(Exception ex)
+                    {
                         ex.GetHashCode();
-                                                // Do nothing
-                                        }
-                                        finally
-                                        {
-                                                workItem.DisposeOfState();
-
-                                                // Set the CurrentWorkItem to null, since we 
-                                                // no longer run user's code.
+                        // Do nothing
+                    }
+                    finally
+                    {
+                        workItem.DisposeOfState();
+
+                        // Set the CurrentWorkItem to null, since we
+                        // no longer run user's code.
                         CurrentThreadEntry.CurrentWorkItem = null;
 
-                                                // Decrement the _inUseWorkerThreads only if we had 
-                                                // incremented it. Note the cancelled work items don't
-                                                // increment _inUseWorkerThreads.
-                                                if (bInUseWorkerThreadsWasIncremented)
-                                                {
-                                                        int inUseWorkerThreads = Interlocked.Decrement(ref _inUseWorkerThreads);
-                                                        _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                        // Decrement the _inUseWorkerThreads only if we had
+                        // incremented it. Note the cancelled work items don't
+                        // increment _inUseWorkerThreads.
+                        if (bInUseWorkerThreadsWasIncremented)
+                        {
+                            int inUseWorkerThreads = Interlocked.Decrement(ref _inUseWorkerThreads);
+                            _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
                             _localPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
-                                                }
-
-                                                // Notify that the work item has been completed.
-                                                // WorkItemsGroup may enqueue their next work item.
-                                                workItem.FireWorkItemCompleted();
-
-                                                // Decrement the number of work items here so the idle 
-                                                // ManualResetEvent won't fluctuate.
-                                                DecrementWorkItemsCount();
-                                        }
-                                }
-                        } 
-                        catch(ThreadAbortException tae)
-                        {
+                        }
+
+                        // Notify that the work item has been completed.
+                        // WorkItemsGroup may enqueue their next work item.
+                        workItem.FireWorkItemCompleted();
+
+                        // Decrement the number of work items here so the idle
+                        // ManualResetEvent won't fluctuate.
+                        DecrementWorkItemsCount();
+                    }
+                }
+            }
+            catch(ThreadAbortException tae)
+            {
                 tae.GetHashCode();
                 // Handle the abort exception gracfully.
 #if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-                                Thread.ResetAbort();
+                Thread.ResetAbort();
 #endif
             }
-                        catch(Exception e)
-                        {
-                                Debug.Assert(null != e);
-                        }
-                        finally
-                        {
-                                InformCompleted();
+            catch(Exception e)
+            {
+                Debug.Assert(null != e);
+            }
+            finally
+            {
+                InformCompleted();
                 FireOnThreadTermination();
-                        }
-                }
+            }
+        }
 
-                private void ExecuteWorkItem(WorkItem workItem)
-                {
-                        _windowsPCs.SampleWorkItemsWaitTime(workItem.WaitingTime);
+        private void ExecuteWorkItem(WorkItem workItem)
+        {
+            _windowsPCs.SampleWorkItemsWaitTime(workItem.WaitingTime);
             _localPCs.SampleWorkItemsWaitTime(workItem.WaitingTime);
-                        try
-                        {
-                                workItem.Execute();
-                        }
-                        finally
-                        {
-                                _windowsPCs.SampleWorkItemsProcessTime(workItem.ProcessTime);
+            try
+            {
+                workItem.Execute();
+            }
+            finally
+            {
+                _windowsPCs.SampleWorkItemsProcessTime(workItem.ProcessTime);
                 _localPCs.SampleWorkItemsProcessTime(workItem.ProcessTime);
-                        }
-                }
+            }
+        }
 
 
-                #endregion
+        #endregion
 
-                #region Public Methods
+        #region Public Methods
 
-                private void ValidateWaitForIdle()
-                {
+        private void ValidateWaitForIdle()
+        {
             if (null != CurrentThreadEntry && CurrentThreadEntry.AssociatedSmartThreadPool == this)
-                        {
-                                throw new NotSupportedException(
-                                        "WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
-                        }
-                }
-
-                internal static void ValidateWorkItemsGroupWaitForIdle(IWorkItemsGroup workItemsGroup)
-                {
+            {
+                throw new NotSupportedException(
+                    "WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+            }
+        }
+
+        internal static void ValidateWorkItemsGroupWaitForIdle(IWorkItemsGroup workItemsGroup)
+        {
             if (null == CurrentThreadEntry)
             {
                 return;
@@ -911,334 +911,334 @@ namespace Amib.Threading
 
             WorkItem workItem = CurrentThreadEntry.CurrentWorkItem;
             ValidateWorkItemsGroupWaitForIdleImpl(workItemsGroup, workItem);
-                        if ((null != workItemsGroup) &&
+            if ((null != workItemsGroup) &&
                 (null != workItem) &&
                 CurrentThreadEntry.CurrentWorkItem.WasQueuedBy(workItemsGroup))
-                        {
-                                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
-                        }
-                }
-
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                private static void ValidateWorkItemsGroupWaitForIdleImpl(IWorkItemsGroup workItemsGroup, WorkItem workItem)
-                {
-                        if ((null != workItemsGroup) && 
-                                (null != workItem) &&
-                                workItem.WasQueuedBy(workItemsGroup))
-                        {
-                                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
-                        }
-                }
-
-                /// <summary>
-                /// Force the SmartThreadPool to shutdown
-                /// </summary>
-                public void Shutdown()
-                {
-                        Shutdown(true, 0);
-                }
+            {
+                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ValidateWorkItemsGroupWaitForIdleImpl(IWorkItemsGroup workItemsGroup, WorkItem workItem)
+        {
+            if ((null != workItemsGroup) &&
+                (null != workItem) &&
+                workItem.WasQueuedBy(workItemsGroup))
+            {
+                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+            }
+        }
+
+        /// <summary>
+        /// Force the SmartThreadPool to shutdown
+        /// </summary>
+        public void Shutdown()
+        {
+            Shutdown(true, 0);
+        }
 
         /// <summary>
         /// Force the SmartThreadPool to shutdown with timeout
         /// </summary>
         public void Shutdown(bool forceAbort, TimeSpan timeout)
-                {
-                        Shutdown(forceAbort, (int)timeout.TotalMilliseconds);
-                }
+        {
+            Shutdown(forceAbort, (int)timeout.TotalMilliseconds);
+        }
 
-                /// <summary>
-                /// Empties the queue of work items and abort the threads in the pool.
-                /// </summary>
-                public void Shutdown(bool forceAbort, int millisecondsTimeout)
-                {
-                        ValidateNotDisposed();
+        /// <summary>
+        /// Empties the queue of work items and abort the threads in the pool.
+        /// </summary>
+        public void Shutdown(bool forceAbort, int millisecondsTimeout)
+        {
+            ValidateNotDisposed();
 
-                        ISTPInstancePerformanceCounters pcs = _windowsPCs;
+            ISTPInstancePerformanceCounters pcs = _windowsPCs;
 
-                        if (NullSTPInstancePerformanceCounters.Instance != _windowsPCs)
-                        {
-                                // Set the _pcs to "null" to stop updating the performance
-                                // counters
-                                _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+            if (NullSTPInstancePerformanceCounters.Instance != _windowsPCs)
+            {
+                // Set the _pcs to "null" to stop updating the performance
+                // counters
+                _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
 
                 pcs.Dispose();
-                        }
+            }
 
-                        Thread [] threads;
-                        lock(_workerThreads.SyncRoot)
-                        {
-                                // Shutdown the work items queue
-                                _workItemsQueue.Dispose();
+            Thread [] threads;
+            lock(_workerThreads.SyncRoot)
+            {
+                // Shutdown the work items queue
+                _workItemsQueue.Dispose();
 
-                                // Signal the threads to exit
-                                _shutdown = true;
-                                _shuttingDownEvent.Set();
+                // Signal the threads to exit
+                _shutdown = true;
+                _shuttingDownEvent.Set();
 
-                                // Make a copy of the threads' references in the pool
-                                threads = new Thread [_workerThreads.Count];
-                                _workerThreads.Keys.CopyTo(threads, 0);
-                        }
+                // Make a copy of the threads' references in the pool
+                threads = new Thread [_workerThreads.Count];
+                _workerThreads.Keys.CopyTo(threads, 0);
+            }
 
-                        int millisecondsLeft = millisecondsTimeout;
+            int millisecondsLeft = millisecondsTimeout;
             Stopwatch stopwatch = Stopwatch.StartNew();
             //DateTime start = DateTime.UtcNow;
-                        bool waitInfinitely = (Timeout.Infinite == millisecondsTimeout);
-                        bool timeout = false;
-
-                        // Each iteration we update the time left for the timeout.
-                        foreach(Thread thread in threads)
-                        {
-                                // Join don't work with negative numbers
-                                if (!waitInfinitely && (millisecondsLeft < 0))
-                                {
-                                        timeout = true;
-                                        break;
-                                }
-
-                                // Wait for the thread to terminate
-                                bool success = thread.Join(millisecondsLeft);
-                                if(!success)
-                                {
-                                        timeout = true;
-                                        break;
-                                }
-
-                                if(!waitInfinitely)
-                                {
-                                        // Update the time left to wait
+            bool waitInfinitely = (Timeout.Infinite == millisecondsTimeout);
+            bool timeout = false;
+
+            // Each iteration we update the time left for the timeout.
+            foreach(Thread thread in threads)
+            {
+                // Join don't work with negative numbers
+                if (!waitInfinitely && (millisecondsLeft < 0))
+                {
+                    timeout = true;
+                    break;
+                }
+
+                // Wait for the thread to terminate
+                bool success = thread.Join(millisecondsLeft);
+                if(!success)
+                {
+                    timeout = true;
+                    break;
+                }
+
+                if(!waitInfinitely)
+                {
+                    // Update the time left to wait
                     //TimeSpan ts = DateTime.UtcNow - start;
                     millisecondsLeft = millisecondsTimeout - (int)stopwatch.ElapsedMilliseconds;
-                                }
-                        }
-
-                        if (timeout && forceAbort)
-                        {
-                                // Abort the threads in the pool
-                                foreach(Thread thread in threads)
-                                {
-                    
-                                        if ((thread != null)
+                }
+            }
+
+            if (timeout && forceAbort)
+            {
+                // Abort the threads in the pool
+                foreach(Thread thread in threads)
+                {
+
+                    if ((thread != null)
 #if !(_WINDOWS_CE)
                         && thread.IsAlive
-#endif                        
+#endif
                         )
-                                        {
-                                                try 
-                                                {
+                    {
+                        try
+                        {
                             thread.Abort(); // Shutdown
-                                                }
-                                                catch(SecurityException e)
-                                                {
+                        }
+                        catch(SecurityException e)
+                        {
                             e.GetHashCode();
-                                                }
-                                                catch(ThreadStateException ex)
-                                                {
+                        }
+                        catch(ThreadStateException ex)
+                        {
                             ex.GetHashCode();
-                                                        // In case the thread has been terminated 
-                                                        // after the check if it is alive.
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Wait for all work items to complete
-                /// </summary>
+                            // In case the thread has been terminated
+                            // after the check if it is alive.
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Wait for all work items to complete
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <returns>
-                /// true when every work item in workItemResults has completed; otherwise false.
-                /// </returns>
-                public static bool WaitAll(
-                        IWaitableResult [] waitableResults)
-                {
+        /// <returns>
+        /// true when every work item in workItemResults has completed; otherwise false.
+        /// </returns>
+        public static bool WaitAll(
+            IWaitableResult [] waitableResults)
+        {
             return WaitAll(waitableResults, Timeout.Infinite, true);
-                }
+        }
 
-                /// <summary>
-                /// Wait for all work items to complete
-                /// </summary>
+        /// <summary>
+        /// Wait for all work items to complete
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <returns>
-                /// true when every work item in workItemResults has completed; otherwise false.
-                /// </returns>
-                public static bool WaitAll(
-                        IWaitableResult [] waitableResults,
-                        TimeSpan timeout,
-                        bool exitContext)
-                {
+        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <returns>
+        /// true when every work item in workItemResults has completed; otherwise false.
+        /// </returns>
+        public static bool WaitAll(
+            IWaitableResult [] waitableResults,
+            TimeSpan timeout,
+            bool exitContext)
+        {
             return WaitAll(waitableResults, (int)timeout.TotalMilliseconds, exitContext);
-                }
+        }
 
-                /// <summary>
-                /// Wait for all work items to complete
-                /// </summary>
+        /// <summary>
+        /// Wait for all work items to complete
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-                /// <returns>
-                /// true when every work item in workItemResults has completed; otherwise false.
-                /// </returns>
-                public static bool WaitAll(
-            IWaitableResult[] waitableResults,  
-                        TimeSpan timeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle)
-                {
+        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+        /// <returns>
+        /// true when every work item in workItemResults has completed; otherwise false.
+        /// </returns>
+        public static bool WaitAll(
+            IWaitableResult[] waitableResults,
+            TimeSpan timeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle)
+        {
             return WaitAll(waitableResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
-                }
+        }
 
-                /// <summary>
-                /// Wait for all work items to complete
-                /// </summary>
+        /// <summary>
+        /// Wait for all work items to complete
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <returns>
-                /// true when every work item in workItemResults has completed; otherwise false.
-                /// </returns>
-                public static bool WaitAll(
-                        IWaitableResult [] waitableResults,  
-                        int millisecondsTimeout,
-                        bool exitContext)
-                {
+        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <returns>
+        /// true when every work item in workItemResults has completed; otherwise false.
+        /// </returns>
+        public static bool WaitAll(
+            IWaitableResult [] waitableResults,
+            int millisecondsTimeout,
+            bool exitContext)
+        {
             return WorkItem.WaitAll(waitableResults, millisecondsTimeout, exitContext, null);
-                }
+        }
 
-                /// <summary>
-                /// Wait for all work items to complete
-                /// </summary>
+        /// <summary>
+        /// Wait for all work items to complete
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-                /// <returns>
-                /// true when every work item in workItemResults has completed; otherwise false.
-                /// </returns>
-                public static bool WaitAll(
-            IWaitableResult[] waitableResults,  
-                        int millisecondsTimeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle)
-                {
+        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+        /// <returns>
+        /// true when every work item in workItemResults has completed; otherwise false.
+        /// </returns>
+        public static bool WaitAll(
+            IWaitableResult[] waitableResults,
+            int millisecondsTimeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle)
+        {
             return WorkItem.WaitAll(waitableResults, millisecondsTimeout, exitContext, cancelWaitHandle);
-                }
+        }
 
 
-                /// <summary>
-                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-                /// </summary>
+        /// <summary>
+        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <returns>
-                /// The array index of the work item result that satisfied the wait, or WaitTimeout if any of the work items has been canceled.
-                /// </returns>
-                public static int WaitAny(
-                        IWaitableResult [] waitableResults)
-                {
+        /// <returns>
+        /// The array index of the work item result that satisfied the wait, or WaitTimeout if any of the work items has been canceled.
+        /// </returns>
+        public static int WaitAny(
+            IWaitableResult [] waitableResults)
+        {
             return WaitAny(waitableResults, Timeout.Infinite, true);
-                }
+        }
 
-                /// <summary>
-                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-                /// </summary>
+        /// <summary>
+        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <returns>
-                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-                /// </returns>
-                public static int WaitAny(
+        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <returns>
+        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+        /// </returns>
+        public static int WaitAny(
             IWaitableResult[] waitableResults,
-                        TimeSpan timeout,
-                        bool exitContext)
-                {
+            TimeSpan timeout,
+            bool exitContext)
+        {
             return WaitAny(waitableResults, (int)timeout.TotalMilliseconds, exitContext);
-                }
+        }
 
-                /// <summary>
-                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-                /// </summary>
+        /// <summary>
+        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-                /// <returns>
-                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-                /// </returns>
-                public static int WaitAny(
-                        IWaitableResult [] waitableResults,
-                        TimeSpan timeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle)
-                {
+        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+        /// <returns>
+        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+        /// </returns>
+        public static int WaitAny(
+            IWaitableResult [] waitableResults,
+            TimeSpan timeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle)
+        {
             return WaitAny(waitableResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
-                }
+        }
 
-                /// <summary>
-                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-                /// </summary>
+        /// <summary>
+        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <returns>
-                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-                /// </returns>
-                public static int WaitAny(
-                        IWaitableResult [] waitableResults,  
-                        int millisecondsTimeout,
-                        bool exitContext)
-                {
+        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <returns>
+        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+        /// </returns>
+        public static int WaitAny(
+            IWaitableResult [] waitableResults,
+            int millisecondsTimeout,
+            bool exitContext)
+        {
             return WorkItem.WaitAny(waitableResults, millisecondsTimeout, exitContext, null);
-                }
+        }
 
-                /// <summary>
-                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-                /// </summary>
+        /// <summary>
+        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// </summary>
         /// <param name="waitableResults">Array of work item result objects</param>
-                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-                /// <param name="exitContext">
-                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-                /// </param>
-                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-                /// <returns>
-                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-                /// </returns>
-                public static int WaitAny(
-                        IWaitableResult [] waitableResults,  
-                        int millisecondsTimeout,
-                        bool exitContext,
-                        WaitHandle cancelWaitHandle)
-                {
+        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+        /// <param name="exitContext">
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
+        /// </param>
+        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+        /// <returns>
+        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+        /// </returns>
+        public static int WaitAny(
+            IWaitableResult [] waitableResults,
+            int millisecondsTimeout,
+            bool exitContext,
+            WaitHandle cancelWaitHandle)
+        {
             return WorkItem.WaitAny(waitableResults, millisecondsTimeout, exitContext, cancelWaitHandle);
-                }
+        }
 
         /// <summary>
         /// Creates a new WorkItemsGroup.
         /// </summary>
         /// <param name="concurrency">The number of work items that can be run concurrently</param>
         /// <returns>A reference to the WorkItemsGroup</returns>
-                public IWorkItemsGroup CreateWorkItemsGroup(int concurrency)
-                {
+        public IWorkItemsGroup CreateWorkItemsGroup(int concurrency)
+        {
             IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, _stpStartInfo);
-                        return workItemsGroup;
-                }
+            return workItemsGroup;
+        }
 
         /// <summary>
         /// Creates a new WorkItemsGroup.
@@ -1246,11 +1246,11 @@ namespace Amib.Threading
         /// <param name="concurrency">The number of work items that can be run concurrently</param>
         /// <param name="wigStartInfo">A WorkItemsGroup configuration that overrides the default behavior</param>
         /// <returns>A reference to the WorkItemsGroup</returns>
-                public IWorkItemsGroup CreateWorkItemsGroup(int concurrency, WIGStartInfo wigStartInfo)
-                {
-                        IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, wigStartInfo);
-                        return workItemsGroup;
-                }
+        public IWorkItemsGroup CreateWorkItemsGroup(int concurrency, WIGStartInfo wigStartInfo)
+        {
+            IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, wigStartInfo);
+            return workItemsGroup;
+        }
 
         #region Fire Thread's Events
 
@@ -1331,22 +1331,22 @@ namespace Amib.Threading
             }
         }
 
-        
 
-                #endregion
 
-                #region Properties
+        #endregion
+
+        #region Properties
 
-                /// <summary>
-                /// Get/Set the lower limit of threads in the pool.
-                /// </summary>
-                public int MinThreads 
-                { 
-                        get 
-                        {
-                                ValidateNotDisposed();
-                return _stpStartInfo.MinWorkerThreads; 
-                        }
+        /// <summary>
+        /// Get/Set the lower limit of threads in the pool.
+        /// </summary>
+        public int MinThreads
+        {
+            get
+            {
+                ValidateNotDisposed();
+                return _stpStartInfo.MinWorkerThreads;
+            }
             set
             {
                 Debug.Assert(value >= 0);
@@ -1358,21 +1358,21 @@ namespace Amib.Threading
                 _stpStartInfo.MinWorkerThreads = value;
                 StartOptimalNumberOfThreads();
             }
-                }
-
-            /// <summary>
-                /// Get/Set the upper limit of threads in the pool.
-                /// </summary>
-                public int MaxThreads 
-                { 
-                        get 
-                        {
-                                ValidateNotDisposed();
-                return _stpStartInfo.MaxWorkerThreads; 
-                        } 
-
-                        set 
-                        {
+        }
+
+        /// <summary>
+        /// Get/Set the upper limit of threads in the pool.
+        /// </summary>
+        public int MaxThreads
+        {
+            get
+            {
+                ValidateNotDisposed();
+                return _stpStartInfo.MaxWorkerThreads;
+            }
+
+            set
+            {
                 Debug.Assert(value > 0);
                 Debug.Assert(value >= _stpStartInfo.MinWorkerThreads);
                 if (_stpStartInfo.MinWorkerThreads > value)
@@ -1381,32 +1381,32 @@ namespace Amib.Threading
                 }
                 _stpStartInfo.MaxWorkerThreads = value;
                 StartOptimalNumberOfThreads();
-            } 
-                }
-                /// <summary>
-                /// Get the number of threads in the thread pool.
-                /// Should be between the lower and the upper limits.
-                /// </summary>
-                public int ActiveThreads 
-                { 
-                        get 
-                        {
-                                ValidateNotDisposed();
-                                return _workerThreads.Count; 
-                        } 
-                }
-
-                /// <summary>
-                /// Get the number of busy (not idle) threads in the thread pool.
-                /// </summary>
-                public int InUseThreads 
-                { 
-                        get 
-                        { 
-                                ValidateNotDisposed();
-                                return _inUseWorkerThreads; 
-                        } 
-                }
+            }
+        }
+        /// <summary>
+        /// Get the number of threads in the thread pool.
+        /// Should be between the lower and the upper limits.
+        /// </summary>
+        public int ActiveThreads
+        {
+            get
+            {
+                ValidateNotDisposed();
+                return _workerThreads.Count;
+            }
+        }
+
+        /// <summary>
+        /// Get the number of busy (not idle) threads in the thread pool.
+        /// </summary>
+        public int InUseThreads
+        {
+            get
+            {
+                ValidateNotDisposed();
+                return _inUseWorkerThreads;
+            }
+        }
 
         /// <summary>
         /// Returns true if the current running work item has been cancelled.
@@ -1420,8 +1420,8 @@ namespace Amib.Threading
             {
                 return CurrentThreadEntry.CurrentWorkItem.IsCanceled;
             }
-        } 
-        
+        }
+
         /// <summary>
         /// Checks if the work item has been cancelled, and if yes then abort the thread.
         /// Can be used with Cancel and timeout
@@ -1439,16 +1439,16 @@ namespace Amib.Threading
         /// </summary>
         public STPStartInfo STPStartInfo
         {
-            get 
+            get
             {
-                return _stpStartInfo.AsReadOnly(); 
+                return _stpStartInfo.AsReadOnly();
             }
         }
 
-            public bool IsShuttingdown
-            {
+        public bool IsShuttingdown
+        {
             get { return _shutdown;  }
-            }
+        }
 
         /// <summary>
         /// Return the local calculated performance counters
@@ -1478,7 +1478,7 @@ namespace Amib.Threading
                     _shuttingDownEvent = null;
                 }
                 _workerThreads.Clear();
-                
+
                 if (null != _isIdleWaitHandle)
                 {
                     _isIdleWaitHandle.Close();
@@ -1507,22 +1507,22 @@ namespace Amib.Threading
         /// Get/Set the maximum number of work items that execute cocurrency on the thread pool
         /// </summary>
         public override int Concurrency
-            {
-                get { return MaxThreads; }
-                set { MaxThreads = value; }
-            }
-
-            /// <summary>
-            /// Get the number of work items in the queue.
-            /// </summary>
-            public override int WaitingCallbacks
-            {
-                get
-                {
-                    ValidateNotDisposed();
-                    return _workItemsQueue.Count;
-                }
-            }
+        {
+            get { return MaxThreads; }
+            set { MaxThreads = value; }
+        }
+
+        /// <summary>
+        /// Get the number of work items in the queue.
+        /// </summary>
+        public override int WaitingCallbacks
+        {
+            get
+            {
+                ValidateNotDisposed();
+                return _workItemsQueue.Count;
+            }
+        }
 
         /// <summary>
         /// Get an array with all the state objects of the currently running items.
@@ -1542,7 +1542,7 @@ namespace Amib.Threading
             get { return _stpStartInfo.AsReadOnly(); }
         }
 
-            /// <summary>
+        /// <summary>
         /// Start the thread pool if it was started suspended.
         /// If it is already running, this method is ignored.
         /// </summary>
@@ -1593,7 +1593,7 @@ namespace Amib.Threading
             }
         }
 
-            /// <summary>
+        /// <summary>
         /// Wait for the thread pool to be idle
         /// </summary>
         public override bool WaitForIdle(int millisecondsTimeout)
@@ -1622,9 +1622,9 @@ namespace Amib.Threading
             }
         }
 
-            internal override void PreQueueWorkItem()
+        internal override void PreQueueWorkItem()
         {
-            ValidateNotDisposed();   
+            ValidateNotDisposed();
         }
 
         #endregion
@@ -1676,7 +1676,7 @@ namespace Amib.Threading
             ManualResetEvent anActionCompleted = new ManualResetEvent(false);
 
             ChoiceIndex choiceIndex = new ChoiceIndex();
-            
+
             int i = 0;
             foreach (Action action in actions)
             {
@@ -1685,7 +1685,7 @@ namespace Amib.Threading
                 workItemsGroup.QueueWorkItem(() => { act(); Interlocked.CompareExchange(ref choiceIndex._index, value, -1); anActionCompleted.Set(); });
                 ++i;
             }
-                workItemsGroup.Start();
+            workItemsGroup.Start();
             anActionCompleted.WaitOne();
             anActionCompleted.Dispose();
 
@@ -1698,7 +1698,7 @@ namespace Amib.Threading
         /// </summary>
         /// <param name="actions">Actions to execute</param>
         public int Choice(params Action[] actions)
-            {
+        {
             return Choice((IEnumerable<Action>)actions);
         }
 
@@ -1732,6 +1732,6 @@ namespace Amib.Threading
             Pipe(pipeState, (IEnumerable<Action<T>>)actions);
         }
         #endregion
-        }
-        #endregion
+    }
+    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WIGStartInfo.cs b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
index 8af195b..756ac1f 100644
--- a/ThirdParty/SmartThreadPool/WIGStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
@@ -2,11 +2,11 @@ using System;
 
 namespace Amib.Threading
 {
-        /// <summary>
-        /// Summary description for WIGStartInfo.
-        /// </summary>
-        public class WIGStartInfo
-        {
+    /// <summary>
+    /// Summary description for WIGStartInfo.
+    /// </summary>
+    public class WIGStartInfo
+    {
         private bool _useCallerCallContext;
         private bool _useCallerHttpContext;
         private bool _disposeOfStateObjects;
@@ -18,10 +18,10 @@ namespace Amib.Threading
 
         protected bool _readOnly;
 
-            public WIGStartInfo()
+        public WIGStartInfo()
         {
-                _fillStateWithArgs = SmartThreadPool.DefaultFillStateWithArgs;
-                _workItemPriority = SmartThreadPool.DefaultWorkItemPriority;
+            _fillStateWithArgs = SmartThreadPool.DefaultFillStateWithArgs;
+            _workItemPriority = SmartThreadPool.DefaultWorkItemPriority;
             _startSuspended = SmartThreadPool.DefaultStartSuspended;
             _postExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
             _callToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
@@ -30,7 +30,7 @@ namespace Amib.Threading
             _useCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
         }
 
-            public WIGStartInfo(WIGStartInfo wigStartInfo)
+        public WIGStartInfo(WIGStartInfo wigStartInfo)
         {
             _useCallerCallContext = wigStartInfo.UseCallerCallContext;
             _useCallerHttpContext = wigStartInfo.UseCallerHttpContext;
@@ -50,122 +50,122 @@ namespace Amib.Threading
             }
         }
 
-            /// <summary>
-            /// Get/Set if to use the caller's security context
-            /// </summary>
-            public virtual bool UseCallerCallContext
-            {
-                get { return _useCallerCallContext; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _useCallerCallContext = value; 
+        /// <summary>
+        /// Get/Set if to use the caller's security context
+        /// </summary>
+        public virtual bool UseCallerCallContext
+        {
+            get { return _useCallerCallContext; }
+            set
+            {
+                ThrowIfReadOnly();
+                _useCallerCallContext = value;
             }
-            }
-
-
-            /// <summary>
-            /// Get/Set if to use the caller's HTTP context
-            /// </summary>
-            public virtual bool UseCallerHttpContext
-            {
-                get { return _useCallerHttpContext; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _useCallerHttpContext = value; 
+        }
+
+
+        /// <summary>
+        /// Get/Set if to use the caller's HTTP context
+        /// </summary>
+        public virtual bool UseCallerHttpContext
+        {
+            get { return _useCallerHttpContext; }
+            set
+            {
+                ThrowIfReadOnly();
+                _useCallerHttpContext = value;
             }
-            }
-
-
-            /// <summary>
-            /// Get/Set if to dispose of the state object of a work item
-            /// </summary>
-            public virtual bool DisposeOfStateObjects
-            {
-                get { return _disposeOfStateObjects; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _disposeOfStateObjects = value; 
+        }
+
+
+        /// <summary>
+        /// Get/Set if to dispose of the state object of a work item
+        /// </summary>
+        public virtual bool DisposeOfStateObjects
+        {
+            get { return _disposeOfStateObjects; }
+            set
+            {
+                ThrowIfReadOnly();
+                _disposeOfStateObjects = value;
             }
-            }
-
-
-            /// <summary>
-            /// Get/Set the run the post execute options
-            /// </summary>
-            public virtual CallToPostExecute CallToPostExecute
-            {
-                get { return _callToPostExecute; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _callToPostExecute = value; 
+        }
+
+
+        /// <summary>
+        /// Get/Set the run the post execute options
+        /// </summary>
+        public virtual CallToPostExecute CallToPostExecute
+        {
+            get { return _callToPostExecute; }
+            set
+            {
+                ThrowIfReadOnly();
+                _callToPostExecute = value;
             }
-            }
-
-
-            /// <summary>
-            /// Get/Set the default post execute callback
-            /// </summary>
-            public virtual PostExecuteWorkItemCallback PostExecuteWorkItemCallback
-            {
-                get { return _postExecuteWorkItemCallback; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _postExecuteWorkItemCallback = value; 
+        }
+
+
+        /// <summary>
+        /// Get/Set the default post execute callback
+        /// </summary>
+        public virtual PostExecuteWorkItemCallback PostExecuteWorkItemCallback
+        {
+            get { return _postExecuteWorkItemCallback; }
+            set
+            {
+                ThrowIfReadOnly();
+                _postExecuteWorkItemCallback = value;
             }
-            }
-
-
-            /// <summary>
-            /// Get/Set if the work items execution should be suspended until the Start()
-            /// method is called.
-            /// </summary>
-            public virtual bool StartSuspended
-            {
-                get { return _startSuspended; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _startSuspended = value; 
+        }
+
+
+        /// <summary>
+        /// Get/Set if the work items execution should be suspended until the Start()
+        /// method is called.
+        /// </summary>
+        public virtual bool StartSuspended
+        {
+            get { return _startSuspended; }
+            set
+            {
+                ThrowIfReadOnly();
+                _startSuspended = value;
             }
-            }
+        }
 
 
-            /// <summary>
-            /// Get/Set the default priority that a work item gets when it is enqueued
-            /// </summary>
-            public virtual WorkItemPriority WorkItemPriority
-            {
-                get { return _workItemPriority; }
-                set { _workItemPriority = value; }
-            }
+        /// <summary>
+        /// Get/Set the default priority that a work item gets when it is enqueued
+        /// </summary>
+        public virtual WorkItemPriority WorkItemPriority
+        {
+            get { return _workItemPriority; }
+            set { _workItemPriority = value; }
+        }
 
-            /// <summary>
+        /// <summary>
         /// Get/Set the if QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt; fill the
-            /// arguments as an object array into the state of the work item.
-            /// The arguments can be access later by IWorkItemResult.State.
-            /// </summary>
-            public virtual bool FillStateWithArgs
-            {
-                get { return _fillStateWithArgs; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _fillStateWithArgs = value; 
+        /// arguments as an object array into the state of the work item.
+        /// The arguments can be access later by IWorkItemResult.State.
+        /// </summary>
+        public virtual bool FillStateWithArgs
+        {
+            get { return _fillStateWithArgs; }
+            set
+            {
+                ThrowIfReadOnly();
+                _fillStateWithArgs = value;
             }
-            }
+        }
 
-            /// <summary>
+        /// <summary>
         /// Get a readonly version of this WIGStartInfo
         /// </summary>
         /// <returns>Returns a readonly reference to this WIGStartInfoRO</returns>
         public WIGStartInfo AsReadOnly()
-            {
+        {
             return new WIGStartInfo(this) { _readOnly = true };
-            }
+        }
     }
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItem.cs b/ThirdParty/SmartThreadPool/WorkItem.cs
index 185f10c..edb8ac0 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.cs
@@ -88,7 +88,7 @@ namespace Amib.Threading.Internal
         private ManualResetEvent _workItemCompleted;
 
         /// <summary>
-        /// A reference count to the _workItemCompleted. 
+        /// A reference count to the _workItemCompleted.
         /// When it reaches to zero _workItemCompleted is Closed
         /// </summary>
         private int _workItemCompletedRefCount;
@@ -114,13 +114,13 @@ namespace Amib.Threading.Internal
         private event WorkItemStateCallback _workItemCompletedEvent;
 
         /// <summary>
-        /// A reference to an object that indicates whatever the 
+        /// A reference to an object that indicates whatever the
         /// WorkItemsGroup has been canceled
         /// </summary>
         private CanceledWorkItemsGroup _canceledWorkItemsGroup = CanceledWorkItemsGroup.NotCanceledWorkItemsGroup;
 
         /// <summary>
-        /// A reference to an object that indicates whatever the 
+        /// A reference to an object that indicates whatever the
         /// SmartThreadPool has been canceled
         /// </summary>
         private CanceledWorkItemsGroup _canceledSmartThreadPool = CanceledWorkItemsGroup.NotCanceledWorkItemsGroup;
@@ -197,7 +197,7 @@ namespace Amib.Threading.Internal
         /// <param name="workItemInfo">The WorkItemInfo of te workitem</param>
         /// <param name="callback">Callback delegate for the callback.</param>
         /// <param name="state">State with which to call the callback delegate.</param>
-        /// 
+        ///
         /// We assume that the WorkItem object is created within the thread
         /// that meant to run the callback
         public WorkItem(
@@ -402,7 +402,7 @@ namespace Amib.Threading.Internal
             {
                 tae.GetHashCode();
                 // Check if the work item was cancelled
-                // If we got a ThreadAbortException and the STP is not shutting down, it means the 
+                // If we got a ThreadAbortException and the STP is not shutting down, it means the
                 // work items was cancelled.
                 if (!SmartThreadPool.CurrentThreadEntry.AssociatedSmartThreadPool.IsShuttingdown)
                 {
@@ -471,7 +471,7 @@ namespace Amib.Threading.Internal
         /// <param name="waitableResults">Array of work item result objects</param>
         /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
         /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
         /// </param>
         /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
         /// <returns>
@@ -553,7 +553,7 @@ namespace Amib.Threading.Internal
         /// <param name="waitableResults">Array of work item result objects</param>
         /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
         /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false.
         /// </param>
         /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
         /// <returns>
@@ -734,7 +734,7 @@ namespace Amib.Threading.Internal
                                 // so it already signaled its completion.
                                 //signalComplete = true;
                             }
-                        } 
+                        }
                         success = true;
                         break;
                     case WorkItemState.Completed:
@@ -856,7 +856,7 @@ namespace Amib.Threading.Internal
                 {
                     case 0:
                         // The work item signaled
-                        // Note that the signal could be also as a result of canceling the 
+                        // Note that the signal could be also as a result of canceling the
                         // work item (not the get result)
                         break;
                     case 1:
@@ -884,7 +884,7 @@ namespace Amib.Threading.Internal
         }
 
         /// <summary>
-        /// A wait handle to wait for completion, cancel, or timeout 
+        /// A wait handle to wait for completion, cancel, or timeout
         /// </summary>
         private WaitHandle GetWaitHandle()
         {
diff --git a/ThirdParty/SmartThreadPool/WorkItemFactory.cs b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
index 16ccd81..471eb20 100644
--- a/ThirdParty/SmartThreadPool/WorkItemFactory.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
@@ -2,146 +2,146 @@ using System;
 
 namespace Amib.Threading.Internal
 {
-        #region WorkItemFactory class 
-
-        public class WorkItemFactory
-        {
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
-                /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback)
-                {
-                        return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null);
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+    #region WorkItemFactory class
+
+    public class WorkItemFactory
+    {
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="workItemPriority">The priority of the work item</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        WorkItemPriority workItemPriority)
-                {
-                        return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null, workItemPriority);
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback)
+        {
+            return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null);
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="workItemInfo">Work item info</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemInfo workItemInfo, 
-                        WorkItemCallback callback)
-                {
-                        return CreateWorkItem(
-                                workItemsGroup,
-                                wigStartInfo,
-                                workItemInfo, 
-                                callback, 
-                                null);
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="workItemPriority">The priority of the work item</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            WorkItemPriority workItemPriority)
+        {
+            return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null, workItemPriority);
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state)
-                {
-                        ValidateCallback(callback);
-            
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+        /// <param name="workItemInfo">Work item info</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemInfo workItemInfo,
+            WorkItemCallback callback)
+        {
+            return CreateWorkItem(
+                workItemsGroup,
+                wigStartInfo,
+                workItemInfo,
+                callback,
+                null);
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
+        /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state)
+        {
+            ValidateCallback(callback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
             workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
 
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
-                        return workItem;
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
-                /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <param name="workItemPriority">The work item priority</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state, 
-                        WorkItemPriority workItemPriority)
-                {
-                        ValidateCallback(callback);
-
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-                        workItemInfo.WorkItemPriority = workItemPriority;
-
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
-
-                        return workItem;
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
+            return workItem;
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="workItemInfo">Work item information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <returns>Returns a work item</returns>
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state,
+            WorkItemPriority workItemPriority)
+        {
+            ValidateCallback(callback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            workItemInfo.WorkItemPriority = workItemPriority;
+
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
+
+            return workItem;
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="workItemInfo">Work item information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <returns>Returns a work item</returns>
         public static WorkItem CreateWorkItem(
             IWorkItemsGroup workItemsGroup,
             WIGStartInfo wigStartInfo,
@@ -161,183 +161,183 @@ namespace Amib.Threading.Internal
             return workItem;
         }
 
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <param name="postExecuteWorkItemCallback">
-                /// A delegate to call after the callback completion
-                /// </param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state,
-                        PostExecuteWorkItemCallback postExecuteWorkItemCallback)
-                {
-                        ValidateCallback(callback);
-                        ValidateCallback(postExecuteWorkItemCallback);
-
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback)
+        {
+            ValidateCallback(callback);
+            ValidateCallback(postExecuteWorkItemCallback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
             workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
 
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
 
-                        return workItem;
-                }
+            return workItem;
+        }
 
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <param name="postExecuteWorkItemCallback">
-                /// A delegate to call after the callback completion
-                /// </param>
-                /// <param name="workItemPriority">The work item priority</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state,
-                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-                        WorkItemPriority workItemPriority)
-                {
-                        ValidateCallback(callback);
-                        ValidateCallback(postExecuteWorkItemCallback);
-
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-                        workItemInfo.WorkItemPriority = workItemPriority;
-
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
-
-                        return workItem;
-                }
-
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            WorkItemPriority workItemPriority)
+        {
+            ValidateCallback(callback);
+            ValidateCallback(postExecuteWorkItemCallback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            workItemInfo.WorkItemPriority = workItemPriority;
+
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
+
+            return workItem;
+        }
+
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <param name="postExecuteWorkItemCallback">
-                /// A delegate to call after the callback completion
-                /// </param>
-                /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state,
-                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-                        CallToPostExecute callToPostExecute)
-                {
-                        ValidateCallback(callback);
-                        ValidateCallback(postExecuteWorkItemCallback);
-
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = callToPostExecute;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            CallToPostExecute callToPostExecute)
+        {
+            ValidateCallback(callback);
+            ValidateCallback(postExecuteWorkItemCallback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = callToPostExecute;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
             workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
 
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
 
-                        return workItem;
-                }
+            return workItem;
+        }
 
-                /// <summary>
-                /// Create a new work item
-                /// </summary>
+        /// <summary>
+        /// Create a new work item
+        /// </summary>
         /// <param name="workItemsGroup">The work items group</param>
-                /// <param name="wigStartInfo">Work item group start information</param>
-                /// <param name="callback">A callback to execute</param>
-                /// <param name="state">
-                /// The context object of the work item. Used for passing arguments to the work item. 
-                /// </param>
-                /// <param name="postExecuteWorkItemCallback">
-                /// A delegate to call after the callback completion
-                /// </param>
-                /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-                /// <param name="workItemPriority">The work item priority</param>
-                /// <returns>Returns a work item</returns>
-                public static WorkItem CreateWorkItem(
-                        IWorkItemsGroup workItemsGroup,
-                        WIGStartInfo wigStartInfo,
-                        WorkItemCallback callback, 
-                        object state,
-                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-                        CallToPostExecute callToPostExecute,
-                        WorkItemPriority workItemPriority)
-                {
-
-                        ValidateCallback(callback);
-                        ValidateCallback(postExecuteWorkItemCallback);
-
-                        WorkItemInfo workItemInfo = new WorkItemInfo();
-                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-                        workItemInfo.CallToPostExecute = callToPostExecute;
-                        workItemInfo.WorkItemPriority = workItemPriority;
-                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-
-                        WorkItem workItem = new WorkItem(
-                                workItemsGroup,
-                                workItemInfo,
-                                callback, 
-                                state);
-                        
-                        return workItem;
-                }
-
-                private static void ValidateCallback(Delegate callback)
-                {
+        /// <param name="wigStartInfo">Work item group start information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item.
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item</returns>
+        public static WorkItem CreateWorkItem(
+            IWorkItemsGroup workItemsGroup,
+            WIGStartInfo wigStartInfo,
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            CallToPostExecute callToPostExecute,
+            WorkItemPriority workItemPriority)
+        {
+
+            ValidateCallback(callback);
+            ValidateCallback(postExecuteWorkItemCallback);
+
+            WorkItemInfo workItemInfo = new WorkItemInfo();
+            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+            workItemInfo.CallToPostExecute = callToPostExecute;
+            workItemInfo.WorkItemPriority = workItemPriority;
+            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                workItemInfo,
+                callback,
+                state);
+
+            return workItem;
+        }
+
+        private static void ValidateCallback(Delegate callback)
+        {
             if (callback != null && callback.GetInvocationList().Length > 1)
-                        {
-                                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
-                        }
-                }
-        }
+            {
+                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
+            }
+        }
+    }
 
-        #endregion
+    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemInfo.cs b/ThirdParty/SmartThreadPool/WorkItemInfo.cs
index 0d7fc85..5be82a2 100644
--- a/ThirdParty/SmartThreadPool/WorkItemInfo.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemInfo.cs
@@ -1,69 +1,69 @@
 namespace Amib.Threading
 {
-        #region WorkItemInfo class
+    #region WorkItemInfo class
 
-        /// <summary>
-        /// Summary description for WorkItemInfo.
-        /// </summary>
-        public class WorkItemInfo
-        {
-            public WorkItemInfo()
-                {
-                        UseCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
-                        UseCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
-                        DisposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
-                        CallToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
-                        PostExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
-                        WorkItemPriority = SmartThreadPool.DefaultWorkItemPriority;
-                }
+    /// <summary>
+    /// Summary description for WorkItemInfo.
+    /// </summary>
+    public class WorkItemInfo
+    {
+        public WorkItemInfo()
+        {
+            UseCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
+            UseCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
+            DisposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
+            CallToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
+            PostExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
+            WorkItemPriority = SmartThreadPool.DefaultWorkItemPriority;
+        }
 
-                public WorkItemInfo(WorkItemInfo workItemInfo)
-                {
-                        UseCallerCallContext = workItemInfo.UseCallerCallContext;
-                        UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
-                        DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
-                        CallToPostExecute = workItemInfo.CallToPostExecute;
-                        PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
-                        WorkItemPriority = workItemInfo.WorkItemPriority;
+        public WorkItemInfo(WorkItemInfo workItemInfo)
+        {
+            UseCallerCallContext = workItemInfo.UseCallerCallContext;
+            UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
+            DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
+            CallToPostExecute = workItemInfo.CallToPostExecute;
+            PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
+            WorkItemPriority = workItemInfo.WorkItemPriority;
             Timeout = workItemInfo.Timeout;
-                }
+        }
 
-            /// <summary>
-            /// Get/Set if to use the caller's security context
-            /// </summary>
-            public bool UseCallerCallContext { get; set; }
+        /// <summary>
+        /// Get/Set if to use the caller's security context
+        /// </summary>
+        public bool UseCallerCallContext { get; set; }
 
-            /// <summary>
-            /// Get/Set if to use the caller's HTTP context
-            /// </summary>
-            public bool UseCallerHttpContext { get; set; }
+        /// <summary>
+        /// Get/Set if to use the caller's HTTP context
+        /// </summary>
+        public bool UseCallerHttpContext { get; set; }
 
-            /// <summary>
-            /// Get/Set if to dispose of the state object of a work item
-            /// </summary>
-            public bool DisposeOfStateObjects { get; set; }
+        /// <summary>
+        /// Get/Set if to dispose of the state object of a work item
+        /// </summary>
+        public bool DisposeOfStateObjects { get; set; }
 
-            /// <summary>
-            /// Get/Set the run the post execute options
-            /// </summary>
+        /// <summary>
+        /// Get/Set the run the post execute options
+        /// </summary>
         public CallToPostExecute CallToPostExecute { get; set; }
 
-            /// <summary>
-            /// Get/Set the post execute callback
-            /// </summary>
+        /// <summary>
+        /// Get/Set the post execute callback
+        /// </summary>
         public PostExecuteWorkItemCallback PostExecuteWorkItemCallback { get; set; }
 
-            /// <summary>
-            /// Get/Set the work item's priority
-            /// </summary>
-            public WorkItemPriority WorkItemPriority { get; set; }
+        /// <summary>
+        /// Get/Set the work item's priority
+        /// </summary>
+        public WorkItemPriority WorkItemPriority { get; set; }
 
-            /// <summary>
-            /// Get/Set the work item's timout in milliseconds.
+        /// <summary>
+        /// Get/Set the work item's timout in milliseconds.
         /// This is a passive timout. When the timout expires the work item won't be actively aborted!
-            /// </summary>
-            public long Timeout { get; set; }
-        }
+        /// </summary>
+        public long Timeout { get; set; }
+    }
 
-        #endregion
+    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
index d9d34ac..d429bc6 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
@@ -6,107 +6,107 @@ using System.Diagnostics;
 namespace Amib.Threading.Internal
 {
 
-        #region WorkItemsGroup class 
+    #region WorkItemsGroup class
 
-        /// <summary>
-        /// Summary description for WorkItemsGroup.
-        /// </summary>
-        public class WorkItemsGroup : WorkItemsGroupBase
-        {
-                #region Private members
+    /// <summary>
+    /// Summary description for WorkItemsGroup.
+    /// </summary>
+    public class WorkItemsGroup : WorkItemsGroupBase
+    {
+        #region Private members
 
-                private readonly object _lock = new object();
+        private readonly object _lock = new object();
 
-                /// <summary>
-                /// A reference to the SmartThreadPool instance that created this 
-                /// WorkItemsGroup.
-                /// </summary>
-                private readonly SmartThreadPool _stp;
+        /// <summary>
+        /// A reference to the SmartThreadPool instance that created this
+        /// WorkItemsGroup.
+        /// </summary>
+        private readonly SmartThreadPool _stp;
 
-                /// <summary>
-                /// The OnIdle event
-                /// </summary>
-                private event WorkItemsGroupIdleHandler _onIdle;
+        /// <summary>
+        /// The OnIdle event
+        /// </summary>
+        private event WorkItemsGroupIdleHandler _onIdle;
 
         /// <summary>
         /// A flag to indicate if the Work Items Group is now suspended.
         /// </summary>
         private bool _isSuspended;
 
-                /// <summary>
-                /// Defines how many work items of this WorkItemsGroup can run at once.
-                /// </summary>
-                private int _concurrency;
-
-                /// <summary>
-                /// Priority queue to hold work items before they are passed 
-                /// to the SmartThreadPool.
-                /// </summary>
-                private readonly PriorityQueue _workItemsQueue;
-
-                /// <summary>
-                /// Indicate how many work items are waiting in the SmartThreadPool
-                /// queue.
-                /// This value is used to apply the concurrency.
-                /// </summary>
-                private int _workItemsInStpQueue;
-
-                /// <summary>
-                /// Indicate how many work items are currently running in the SmartThreadPool.
-                /// This value is used with the Cancel, to calculate if we can send new 
-                /// work items to the STP.
-                /// </summary>
-                private int _workItemsExecutingInStp = 0;
-
-                /// <summary>
-                /// WorkItemsGroup start information
-                /// </summary>
-                private readonly WIGStartInfo _workItemsGroupStartInfo;
-
-                /// <summary>
-                /// Signaled when all of the WorkItemsGroup's work item completed.
-                /// </summary>
+        /// <summary>
+        /// Defines how many work items of this WorkItemsGroup can run at once.
+        /// </summary>
+        private int _concurrency;
+
+        /// <summary>
+        /// Priority queue to hold work items before they are passed
+        /// to the SmartThreadPool.
+        /// </summary>
+        private readonly PriorityQueue _workItemsQueue;
+
+        /// <summary>
+        /// Indicate how many work items are waiting in the SmartThreadPool
+        /// queue.
+        /// This value is used to apply the concurrency.
+        /// </summary>
+        private int _workItemsInStpQueue;
+
+        /// <summary>
+        /// Indicate how many work items are currently running in the SmartThreadPool.
+        /// This value is used with the Cancel, to calculate if we can send new
+        /// work items to the STP.
+        /// </summary>
+        private int _workItemsExecutingInStp = 0;
+
+        /// <summary>
+        /// WorkItemsGroup start information
+        /// </summary>
+        private readonly WIGStartInfo _workItemsGroupStartInfo;
+
+        /// <summary>
+        /// Signaled when all of the WorkItemsGroup's work item completed.
+        /// </summary>
         //private readonly ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
         private readonly ManualResetEvent _isIdleWaitHandle = EventWaitHandleFactory.CreateManualResetEvent(true);
 
-                /// <summary>
-                /// A common object for all the work items that this work items group
-                /// generate so we can mark them to cancel in O(1)
-                /// </summary>
-                private CanceledWorkItemsGroup _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
+        /// <summary>
+        /// A common object for all the work items that this work items group
+        /// generate so we can mark them to cancel in O(1)
+        /// </summary>
+        private CanceledWorkItemsGroup _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
 
-                #endregion 
+        #endregion
 
-                #region Construction
+        #region Construction
 
-            public WorkItemsGroup(
-                        SmartThreadPool stp, 
-                        int concurrency, 
-                        WIGStartInfo wigStartInfo)
-                {
-                        if (concurrency <= 0)
-                        {
-                                throw new ArgumentOutOfRangeException(
+        public WorkItemsGroup(
+            SmartThreadPool stp,
+            int concurrency,
+            WIGStartInfo wigStartInfo)
+        {
+            if (concurrency <= 0)
+            {
+                throw new ArgumentOutOfRangeException(
                     "concurrency",
 #if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
                     concurrency,
 #endif
  "concurrency must be greater than zero");
-                        }
-                        _stp = stp;
-                        _concurrency = concurrency;
-                        _workItemsGroupStartInfo = new WIGStartInfo(wigStartInfo).AsReadOnly();
-                        _workItemsQueue = new PriorityQueue();
-                Name = "WorkItemsGroup";
+            }
+            _stp = stp;
+            _concurrency = concurrency;
+            _workItemsGroupStartInfo = new WIGStartInfo(wigStartInfo).AsReadOnly();
+            _workItemsQueue = new PriorityQueue();
+            Name = "WorkItemsGroup";
 
-                        // The _workItemsInStpQueue gets the number of currently executing work items,
-                        // because once a work item is executing, it cannot be cancelled.
-                        _workItemsInStpQueue = _workItemsExecutingInStp;
+            // The _workItemsInStpQueue gets the number of currently executing work items,
+            // because once a work item is executing, it cannot be cancelled.
+            _workItemsInStpQueue = _workItemsExecutingInStp;
 
             _isSuspended = _workItemsGroupStartInfo.StartSuspended;
-                }
+        }
 
-                #endregion 
+        #endregion
 
         #region WorkItemsGroupBase Overrides
 
@@ -146,7 +146,7 @@ namespace Amib.Threading.Internal
             }
         }
 
-            /// <summary>
+        /// <summary>
         /// WorkItemsGroup start information
         /// </summary>
         public override WIGStartInfo WIGStartInfo
@@ -154,38 +154,38 @@ namespace Amib.Threading.Internal
             get { return _workItemsGroupStartInfo; }
         }
 
-            /// <summary>
-            /// Start the Work Items Group if it was started suspended
-            /// </summary>
-            public override void Start()
-            {
-                // If the Work Items Group already started then quit
-                if (!_isSuspended)
-                {
-                    return;
-                }
-                _isSuspended = false;
-            
-                EnqueueToSTPNextNWorkItem(Math.Min(_workItemsQueue.Count, _concurrency));
-            }
-
-            public override void Cancel(bool abortExecution)
-            {
-                lock (_lock)
-                {
-                    _canceledWorkItemsGroup.IsCanceled = true;
-                    _workItemsQueue.Clear();
-                    _workItemsInStpQueue = 0;
-                    _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
-                }
-
-                if (abortExecution)
-                {
-                    _stp.CancelAbortWorkItemsGroup(this);
-                }
-            }
-
-            /// <summary>
+        /// <summary>
+        /// Start the Work Items Group if it was started suspended
+        /// </summary>
+        public override void Start()
+        {
+            // If the Work Items Group already started then quit
+            if (!_isSuspended)
+            {
+                return;
+            }
+            _isSuspended = false;
+
+            EnqueueToSTPNextNWorkItem(Math.Min(_workItemsQueue.Count, _concurrency));
+        }
+
+        public override void Cancel(bool abortExecution)
+        {
+            lock (_lock)
+            {
+                _canceledWorkItemsGroup.IsCanceled = true;
+                _workItemsQueue.Clear();
+                _workItemsInStpQueue = 0;
+                _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
+            }
+
+            if (abortExecution)
+            {
+                _stp.CancelAbortWorkItemsGroup(this);
+            }
+        }
+
+        /// <summary>
         /// Wait for the thread pool to be idle
         /// </summary>
         public override bool WaitForIdle(int millisecondsTimeout)
@@ -194,34 +194,34 @@ namespace Amib.Threading.Internal
             return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
         }
 
-            public override event WorkItemsGroupIdleHandler OnIdle
-                {
-                        add { _onIdle += value; }
-                        remove { _onIdle -= value; }
-                }
+        public override event WorkItemsGroupIdleHandler OnIdle
+        {
+            add { _onIdle += value; }
+            remove { _onIdle -= value; }
+        }
 
-            #endregion 
+        #endregion
 
-                #region Private methods
+        #region Private methods
 
-            private void RegisterToWorkItemCompletion(IWorkItemResult wir)
-                {
-                        IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
-                        iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
-                        iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
-                }
+        private void RegisterToWorkItemCompletion(IWorkItemResult wir)
+        {
+            IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
+            iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
+            iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
+        }
 
-            public void OnSTPIsStarting()
-                {
+        public void OnSTPIsStarting()
+        {
             if (_isSuspended)
             {
                 return;
             }
-                        
+
             EnqueueToSTPNextNWorkItem(_concurrency);
-                }
+        }
 
-            public void EnqueueToSTPNextNWorkItem(int count)
+        public void EnqueueToSTPNextNWorkItem(int count)
         {
             for (int i = 0; i < count; ++i)
             {
@@ -229,115 +229,115 @@ namespace Amib.Threading.Internal
             }
         }
 
-                private object FireOnIdle(object state)
-                {
-                        FireOnIdleImpl(_onIdle);
-                        return null;
-                }
-
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                private void FireOnIdleImpl(WorkItemsGroupIdleHandler onIdle)
-                {
-                        if(null == onIdle)
-                        {
-                                return;
-                        }
-
-                        Delegate[] delegates = onIdle.GetInvocationList();
-                        foreach(WorkItemsGroupIdleHandler eh in delegates)
-                        {
-                                try
-                                {
-                                        eh(this);
-                                }
+        private object FireOnIdle(object state)
+        {
+            FireOnIdleImpl(_onIdle);
+            return null;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void FireOnIdleImpl(WorkItemsGroupIdleHandler onIdle)
+        {
+            if(null == onIdle)
+            {
+                return;
+            }
+
+            Delegate[] delegates = onIdle.GetInvocationList();
+            foreach(WorkItemsGroupIdleHandler eh in delegates)
+            {
+                try
+                {
+                    eh(this);
+                }
                 catch { }  // Suppress exceptions
-                        }
-                }
-
-                private void OnWorkItemStartedCallback(WorkItem workItem)
-                {
-                        lock(_lock)
-                        {
-                                ++_workItemsExecutingInStp;
-                        }
-                }
-
-                private void OnWorkItemCompletedCallback(WorkItem workItem)
-                {
-                        EnqueueToSTPNextWorkItem(null, true);
-                }
+            }
+        }
+
+        private void OnWorkItemStartedCallback(WorkItem workItem)
+        {
+            lock(_lock)
+            {
+                ++_workItemsExecutingInStp;
+            }
+        }
+
+        private void OnWorkItemCompletedCallback(WorkItem workItem)
+        {
+            EnqueueToSTPNextWorkItem(null, true);
+        }
 
         internal override void Enqueue(WorkItem workItem)
         {
             EnqueueToSTPNextWorkItem(workItem);
         }
 
-            private void EnqueueToSTPNextWorkItem(WorkItem workItem)
-                {
-                        EnqueueToSTPNextWorkItem(workItem, false);
-                }
-
-                private void EnqueueToSTPNextWorkItem(WorkItem workItem, bool decrementWorkItemsInStpQueue)
-                {
-                        lock(_lock)
-                        {
-                                // Got here from OnWorkItemCompletedCallback()
-                                if (decrementWorkItemsInStpQueue)
-                                {
-                                        --_workItemsInStpQueue;
-
-                                        if(_workItemsInStpQueue < 0)
-                                        {
-                                                _workItemsInStpQueue = 0;
-                                        }
-
-                                        --_workItemsExecutingInStp;
-
-                                        if(_workItemsExecutingInStp < 0)
-                                        {
-                                                _workItemsExecutingInStp = 0;
-                                        }
-                                }
-
-                                // If the work item is not null then enqueue it
-                                if (null != workItem)
-                                {
-                                        workItem.CanceledWorkItemsGroup = _canceledWorkItemsGroup;
-
-                                        RegisterToWorkItemCompletion(workItem.GetWorkItemResult());
-                                        _workItemsQueue.Enqueue(workItem);
-                                        //_stp.IncrementWorkItemsCount();
-
-                                        if ((1 == _workItemsQueue.Count) && 
-                                                (0 == _workItemsInStpQueue))
-                                        {
-                                                _stp.RegisterWorkItemsGroup(this);
+        private void EnqueueToSTPNextWorkItem(WorkItem workItem)
+        {
+            EnqueueToSTPNextWorkItem(workItem, false);
+        }
+
+        private void EnqueueToSTPNextWorkItem(WorkItem workItem, bool decrementWorkItemsInStpQueue)
+        {
+            lock(_lock)
+            {
+                // Got here from OnWorkItemCompletedCallback()
+                if (decrementWorkItemsInStpQueue)
+                {
+                    --_workItemsInStpQueue;
+
+                    if(_workItemsInStpQueue < 0)
+                    {
+                        _workItemsInStpQueue = 0;
+                    }
+
+                    --_workItemsExecutingInStp;
+
+                    if(_workItemsExecutingInStp < 0)
+                    {
+                        _workItemsExecutingInStp = 0;
+                    }
+                }
+
+                // If the work item is not null then enqueue it
+                if (null != workItem)
+                {
+                    workItem.CanceledWorkItemsGroup = _canceledWorkItemsGroup;
+
+                    RegisterToWorkItemCompletion(workItem.GetWorkItemResult());
+                    _workItemsQueue.Enqueue(workItem);
+                    //_stp.IncrementWorkItemsCount();
+
+                    if ((1 == _workItemsQueue.Count) &&
+                        (0 == _workItemsInStpQueue))
+                    {
+                        _stp.RegisterWorkItemsGroup(this);
                         IsIdle = false;
                         _isIdleWaitHandle.Reset();
-                                        }
-                                }
-
-                                // If the work items queue of the group is empty than quit
-                                if (0 == _workItemsQueue.Count)
-                                {
-                                        if (0 == _workItemsInStpQueue)
-                                        {
-                                                _stp.UnregisterWorkItemsGroup(this);
+                    }
+                }
+
+                // If the work items queue of the group is empty than quit
+                if (0 == _workItemsQueue.Count)
+                {
+                    if (0 == _workItemsInStpQueue)
+                    {
+                        _stp.UnregisterWorkItemsGroup(this);
                         IsIdle = true;
                         _isIdleWaitHandle.Set();
                         if (decrementWorkItemsInStpQueue && _onIdle != null && _onIdle.GetInvocationList().Length > 0)
                         {
                             _stp.QueueWorkItem(new WorkItemCallback(FireOnIdle));
                         }
-                                        }
-                                        return;
-                                }
+                    }
+                    return;
+                }
 
                 if (!_isSuspended)
-                                {
-                                        if (_workItemsInStpQueue < _concurrency)
-                                        {
-                                                WorkItem nextWorkItem = _workItemsQueue.Dequeue() as WorkItem;
+                {
+                    if (_workItemsInStpQueue < _concurrency)
+                    {
+                        WorkItem nextWorkItem = _workItemsQueue.Dequeue() as WorkItem;
                         try
                         {
                             _stp.Enqueue(nextWorkItem);
@@ -348,14 +348,14 @@ namespace Amib.Threading.Internal
                             // The STP has been shutdown
                         }
 
-                                                ++_workItemsInStpQueue;
-                                        }
-                                }
-                        }
-                }
+                        ++_workItemsInStpQueue;
+                    }
+                }
+            }
+        }
 
-                #endregion
+        #endregion
     }
 
-        #endregion
+    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
index 27fae5e..3a5dcc6 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
@@ -132,7 +132,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <returns>Returns a work item result</returns>
         public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state)
@@ -147,7 +147,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="workItemPriority">The work item priority</param>
         /// <returns>Returns a work item result</returns>
@@ -165,7 +165,7 @@ namespace Amib.Threading.Internal
         /// <param name="workItemInfo">Work item information</param>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <returns>Returns a work item result</returns>
         public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state)
@@ -181,7 +181,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -203,7 +203,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -227,7 +227,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
@@ -251,7 +251,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         /// <param name="callback">A callback to execute</param>
         /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// The context object of the work item. Used for passing arguments to the work item.
         /// </param>
         /// <param name="postExecuteWorkItemCallback">
         /// A delegate to call after the callback completion
diff --git a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
index 019c0d3..21403a0 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
@@ -4,29 +4,29 @@ using System.Threading;
 
 namespace Amib.Threading.Internal
 {
-        #region WorkItemsQueue class
-
-        /// <summary>
-        /// WorkItemsQueue class.
-        /// </summary>
-        public class WorkItemsQueue : IDisposable
-        {
-                #region Member variables
-
-                /// <summary>
-                /// Waiters queue (implemented as stack).
-                /// </summary>
-                private readonly WaiterEntry _headWaiterEntry = new WaiterEntry();
-
-                /// <summary>
-                /// Waiters count
-                /// </summary>
-                private int _waitersCount = 0;
-
-                /// <summary>
-                /// Work items queue
-                /// </summary>
-                private readonly PriorityQueue _workItems = new PriorityQueue();
+    #region WorkItemsQueue class
+
+    /// <summary>
+    /// WorkItemsQueue class.
+    /// </summary>
+    public class WorkItemsQueue : IDisposable
+    {
+        #region Member variables
+
+        /// <summary>
+        /// Waiters queue (implemented as stack).
+        /// </summary>
+        private readonly WaiterEntry _headWaiterEntry = new WaiterEntry();
+
+        /// <summary>
+        /// Waiters count
+        /// </summary>
+        private int _waitersCount = 0;
+
+        /// <summary>
+        /// Work items queue
+        /// </summary>
+        private readonly PriorityQueue _workItems = new PriorityQueue();
 
         /// <summary>
         /// Indicate that work items are allowed to be queued
@@ -34,7 +34,7 @@ namespace Amib.Threading.Internal
         private bool _isWorkItemsQueueActive = true;
 
 
-#if (WINDOWS_PHONE) 
+#if (WINDOWS_PHONE)
         private static readonly Dictionary<int, WaiterEntry> _waiterEntries = new Dictionary<int, WaiterEntry>();
 #elif (_WINDOWS_CE)
         private static LocalDataStoreSlot _waiterEntrySlot = Thread.AllocateDataSlot();
@@ -50,7 +50,7 @@ namespace Amib.Threading.Internal
         /// </summary>
         private static WaiterEntry CurrentWaiterEntry
         {
-#if (WINDOWS_PHONE) 
+#if (WINDOWS_PHONE)
             get
             {
                 lock (_waiterEntries)
@@ -92,60 +92,60 @@ namespace Amib.Threading.Internal
         }
 
         /// <summary>
-                /// A flag that indicates if the WorkItemsQueue has been disposed.
-                /// </summary>
+        /// A flag that indicates if the WorkItemsQueue has been disposed.
+        /// </summary>
         private bool _isDisposed = false;
 
-                #endregion
+        #endregion
 
-                #region Public properties
+        #region Public properties
 
         /// <summary>
         /// Returns the current number of work items in the queue
         /// </summary>
-                public int Count
-                {
-                        get
-                        {
+        public int Count
+        {
+            get
+            {
                 return _workItems.Count;
-                        }
-                }
+            }
+        }
 
-                /// <summary>
-                /// Returns the current number of waiters
-                /// </summary>
-                public int WaitersCount
-                {
-                        get
-                        {
-                                return _waitersCount;
-                        }
-                }
+        /// <summary>
+        /// Returns the current number of waiters
+        /// </summary>
+        public int WaitersCount
+        {
+            get
+            {
+                return _waitersCount;
+            }
+        }
 
 
         #endregion
 
         #region Public methods
 
-                /// <summary>
-                /// Enqueue a work item to the queue.
-                /// </summary>
-                public bool EnqueueWorkItem(WorkItem workItem)
-                {
-                        // A work item cannot be null, since null is used in the
-                        // WaitForWorkItem() method to indicate timeout or cancel
-                        if (null == workItem)
-                        {
-                                throw new ArgumentNullException("workItem" , "workItem cannot be null");
-                        }
-
-                        bool enqueue = true;
-
-                        // First check if there is a waiter waiting for work item. During 
-                        // the check, timed out waiters are ignored. If there is no 
-                        // waiter then the work item is queued.
-                        lock(this)
-                        {
+        /// <summary>
+        /// Enqueue a work item to the queue.
+        /// </summary>
+        public bool EnqueueWorkItem(WorkItem workItem)
+        {
+            // A work item cannot be null, since null is used in the
+            // WaitForWorkItem() method to indicate timeout or cancel
+            if (null == workItem)
+            {
+                throw new ArgumentNullException("workItem" , "workItem cannot be null");
+            }
+
+            bool enqueue = true;
+
+            // First check if there is a waiter waiting for work item. During
+            // the check, timed out waiters are ignored. If there is no
+            // waiter then the work item is queued.
+            lock(this)
+            {
                 ValidateNotDisposed();
 
                 if (!_isWorkItemsQueueActive)
@@ -153,55 +153,55 @@ namespace Amib.Threading.Internal
                     return false;
                 }
 
-                                while(_waitersCount > 0)
-                                {
-                                        // Dequeue a waiter.
-                                        WaiterEntry waiterEntry = PopWaiter();
-
-                                        // Signal the waiter. On success break the loop
-                                        if (waiterEntry.Signal(workItem))
-                                        {
-                                                enqueue = false;
-                                                break;
-                                        }
-                                }
-
-                                if (enqueue)
-                                {
-                                        // Enqueue the work item
-                                        _workItems.Enqueue(workItem);
-                                }
-                        }
+                while(_waitersCount > 0)
+                {
+                    // Dequeue a waiter.
+                    WaiterEntry waiterEntry = PopWaiter();
+
+                    // Signal the waiter. On success break the loop
+                    if (waiterEntry.Signal(workItem))
+                    {
+                        enqueue = false;
+                        break;
+                    }
+                }
+
+                if (enqueue)
+                {
+                    // Enqueue the work item
+                    _workItems.Enqueue(workItem);
+                }
+            }
             return true;
-                }
-
-
-                /// <summary>
-                /// Waits for a work item or exits on timeout or cancel
-                /// </summary>
-                /// <param name="millisecondsTimeout">Timeout in milliseconds</param>
-                /// <param name="cancelEvent">Cancel wait handle</param>
-                /// <returns>Returns true if the resource was granted</returns>
-                public WorkItem DequeueWorkItem(
-                        int millisecondsTimeout, 
-                        WaitHandle cancelEvent)
-                {
-                        // This method cause the caller to wait for a work item.
-                        // If there is at least one waiting work item then the 
-                        // method returns immidiately with it.
-                        // 
-                        // If there are no waiting work items then the caller 
-                        // is queued between other waiters for a work item to arrive.
-                        // 
-                        // If a work item didn't come within millisecondsTimeout or 
-                        // the user canceled the wait by signaling the cancelEvent 
-                        // then the method returns null to indicate that the caller 
-                        // didn't get a work item.
-
-                        WaiterEntry waiterEntry;
-                        WorkItem workItem = null;
-                    lock (this)
-                    {
+        }
+
+
+        /// <summary>
+        /// Waits for a work item or exits on timeout or cancel
+        /// </summary>
+        /// <param name="millisecondsTimeout">Timeout in milliseconds</param>
+        /// <param name="cancelEvent">Cancel wait handle</param>
+        /// <returns>Returns true if the resource was granted</returns>
+        public WorkItem DequeueWorkItem(
+            int millisecondsTimeout,
+            WaitHandle cancelEvent)
+        {
+            // This method cause the caller to wait for a work item.
+            // If there is at least one waiting work item then the
+            // method returns immidiately with it.
+            //
+            // If there are no waiting work items then the caller
+            // is queued between other waiters for a work item to arrive.
+            //
+            // If a work item didn't come within millisecondsTimeout or
+            // the user canceled the wait by signaling the cancelEvent
+            // then the method returns null to indicate that the caller
+            // didn't get a work item.
+
+            WaiterEntry waiterEntry;
+            WorkItem workItem = null;
+            lock (this)
+            {
                 ValidateNotDisposed();
 
                 // If there are waiting work items then take one and return.
@@ -218,68 +218,68 @@ namespace Amib.Threading.Internal
 
                 // Put the waiter with the other waiters
                 PushWaiter(waiterEntry);
-                    }
+            }
 
-                    // Prepare array of wait handle for the WaitHandle.WaitAny()
-            WaitHandle [] waitHandles = new WaitHandle[] { 
-                                                                                                                                waiterEntry.WaitHandle, 
-                                                                                                                                cancelEvent };
+            // Prepare array of wait handle for the WaitHandle.WaitAny()
+            WaitHandle [] waitHandles = new WaitHandle[] {
+                                                                waiterEntry.WaitHandle,
+                                                                cancelEvent };
 
-                        // Wait for an available resource, cancel event, or timeout.
+            // Wait for an available resource, cancel event, or timeout.
 
-                        // During the wait we are supposes to exit the synchronization 
-                        // domain. (Placing true as the third argument of the WaitAny())
-                        // It just doesn't work, I don't know why, so I have two lock(this) 
-                        // statments instead of one.
+            // During the wait we are supposes to exit the synchronization
+            // domain. (Placing true as the third argument of the WaitAny())
+            // It just doesn't work, I don't know why, so I have two lock(this)
+            // statments instead of one.
 
             int index = STPEventWaitHandle.WaitAny(
-                                waitHandles,
-                                millisecondsTimeout, 
-                                true);
-
-                        lock(this)
-                        {
-                                // success is true if it got a work item.
-                                bool success = (0 == index);
-
-                                // The timeout variable is used only for readability.
-                                // (We treat cancel as timeout)
-                                bool timeout = !success;
-
-                                // On timeout update the waiterEntry that it is timed out
-                                if (timeout)
-                                {
-                                        // The Timeout() fails if the waiter has already been signaled
-                                        timeout = waiterEntry.Timeout();
-
-                                        // On timeout remove the waiter from the queue.
-                                        // Note that the complexity is O(1).
-                                        if(timeout)
-                                        {
-                                                RemoveWaiter(waiterEntry, false);
-                                        }
-
-                                        // Again readability
-                                        success = !timeout;
-                                }
-
-                                // On success return the work item
-                                if (success)
-                                {
-                                        workItem = waiterEntry.WorkItem;
-
-                                        if (null == workItem)
-                                        {
-                                                workItem = _workItems.Dequeue() as WorkItem;
-                                        }
-                                }
-                        }
-                        // On failure return null.
-                        return workItem;
-                }
+                waitHandles,
+                millisecondsTimeout,
+                true);
+
+            lock(this)
+            {
+                // success is true if it got a work item.
+                bool success = (0 == index);
+
+                // The timeout variable is used only for readability.
+                // (We treat cancel as timeout)
+                bool timeout = !success;
+
+                // On timeout update the waiterEntry that it is timed out
+                if (timeout)
+                {
+                    // The Timeout() fails if the waiter has already been signaled
+                    timeout = waiterEntry.Timeout();
+
+                    // On timeout remove the waiter from the queue.
+                    // Note that the complexity is O(1).
+                    if(timeout)
+                    {
+                        RemoveWaiter(waiterEntry, false);
+                    }
+
+                    // Again readability
+                    success = !timeout;
+                }
+
+                // On success return the work item
+                if (success)
+                {
+                    workItem = waiterEntry.WorkItem;
+
+                    if (null == workItem)
+                    {
+                        workItem = _workItems.Dequeue() as WorkItem;
+                    }
+                }
+            }
+            // On failure return null.
+            return workItem;
+        }
 
         /// <summary>
-        /// Cleanup the work items queue, hence no more work 
+        /// Cleanup the work items queue, hence no more work
         /// items are allowed to be queue
         /// </summary>
         private void Cleanup()
@@ -303,19 +303,19 @@ namespace Amib.Threading.Internal
                 // Clear the work items that are already queued
                 _workItems.Clear();
 
-                // Note: 
-                // I don't iterate over the queue and dispose of work items's states, 
-                // since if a work item has a state object that is still in use in the 
+                // Note:
+                // I don't iterate over the queue and dispose of work items's states,
+                // since if a work item has a state object that is still in use in the
                 // application then I must not dispose it.
 
                 // Tell the waiters that they were timed out.
                 // It won't signal them to exit, but to ignore their
                 // next work item.
-                                while(_waitersCount > 0)
-                                {
-                                        WaiterEntry waiterEntry = PopWaiter();
-                                        waiterEntry.Timeout();
-                                }
+                while(_waitersCount > 0)
+                {
+                    WaiterEntry waiterEntry = PopWaiter();
+                    waiterEntry.Timeout();
+                }
             }
         }
 
@@ -334,275 +334,275 @@ namespace Amib.Threading.Internal
             }
         }
 
-                #endregion
-
-                #region Private methods
-
-                /// <summary>
-                /// Returns the WaiterEntry of the current thread
-                /// </summary>
-                /// <returns></returns>
-                /// In order to avoid creation and destuction of WaiterEntry
-                /// objects each thread has its own WaiterEntry object.
-                private static WaiterEntry GetThreadWaiterEntry()
-                {
-                        if (null == CurrentWaiterEntry)
-                        {
-                                CurrentWaiterEntry = new WaiterEntry();
-                        }
-                        CurrentWaiterEntry.Reset();
-                        return CurrentWaiterEntry;
-                }
-
-                #region Waiters stack methods
-
-                /// <summary>
-                /// Push a new waiter into the waiter's stack
-                /// </summary>
-                /// <param name="newWaiterEntry">A waiter to put in the stack</param>
-                public void PushWaiter(WaiterEntry newWaiterEntry)
-                {
-                        // Remove the waiter if it is already in the stack and 
-                        // update waiter's count as needed
-                        RemoveWaiter(newWaiterEntry, false);
-
-                        // If the stack is empty then newWaiterEntry is the new head of the stack 
-                        if (null == _headWaiterEntry._nextWaiterEntry)
-                        {
-                                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
-                                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-
-                        }
-                        // If the stack is not empty then put newWaiterEntry as the new head 
-                        // of the stack.
-                        else
-                        {
-                                // Save the old first waiter entry
-                                WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
+        #endregion
+
+        #region Private methods
+
+        /// <summary>
+        /// Returns the WaiterEntry of the current thread
+        /// </summary>
+        /// <returns></returns>
+        /// In order to avoid creation and destuction of WaiterEntry
+        /// objects each thread has its own WaiterEntry object.
+        private static WaiterEntry GetThreadWaiterEntry()
+        {
+            if (null == CurrentWaiterEntry)
+            {
+                CurrentWaiterEntry = new WaiterEntry();
+            }
+            CurrentWaiterEntry.Reset();
+            return CurrentWaiterEntry;
+        }
+
+        #region Waiters stack methods
+
+        /// <summary>
+        /// Push a new waiter into the waiter's stack
+        /// </summary>
+        /// <param name="newWaiterEntry">A waiter to put in the stack</param>
+        public void PushWaiter(WaiterEntry newWaiterEntry)
+        {
+            // Remove the waiter if it is already in the stack and
+            // update waiter's count as needed
+            RemoveWaiter(newWaiterEntry, false);
+
+            // If the stack is empty then newWaiterEntry is the new head of the stack
+            if (null == _headWaiterEntry._nextWaiterEntry)
+            {
+                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
+                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+
+            }
+            // If the stack is not empty then put newWaiterEntry as the new head
+            // of the stack.
+            else
+            {
+                // Save the old first waiter entry
+                WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
 
                 // Update the links
-                                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
-                                newWaiterEntry._nextWaiterEntry = oldFirstWaiterEntry;
-                                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-                                oldFirstWaiterEntry._prevWaiterEntry = newWaiterEntry;
-                        }
-
-                        // Increment the number of waiters
-                        ++_waitersCount;
-                }
-
-                /// <summary>
-                /// Pop a waiter from the waiter's stack
-                /// </summary>
-                /// <returns>Returns the first waiter in the stack</returns>
-                private WaiterEntry PopWaiter()
-                {
-                        // Store the current stack head
-                        WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
-
-                        // Store the new stack head
-                        WaiterEntry newHeadWaiterEntry = oldFirstWaiterEntry._nextWaiterEntry;
-
-                        // Update the old stack head list links and decrement the number
-                        // waiters.
-                        RemoveWaiter(oldFirstWaiterEntry, true);
-
-                        // Update the new stack head
-                        _headWaiterEntry._nextWaiterEntry = newHeadWaiterEntry;
-                        if (null != newHeadWaiterEntry)
-                        {
-                                newHeadWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-                        }
-
-                        // Return the old stack head
-                        return oldFirstWaiterEntry;
-                }
-
-                /// <summary>
-                /// Remove a waiter from the stack
-                /// </summary>
-                /// <param name="waiterEntry">A waiter entry to remove</param>
-                /// <param name="popDecrement">If true the waiter count is always decremented</param>
-                private void RemoveWaiter(WaiterEntry waiterEntry, bool popDecrement)
-                {
-                        // Store the prev entry in the list
-                        WaiterEntry prevWaiterEntry = waiterEntry._prevWaiterEntry;
-
-                        // Store the next entry in the list
-                        WaiterEntry nextWaiterEntry = waiterEntry._nextWaiterEntry;
-
-                        // A flag to indicate if we need to decrement the waiters count.
-                        // If we got here from PopWaiter then we must decrement.
-                        // If we got here from PushWaiter then we decrement only if
-                        // the waiter was already in the stack.
-                        bool decrementCounter = popDecrement;
-
-                        // Null the waiter's entry links
-                        waiterEntry._prevWaiterEntry = null;
-                        waiterEntry._nextWaiterEntry = null;
-
-                        // If the waiter entry had a prev link then update it.
-                        // It also means that the waiter is already in the list and we
-                        // need to decrement the waiters count.
-                        if (null != prevWaiterEntry)
-                        {
-                                prevWaiterEntry._nextWaiterEntry = nextWaiterEntry;
-                                decrementCounter = true;
-                        }
-
-                        // If the waiter entry had a next link then update it.
-                        // It also means that the waiter is already in the list and we
-                        // need to decrement the waiters count.
-                        if (null != nextWaiterEntry)
-                        {
-                                nextWaiterEntry._prevWaiterEntry = prevWaiterEntry;
-                                decrementCounter = true;
-                        }
-
-                        // Decrement the waiters count if needed
-                        if (decrementCounter)
-                        {
-                                --_waitersCount;
-                        }
-                }
-
-                #endregion
-
-                #endregion
-
-                #region WaiterEntry class 
-
-                // A waiter entry in the _waiters queue.
-                public sealed class WaiterEntry : IDisposable
-                {
-                        #region Member variables
-
-                        /// <summary>
-                        /// Event to signal the waiter that it got the work item.
-                        /// </summary>
-                        //private AutoResetEvent _waitHandle = new AutoResetEvent(false);
+                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
+                newWaiterEntry._nextWaiterEntry = oldFirstWaiterEntry;
+                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+                oldFirstWaiterEntry._prevWaiterEntry = newWaiterEntry;
+            }
+
+            // Increment the number of waiters
+            ++_waitersCount;
+        }
+
+        /// <summary>
+        /// Pop a waiter from the waiter's stack
+        /// </summary>
+        /// <returns>Returns the first waiter in the stack</returns>
+        private WaiterEntry PopWaiter()
+        {
+            // Store the current stack head
+            WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
+
+            // Store the new stack head
+            WaiterEntry newHeadWaiterEntry = oldFirstWaiterEntry._nextWaiterEntry;
+
+            // Update the old stack head list links and decrement the number
+            // waiters.
+            RemoveWaiter(oldFirstWaiterEntry, true);
+
+            // Update the new stack head
+            _headWaiterEntry._nextWaiterEntry = newHeadWaiterEntry;
+            if (null != newHeadWaiterEntry)
+            {
+                newHeadWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+            }
+
+            // Return the old stack head
+            return oldFirstWaiterEntry;
+        }
+
+        /// <summary>
+        /// Remove a waiter from the stack
+        /// </summary>
+        /// <param name="waiterEntry">A waiter entry to remove</param>
+        /// <param name="popDecrement">If true the waiter count is always decremented</param>
+        private void RemoveWaiter(WaiterEntry waiterEntry, bool popDecrement)
+        {
+            // Store the prev entry in the list
+            WaiterEntry prevWaiterEntry = waiterEntry._prevWaiterEntry;
+
+            // Store the next entry in the list
+            WaiterEntry nextWaiterEntry = waiterEntry._nextWaiterEntry;
+
+            // A flag to indicate if we need to decrement the waiters count.
+            // If we got here from PopWaiter then we must decrement.
+            // If we got here from PushWaiter then we decrement only if
+            // the waiter was already in the stack.
+            bool decrementCounter = popDecrement;
+
+            // Null the waiter's entry links
+            waiterEntry._prevWaiterEntry = null;
+            waiterEntry._nextWaiterEntry = null;
+
+            // If the waiter entry had a prev link then update it.
+            // It also means that the waiter is already in the list and we
+            // need to decrement the waiters count.
+            if (null != prevWaiterEntry)
+            {
+                prevWaiterEntry._nextWaiterEntry = nextWaiterEntry;
+                decrementCounter = true;
+            }
+
+            // If the waiter entry had a next link then update it.
+            // It also means that the waiter is already in the list and we
+            // need to decrement the waiters count.
+            if (null != nextWaiterEntry)
+            {
+                nextWaiterEntry._prevWaiterEntry = prevWaiterEntry;
+                decrementCounter = true;
+            }
+
+            // Decrement the waiters count if needed
+            if (decrementCounter)
+            {
+                --_waitersCount;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WaiterEntry class
+
+        // A waiter entry in the _waiters queue.
+        public sealed class WaiterEntry : IDisposable
+        {
+            #region Member variables
+
+            /// <summary>
+            /// Event to signal the waiter that it got the work item.
+            /// </summary>
+            //private AutoResetEvent _waitHandle = new AutoResetEvent(false);
             private AutoResetEvent _waitHandle = EventWaitHandleFactory.CreateAutoResetEvent();
 
-                        /// <summary>
-                        /// Flag to know if this waiter already quited from the queue 
-                        /// because of a timeout.
-                        /// </summary>
-                        private bool _isTimedout = false;
+            /// <summary>
+            /// Flag to know if this waiter already quited from the queue
+            /// because of a timeout.
+            /// </summary>
+            private bool _isTimedout = false;
 
-                        /// <summary>
-                        /// Flag to know if the waiter was signaled and got a work item. 
-                        /// </summary>
-                        private bool _isSignaled = false;
+            /// <summary>
+            /// Flag to know if the waiter was signaled and got a work item.
+            /// </summary>
+            private bool _isSignaled = false;
 
             /// <summary>
-            /// A work item that passed directly to the waiter withou going 
+            /// A work item that passed directly to the waiter withou going
             /// through the queue
             /// </summary>
-                        private WorkItem _workItem = null;
+            private WorkItem _workItem = null;
 
             private bool _isDisposed = false;
 
-                        // Linked list members
-                        internal WaiterEntry _nextWaiterEntry = null;
-                        internal WaiterEntry _prevWaiterEntry = null;
-
-                        #endregion
-
-                        #region Construction
-
-                        public WaiterEntry()
-                        {
-                                Reset();
-                        }
-                                                
-                        #endregion
-
-                        #region Public methods
-
-                        public WaitHandle WaitHandle
-                        {
-                                get { return _waitHandle; }
-                        }
-
-                        public WorkItem WorkItem
-                        {
-                                get
-                                {
-                                        return _workItem;
-                                }
-                        }
-
-                        /// <summary>
-                        /// Signal the waiter that it got a work item.
-                        /// </summary>
-                        /// <returns>Return true on success</returns>
-                        /// The method fails if Timeout() preceded its call
-                        public bool Signal(WorkItem workItem)
-                        {
-                                lock(this)
-                                {
-                                        if (!_isTimedout)
-                                        {
-                                                _workItem = workItem;
-                                                _isSignaled = true;
-                                                _waitHandle.Set();
-                                                return true;
-                                        }
-                                }
-                                return false;
-                        }
-
-                        /// <summary>
-                        /// Mark the wait entry that it has been timed out
-                        /// </summary>
-                        /// <returns>Return true on success</returns>
-                        /// The method fails if Signal() preceded its call
-                        public bool Timeout()
-                        {
-                                lock(this)
-                                {
-                                        // Time out can happen only if the waiter wasn't marked as
-                                        // signaled
-                                        if (!_isSignaled)
-                                        {
-                                                // We don't remove the waiter from the queue, the DequeueWorkItem 
+            // Linked list members
+            internal WaiterEntry _nextWaiterEntry = null;
+            internal WaiterEntry _prevWaiterEntry = null;
+
+            #endregion
+
+            #region Construction
+
+            public WaiterEntry()
+            {
+                Reset();
+            }
+
+            #endregion
+
+            #region Public methods
+
+            public WaitHandle WaitHandle
+            {
+                get { return _waitHandle; }
+            }
+
+            public WorkItem WorkItem
+            {
+                get
+                {
+                    return _workItem;
+                }
+            }
+
+            /// <summary>
+            /// Signal the waiter that it got a work item.
+            /// </summary>
+            /// <returns>Return true on success</returns>
+            /// The method fails if Timeout() preceded its call
+            public bool Signal(WorkItem workItem)
+            {
+                lock(this)
+                {
+                    if (!_isTimedout)
+                    {
+                        _workItem = workItem;
+                        _isSignaled = true;
+                        _waitHandle.Set();
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            /// <summary>
+            /// Mark the wait entry that it has been timed out
+            /// </summary>
+            /// <returns>Return true on success</returns>
+            /// The method fails if Signal() preceded its call
+            public bool Timeout()
+            {
+                lock(this)
+                {
+                    // Time out can happen only if the waiter wasn't marked as
+                    // signaled
+                    if (!_isSignaled)
+                    {
+                        // We don't remove the waiter from the queue, the DequeueWorkItem
                         // method skips _waiters that were timed out.
-                                                _isTimedout = true;
-                                                return true;
-                                        }
-                                }
-                                return false;
-                        }
-
-                        /// <summary>
-                        /// Reset the wait entry so it can be used again
-                        /// </summary>
-                        public void Reset()
-                        {
-                                _workItem = null;
-                                _isTimedout = false;
-                                _isSignaled = false;
-                                _waitHandle.Reset();
-                        }
-
-                        /// <summary>
-                        /// Free resources
-                        /// </summary>
-                        public void Close()
-                        {
-                                if (null != _waitHandle)
-                                {
-                                        _waitHandle.Close();
-                                        _waitHandle = null;
-                                }
-                        }
-
-                        #endregion
-
-                        #region IDisposable Members
-
-                        public void Dispose()
-                        {
+                        _isTimedout = true;
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            /// <summary>
+            /// Reset the wait entry so it can be used again
+            /// </summary>
+            public void Reset()
+            {
+                _workItem = null;
+                _isTimedout = false;
+                _isSignaled = false;
+                _waitHandle.Reset();
+            }
+
+            /// <summary>
+            /// Free resources
+            /// </summary>
+            public void Close()
+            {
+                if (null != _waitHandle)
+                {
+                    _waitHandle.Close();
+                    _waitHandle = null;
+                }
+            }
+
+            #endregion
+
+            #region IDisposable Members
+
+            public void Dispose()
+            {
                 lock (this)
                 {
                     if (!_isDisposed)
@@ -613,10 +613,10 @@ namespace Amib.Threading.Internal
                 }
             }
 
-                        #endregion
-                }
+            #endregion
+        }
 
-                #endregion
+        #endregion
 
         #region IDisposable Members
 
@@ -625,7 +625,7 @@ namespace Amib.Threading.Internal
             if (!_isDisposed)
             {
                 Cleanup();
-                        _headWaiterEntry.Close();
+                _headWaiterEntry.Close();
             }
             _isDisposed = true;
         }
@@ -641,6 +641,6 @@ namespace Amib.Threading.Internal
         #endregion
     }
 
-        #endregion
+    #endregion
 }