92 files changed, 505 insertions, 505 deletions

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");