170 files changed, 2037 insertions, 2037 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 1a19585..f48710f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                     if (estateModule.IsTerrainXfer(xferID))
                         return;
                 }
-                
+
                 m_log.ErrorFormat(
                     "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}",
                     xferID, packetID, data.Length);
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index f489262..89fdf09 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             IAgentAssetTransactions
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_Scene;
         private bool m_dumpAssetsToFile = false;
         private int  m_levelUpload = 0;
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// </summary>
         private Dictionary<UUID, AgentAssetTransactions> AgentTransactions =
             new Dictionary<UUID, AgentAssetTransactions>();
-        
+
         #region Region Module interface
 
         public void Initialise(IConfigSource source)
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 //            m_log.DebugFormat(
 //                "[ASSET TRANSACTION MODULE]: HandleUDPUploadRequest - assetID: {0}, transaction {1}, type {2}, storeLocal {3}, tempFile {4}, data.Length {5}",
 //                assetID, transactionID, type, storeLocal, tempFile, data.Length);
-            
+
             if (((AssetType)type == AssetType.Texture ||
                 (AssetType)type == AssetType.Sound ||
                 (AssetType)type == AssetType.TextureTGA ||
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 60a254e..d2aa177 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
     public class AssetXferUploader
     {
-       
+
         private List<UUID> defaultIDs = new List<UUID> {
                 // Viewer's notion of the default texture
                 new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default blank
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index 4b457b1..ff71593 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")]
-    public class IPBanModule : ISharedRegionModule 
+    public class IPBanModule : ISharedRegionModule
     {
         #region Implementation of ISharedRegionModule
 
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
 
         public void Close()
         {
-            
+
         }
 
         public string Name
@@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
         /// matching domain (including "betasomewhere.com", "beta.somewhere.com",
         /// "somewhere.com.beta") - make sure to be reasonably specific in DNS
         /// bans.
-        /// 
+        ///
         /// IP address bans match on first characters, so,
-        /// "127.0.0.1" will ban only that address, 
+        /// "127.0.0.1" will ban only that address,
         /// "127.0.1" will ban "127.0.10.0"
         /// but "127.0.1." will ban only the "127.0.1.*" network
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 6d1f0c2..2242e42 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                 // Cache Decoded layers
                 SaveFileCacheForAsset(assetID, layers);
             }
-            
+
             // Notify Interested Parties
             lock (m_notifyList)
             {
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 1391013..1b6401a 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         private double  lastTimeTick = 0.0;
         private double  lastFilesExpire = 0.0;
         private bool    inTimeTick = false;
-  
+
         public struct XferRequest
         {
             public IClientAPI remoteClient;
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public int refsCount;
             public double timeStampMS;
         }
-       
+
         #region INonSharedRegionModule Members
 
         public void Initialise(IConfigSource config)
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                 }
             }
         }
-        
+
         public void NewClient(IClientAPI client)
         {
             client.OnRequestXfer += RequestXfer;
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                             int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Asset) >> 11;
                             if(Transfers.Count > 1)
                                 burstSize /= Transfers.Count;
-                            XferDownLoad transaction = 
+                            XferDownLoad transaction =
                                 new XferDownLoad(fileName, fileData, xferID, remoteClient, burstSize);
 
                             Transfers.Add(xferID, transaction);
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     }
                 }
                 else
-                    m_log.WarnFormat("[Xfer]: {0} not found", fileName);               
+                    m_log.WarnFormat("[Xfer]: {0} not found", fileName);
             }
         }
 
@@ -381,9 +381,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                             lastBytes = 1024;
                             LastPacket--;
                         }
-                        
+
                     }
-                
+
                     lastAckPacket = -1;
                     lastSentPacket = -1;
 
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 14b0280..23c1f03 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -41,16 +41,16 @@ namespace OpenSim.Region.CoreModules.Asset
     /// </summary>
     /// <remarks>
     /// <para>
-    /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". 
-    /// When cache is successfully enable log should have message 
+    /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache".
+    /// When cache is successfully enable log should have message
     /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".
     /// </para>
     /// <para>
     /// Cache's size is limited by two parameters:
-    /// maximal allowed size in bytes and maximal allowed asset count. When new asset 
+    /// maximal allowed size in bytes and maximal allowed asset count. When new asset
     /// is added to cache that have achieved either size or count limitation, cache
     /// will automatically remove less recently used assets from cache. Additionally
-    /// asset's lifetime is controlled by expiration time. 
+    /// asset's lifetime is controlled by expiration time.
     /// </para>
     /// <para>
     /// <list type="table">
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Asset
     public class CenomeMemoryAssetCache : IAssetCache, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Cache's default maximal asset count.
         /// </summary>
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Asset
         /// Asset's default expiration time in the cache.
         /// </summary>
         public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0);
-        
+
         /// <summary>
         /// Cache object.
         /// </summary>
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Asset
             if (asset != null)
             {
 //                m_log.DebugFormat("[CENOME ASSET CACHE]: Caching asset {0}", asset.ID);
-                
+
                 long size = asset.Data != null ? asset.Data.Length : 1;
                 m_cache.Set(asset.ID, asset, size);
                 m_cachedCount++;
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Get asset stored 
+        /// Get asset stored
         /// </summary>
         /// <param name="id">
         /// The asset's id.
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
 //            if (null == assetBase)
 //                m_log.DebugFormat("[CENOME ASSET CACHE]: Asset {0} not in cache", id);
-            
+
             return assetBase;
         }
 
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Asset
             get { return "CenomeMemoryAssetCache"; }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
             if (name != Name)
                 return;
-            
+
             long maxSize = DefaultMaxSize;
             int maxCount = DefaultMaxCount;
             TimeSpan expirationTime = DefaultExpirationTime;
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 82bc5cc..51fc3d1 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Asset
             get { return "CoreAssetCache"; }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 84e13a0..187f090 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Uncomment to make asset Get requests for existing 
+// Uncomment to make asset Get requests for existing
 // #define WAIT_ON_INPROGRESS_REQUESTS
 
 using System;
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset
         private IAssetService m_AssetService;
         private List<Scene> m_Scenes = new List<Scene>();
         private object timerLock = new object();
-        
+
         private Dictionary<string,WeakReference> weakAssetReferences = new Dictionary<string, WeakReference>();
         private object weakAssetReferencesLock = new object();
         private bool m_updateFileTimeOnCacheHit = false;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Asset
             m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.Asset
         public void Initialise(IConfigSource source)
         {
             IConfig moduleConfig = source.Configs["Modules"];
-            
+
             if (moduleConfig != null)
             {
                 string name = moduleConfig.GetString("AssetCaching", String.Empty);
@@ -169,11 +169,11 @@ namespace OpenSim.Region.CoreModules.Asset
                         m_negativeExpiration = assetConfig.GetInt("NegativeCacheTimeout", m_negativeExpiration);
                         m_negativeCacheSliding = assetConfig.GetBoolean("NegativeCacheSliding", m_negativeCacheSliding);
                         m_updateFileTimeOnCacheHit = assetConfig.GetBoolean("UpdateFileTimeOnCacheHit", m_updateFileTimeOnCacheHit);
-    
+
     #if WAIT_ON_INPROGRESS_REQUESTS
                         m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000);
     #endif
-    
+
                         m_LogLevel = assetConfig.GetInt("LogLevel", m_LogLevel);
                         m_HitRateDisplay = (ulong)assetConfig.GetLong("HitRateDisplay", (long)m_HitRateDisplay);
 
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Asset
                         {
                             m_CacheCleanTimer = new System.Timers.Timer(m_FileExpirationCleanupTimer.TotalMilliseconds);
                             m_CacheCleanTimer.AutoReset = false;
-                            m_CacheCleanTimer.Elapsed += CleanupExpiredFiles;                       
+                            m_CacheCleanTimer.Elapsed += CleanupExpiredFiles;
                             m_CacheCleanTimer.Start();
                             m_timerRunning = true;
                         }
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.Asset
                  }
                 if (m_MemoryCacheEnabled)
                     m_MemoryCache = new ExpiringCache<string, AssetBase>();
-            
+
                 lock(weakAssetReferencesLock)
                     weakAssetReferences = new Dictionary<string, WeakReference>();
             }
@@ -306,11 +306,11 @@ namespace OpenSim.Region.CoreModules.Asset
                 if (File.Exists(filename))
                 {
                     UpdateFileLastAccessTime(filename);
-                } 
-                else 
+                }
+                else
                 {
                     // Once we start writing, make sure we flag that we're writing
-                    // that object to the cache so that we don't try to write the 
+                    // that object to the cache so that we don't try to write the
                     // same file multiple times.
                     lock (m_CurrentlyWriting)
                     {
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Asset
         /// <param name="id"></param>
         /// <returns>An asset retrieved from the file cache.  null if there was a problem retrieving an asset.</returns>
         private AssetBase GetFromFileCache(string id)
-        {          
+        {
             string filename = GetFileName(id);
 
 #if WAIT_ON_INPROGRESS_REQUESTS
@@ -649,7 +649,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 m_MemoryCache = new ExpiringCache<string, AssetBase>();
             if (m_negativeCacheEnabled)
                 m_negativeCache = new ExpiringCache<string, object>();
-            
+
             lock(weakAssetReferencesLock)
                 weakAssetReferences = new Dictionary<string, WeakReference>();
         }
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Asset
             if (m_LogLevel >= 2)
                 m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Checking for expired files older then {0}.", m_FileExpiration);
 
-            lock(timerLock)           
+            lock(timerLock)
             {
                 if(!m_timerRunning || m_cleanupRunning)
                     return;
@@ -687,8 +687,8 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Recurses through specified directory checking for asset files last 
-        /// accessed prior to the specified purge line and deletes them.  Also 
+        /// Recurses through specified directory checking for asset files last
+        /// accessed prior to the specified purge line and deletes them.  Also
         /// removes empty tier directories.
         /// </summary>
         /// <param name="dir"></param>
@@ -720,7 +720,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 else if (dirSize >= m_CacheWarnAt)
                 {
                     m_log.WarnFormat(
-                        "[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration", 
+                        "[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration",
                         dir, dirSize);
                 }
             }
@@ -760,7 +760,7 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
-        /// Writes a file to the file cache, creating any nessesary 
+        /// Writes a file to the file cache, creating any nessesary
         /// tier directories along the way
         /// </summary>
         /// <param name="filename"></param>
@@ -772,7 +772,7 @@ namespace OpenSim.Region.CoreModules.Asset
             // Make sure the target cache directory exists
             string directory = Path.GetDirectoryName(filename);
 
-            // Write file first to a temp name, so that it doesn't look 
+            // Write file first to a temp name, so that it doesn't look
             // like it's already cached while it's still writing.
             string tempname = Path.Combine(directory, Path.GetRandomFileName());
 
@@ -784,7 +784,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     {
                         Directory.CreateDirectory(directory);
                     }
-    
+
                     stream = File.Open(tempname, FileMode.Create);
                     BinaryFormatter bformatter = new BinaryFormatter();
                     bformatter.Serialize(stream, asset);
@@ -818,7 +818,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     // This situation occurs fairly rarely anyway.  We assume in this that moves are atomic on the
                     // filesystem.
                     File.Move(tempname, filename);
-    
+
                     if (m_LogLevel >= 2)
                         m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Cache Stored :: {0}", asset.ID);
                 }
@@ -875,7 +875,7 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             string RegionCacheStatusFile = Path.Combine(m_CacheDirectory, "RegionStatus_" + regionID.ToString() + ".fac");
 
-            try 
+            try
             {
                 if (File.Exists(RegionCacheStatusFile))
                 {
@@ -884,7 +884,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 else
                 {
                     File.WriteAllText(
-                        RegionCacheStatusFile, 
+                        RegionCacheStatusFile,
                         "Please do not delete this file unless you are manually clearing your Flotsam Asset Cache.");
                 }
             }
@@ -892,14 +892,14 @@ namespace OpenSim.Region.CoreModules.Asset
             {
                 m_log.Warn(
                     string.Format(
-                        "[FLOTSAM ASSET CACHE]: Could not stamp region status file for region {0}.  Exception  ", 
-                        regionID), 
+                        "[FLOTSAM ASSET CACHE]: Could not stamp region status file for region {0}.  Exception  ",
+                        regionID),
                     e);
             }
         }
 
         /// <summary>
-        /// Iterates through all Scenes, doing a deep scan through assets 
+        /// Iterates through all Scenes, doing a deep scan through assets
         /// to update the access time of all assets present in the scene or referenced by assets
         /// in the scene.
         /// </summary>
@@ -918,7 +918,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 StampRegionStatusFile(s.RegionInfo.RegionID);
 
                 s.ForEachSOG(delegate(SceneObjectGroup e)
-                {            
+                {
                     if(!m_timerRunning && !storeUncached)
                         return;
 
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
             double weakHitRate = m_weakRefHits * invReq;
             int weakEntries = weakAssetReferences.Count;
-            
+
             double fileHitRate = m_DiskHits * invReq;
             double TotalHitRate = weakHitRate + fileHitRate;
 
@@ -1073,9 +1073,9 @@ namespace OpenSim.Region.CoreModules.Asset
                         if (m_FileCacheEnabled)
                         {
                             con.Output("Deep scans have previously been performed on the following regions:");
-    
+
                             foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
-                            {                                    
+                            {
                                 string RegionID = s.Remove(0,s.IndexOf("_")).Replace(".fac","");
                                 DateTime RegionDeepScanTMStamp = File.GetLastWriteTime(s);
                                 con.OutputFormat("Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
@@ -1118,7 +1118,7 @@ namespace OpenSim.Region.CoreModules.Asset
                                 con.Output("Memory cache not enabled.");
                             }
                         }
-    
+
                         if (clearFile)
                         {
                             if (m_FileCacheEnabled)
@@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         con.Output("FloatSam Ensuring assets are cached for all scenes.");
 
-                        WorkManager.RunInThread(delegate 
+                        WorkManager.RunInThread(delegate
                         {
                             bool wasRunning= false;
                             lock(timerLock)
@@ -1167,7 +1167,7 @@ namespace OpenSim.Region.CoreModules.Asset
                                 if(wasRunning)
                                 {
                                     m_CacheCleanTimer.Start();
-                                    m_timerRunning = true;                               
+                                    m_timerRunning = true;
                                 }
                                 m_cleanupRunning = false;
                             }
@@ -1247,12 +1247,12 @@ namespace OpenSim.Region.CoreModules.Asset
         public bool[] AssetsExist(string[] ids)
         {
             bool[] exist = new bool[ids.Length];
-            
+
             for (int i = 0; i < ids.Length; i++)
             {
                 exist[i] = Check(ids[i]);
             }
-            
+
             return exist;
         }
 
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 195bdaa..208963d 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Asset
         // Instrumentation
         private uint m_DebugRate;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 73e4431..dbb7941 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             AssetBase asset = AssetHelpers.CreateNotecardAsset();
             asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d5c81ce..f4a8a6b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// A value of 0 will apply no pause.  The pause is specified in milliseconds.
         /// </remarks>
         public int ThrottlePer100PrimsRezzed { get; set; }
-        
+
         private Scene m_scene;
         private IInventoryAccessModule m_invAccessModule;
 
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// Are attachments enabled?
         /// </summary>
         public bool Enabled { get; private set; }
-        
+
         public string Name { get { return "Attachments Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
@@ -87,14 +87,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 Enabled = true;
             }
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             if (Enabled)
             {
                 // Only register module with scene if it is enabled. All callers check for a null attachments module.
-                // Ideally, there should be a null attachments module for when this core attachments module has been 
+                // Ideally, there should be a null attachments module for when this core attachments module has been
                 // disabled. Registering only when enabled allows for other attachments module implementations.
                 m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
                 m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private void HandleScriptStateChange(uint localID, bool started)
         {
             SceneObjectGroup sog = m_scene.GetGroupByPrim(localID);
-            if (sog != null && sog.IsAttachment) 
+            if (sog != null && sog.IsAttachment)
             {
                 if (!started)
                 {
@@ -198,21 +198,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             m_scene.UnregisterModuleInterface<IAttachmentsModule>(this);
 
             if (Enabled)
                 m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-        
+
         public void RegionLoaded(Scene scene)
         {
             m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>();
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     ((SceneObjectGroup)so).RootPart.ClearUpdateSchedule();
 
 //                    m_log.DebugFormat(
-//                        "[ATTACHMENTS MODULE]: Copying script state with {0} bytes for object {1} for {2} in {3}", 
+//                        "[ATTACHMENTS MODULE]: Copying script state with {0} bytes for object {1} for {2} in {3}",
 //                        ad.AttachmentObjectStates[i].Length, so.Name, sp.Name, m_scene.Name);
 
                     so.SetState(ad.AttachmentObjectStates[i++], m_scene);
@@ -295,7 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 if (DebugLevel > 0)
                     m_log.DebugFormat(
-                        "[ATTACHMENTS MODULE]: Not doing simulator-side attachment rez for {0} in {1} as their viewer has already rezzed attachments", 
+                        "[ATTACHMENTS MODULE]: Not doing simulator-side attachment rez for {0} in {1} as their viewer has already rezzed attachments",
                         m_scene.Name, sp.Name);
 
                   return;
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down
                 // But they're not used anyway, the item is being looked up for now, so let's proceed.
-                //if (UUID.Zero == assetID) 
+                //if (UUID.Zero == assetID)
                 //{
                 //    m_log.DebugFormat("[ATTACHMENT]: Cannot rez attachment in point {0} with itemID {1}", p, itemID);
                 //    continue;
@@ -434,7 +434,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         UpdateDetachedObject(sp, so, String.Empty);
                     sp.ClearAttachments();
                 }
-            }           
+            }
         }
 
         public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent)
@@ -445,7 +445,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (DebugLevel > 0)
                 m_log.DebugFormat(
                     "[ATTACHMENTS MODULE]: Deleting attachments from scene {0} for {1}, silent = {2}",
-                    m_scene.RegionInfo.RegionName, sp.Name, silent);            
+                    m_scene.RegionInfo.RegionName, sp.Name, silent);
 
             foreach (SceneObjectGroup sop in sp.GetAttachments())
             {
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             sp.ClearAttachments();
         }
-        
+
         public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent,
                     bool addToInventory, bool append)
         {
@@ -505,7 +505,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
             // be removed when that functionality is implemented in opensim
             attachmentPt &= 0x7f;
-            
+
             // If the attachment point isn't the same as the one previously used
             // set it's offset position = 0 so that it appears on the attachment point
             // and not in a weird location somewhere unknown.
@@ -583,7 +583,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 if (addToInventory && sp.PresenceType != PresenceType.Npc)
                     UpdateUserInventoryWithAttachment(sp, group, attachmentPt, append);
-    
+
                 AttachToAgent(sp, group, attachmentPt, attachPos, silent);
 
                 if (resumeScripts)
@@ -616,11 +616,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         }
 
         public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
-                {
-                        return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
-                }
+        {
+            return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
+        }
 
-                public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
+        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
         {
             if (!Enabled)
                 return null;
@@ -631,8 +631,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     (AttachmentPoint)AttachmentPt, itemID, sp.Name, m_scene.Name);
 
             // We check the attachments in the avatar appearance here rather than the objects attached to the
-            // ScenePresence itself so that we can ignore calls by viewer 2/3 to attach objects on startup.  We are 
-            // already doing this in ScenePresence.MakeRootAgent().  Simulator-side attaching needs to be done 
+            // ScenePresence itself so that we can ignore calls by viewer 2/3 to attach objects on startup.  We are
+            // already doing this in ScenePresence.MakeRootAgent().  Simulator-side attaching needs to be done
             // because pre-outfit folder viewers (most version 1 viewers) require it.
             bool alreadyOn = false;
             List<AvatarAttachment> existingAttachments = sp.Appearance.GetAttachments();
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Rezzing {0} attachments from inventory for {1} in {2}", 
+                    "[ATTACHMENTS MODULE]: Rezzing {0} attachments from inventory for {1} in {2}",
                     rezlist.Count, sp.Name, m_scene.Name);
 
             foreach (KeyValuePair<UUID, uint> rez in rezlist)
@@ -727,7 +727,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
                 so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
-                
+
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
@@ -744,7 +744,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
 
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
-                
+
                 so.ApplyPhysics();
 
                 rootPart.Rezzed = DateTime.Now;
@@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", 
+                    "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}",
                     so.Name, so.LocalId, so.FromItemID, sp.Name, m_scene.Name);
 
             // Scripts MUST be snapshotted before the object is
@@ -827,14 +827,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 UpdateDetachedObject(sp, so, scriptedState);
             }
         }
-        
+
         public void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos)
         {
             if (!Enabled)
                 return;
 
             sog.UpdateGroupPosition(pos);
-            sog.HasGroupChanged = true;            
+            sog.HasGroupChanged = true;
         }
 
         #endregion
@@ -843,7 +843,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         // This is public but is not part of the IAttachmentsModule interface.
         // RegionCombiner module needs to poke at it to deliver client events.
-        // This breaks the encapsulation of the module and should get fixed somehow. 
+        // This breaks the encapsulation of the module and should get fixed somehow.
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnRezSingleAttachmentFromInv += Client_OnRezSingleAttachmentFromInv;
@@ -856,7 +856,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         // This is public but is not part of the IAttachmentsModule interface.
         // RegionCombiner module needs to poke at it to deliver client events.
-        // This breaks the encapsulation of the module and should get fixed somehow. 
+        // This breaks the encapsulation of the module and should get fixed somehow.
         public void UnsubscribeFromClientEvents(IClientAPI client)
         {
             client.OnRezSingleAttachmentFromInv -= Client_OnRezSingleAttachmentFromInv;
@@ -936,7 +936,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// Attach this scene object to the given avatar.
         /// </summary>
         /// <remarks>
-        /// This isn't publicly available since attachments should always perform the corresponding inventory 
+        /// This isn't publicly available since attachments should always perform the corresponding inventory
         /// operation (to show the attach in user inventory and update the asset with positional information).
         /// </remarks>
         /// <param name="sp"></param>
@@ -997,7 +997,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 // Fudge below is an extremely unhelpful comment.  It's probably here so that the scheduled full update
                 // will succeed, as that will not update if an attachment is selected.
-                so.IsSelected = false; // fudge.... 
+                so.IsSelected = false; // fudge....
 
                 so.ScheduleGroupForFullUpdate();
             }
@@ -1041,7 +1041,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// </summary>
         /// <remarks>
         /// This involves triggering the detach event and getting the script state (which also stops the script)
-        /// This MUST be done outside sp.AttachmentsSyncLock, since otherwise there is a chance of deadlock if a 
+        /// This MUST be done outside sp.AttachmentsSyncLock, since otherwise there is a chance of deadlock if a
         /// running script is performing attachment operations.
         /// </remarks>
         /// <returns>
@@ -1088,7 +1088,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // Remove the object from the scene so no more updates
             // are sent. Doing this before the below changes will ensure
             // updates can't cause "HUD artefacts"
-           
+
             m_scene.DeleteSceneObject(so, false, false);
 
             // Prepare sog for storage
@@ -1125,7 +1125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     itemID, rezGroupID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                     false, false, sp.UUID, true);
             else
-                objatt = m_invAccessModule.RezObject(sp.ControllingClient, 
+                objatt = m_invAccessModule.RezObject(sp.ControllingClient,
                     null, rezGroupID, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                     false, false, sp.UUID, true);
 
@@ -1139,7 +1139,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
             else if (itemID == UUID.Zero)
             {
-                // We need to have a FromItemID for multiple attachments on a single attach point to appear.  This is 
+                // We need to have a FromItemID for multiple attachments on a single attach point to appear.  This is
                 // true on Singularity 1.8.5 and quite possibly other viewers as well.  As NPCs don't have an inventory
                 // we will satisfy this requirement by inserting a random UUID.
                 objatt.FromItemID = UUID.Random();
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             if (tainted)
-                objatt.HasGroupChanged = true;           
+                objatt.HasGroupChanged = true;
 
             if (ThrottlePer100PrimsRezzed > 0)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 16f1952..941853c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -485,7 +485,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Test wearing a second attachment at the same position
             // Until multiple attachments at one point is implemented, this will remove the first attachment
-            // This test relies on both attachments having the same default attachment point (in this case LeftHand 
+            // This test relies on both attachments having the same default attachment point (in this case LeftHand
             // since none other has been set).
             {
                 scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, attItem2.ID, (uint)AttachmentPoint.Default);
@@ -975,8 +975,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // Both these operations will occur on different threads and will wait for each other.
             // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
             // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
-            tc.OnTestClientSendRegionTeleport 
-                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+            tc.OnTestClientSendRegionTeleport
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL)
                     => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
 
             m_numberOfAttachEventsFired = 0;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 67256ee..0826a08 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
                 m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
                 m_reusetextures = appearanceConfig.GetBoolean("ReuseTextures",m_reusetextures);
-                
+
                 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
             }
 
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         }
 
         /// <summary>
-        /// Set appearance data (texture asset IDs and slider settings) 
+        /// Set appearance data (texture asset IDs and slider settings)
         /// </summary>
         /// <param name="sp"></param>
         /// <param name="texture"></param>
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 {
                     changed = sp.Appearance.SetVisualParams(visualParams);
                 }
-            
+
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             WearableCacheItem[] items = sp.Appearance.WearableCacheItems;
             //foreach (WearableCacheItem item in items)
             //{
-               
+
             //}
             return items;
         }
@@ -468,7 +468,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
 
             sp.Appearance.WearableCacheItems = wearableCache;
-           
+
             if (missing.Count > 0)
             {
                 foreach (UUID id in missing)
@@ -493,7 +493,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
             {
                 int j = AvatarAppearance.BAKE_INDICES[iter];
-                m_log.Debug("[UpdateBCache] {" + iter + "/" + 
+                m_log.Debug("[UpdateBCache] {" + iter + "/" +
                                     sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
                                     sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
                                     sp.Appearance.WearableCacheItems[j].TextureID);
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                             wearableCacheValid = false;
                         }
                     }
-                   
+
                     wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
                     if (wearableCacheValid)
                         m_log.Debug("[ValidateBakedCache] have valid local cache");
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (!wearableCacheValid)
                 {
                     hits = 0;
-                    // only use external bake module on login condition check                  
+                    // only use external bake module on login condition check
 //                    ScenePresence ssp = null;
 //                    if (sp is ScenePresence)
                     {
@@ -816,7 +816,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 foreach (KeyValuePair<UUID, long> kvp in saves)
                 {
                     // We have to load the key and value into local parameters to avoid a race condition if we loop
-                    // around and load kvp with a different value before FireAndForget has launched its thread.                    
+                    // around and load kvp with a different value before FireAndForget has launched its thread.
                     UUID avatarID = kvp.Key;
                     long sendTime = kvp.Value;
 
@@ -869,13 +869,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             m_scene.AvatarService.SetAppearance(agentid, sp.Appearance);
 
-            // Trigger this here because it's the final step in the set/queue/save process for appearance setting. 
+            // Trigger this here because it's the final step in the set/queue/save process for appearance setting.
             // Everything has been updated and stored. Ensures bakes have been persisted (if option is set to persist bakes).
             m_scene.EventManager.TriggerAvatarAppearanceChanged(sp);
         }
 
         /// <summary>
-        /// For a given set of appearance items, check whether the items are valid and add their asset IDs to 
+        /// For a given set of appearance items, check whether the items are valid and add their asset IDs to
         /// appearance data.
         /// </summary>
         /// <param name='userID'></param>
@@ -893,7 +893,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
                         {
                             m_log.WarnFormat(
-                                "[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero.  Ignoring.", 
+                                "[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero.  Ignoring.",
                                 i, j, userID);
 
                             continue;
@@ -967,7 +967,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                                case WearableType.Skin:
 //                                //case WearableType.Underpants:
 //                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
-//                            
+//
 //                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
 //                                    resetwearable = true;
 //                                    break;
@@ -975,7 +975,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                            }
 //                            continue;
 //                        }
-//                        
+//
 //                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
 //                        baseItem = invService.GetItem(baseItem);
 //
@@ -1002,7 +1002,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //
 //                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
 //                            resetwearable = true;
-//                            
+//
 //                        }
 //                    }
 //                }
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                if (appearance.Wearables[(int) WearableType.Eyes] == null)
 //                {
 //                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
-//                    
+//
 //                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
 //                    resetwearable = true;
 //                }
@@ -1213,7 +1213,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
             }, null, "AvatarFactoryModule.OnClientRequestWearables");
         }
-        
+
         /// <summary>
         /// Set appearance data (texture asset IDs and slider settings) received from a client
         /// </summary>
@@ -1299,12 +1299,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 UUID texture = UUID.Zero;
                 int index = request.BakedTextureIndex;
-                
+
                 if (m_reusetextures)
                 {
                     // this is the most insanely dumb way to do this... however it seems to
                     // actually work. if the appearance has been reset because wearables have
-                    // changed then the texture entries are zero'd out until the bakes are 
+                    // changed then the texture entries are zero'd out until the bakes are
                     // uploaded. on login, if the textures exist in the cache (eg if you logged
                     // into the simulator recently, then the appearance will pull those and send
                     // them back in the packet and you won't have to rebake. if the textures aren't
@@ -1320,7 +1320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                     // m_log.WarnFormat("[AVFACTORY]: reuse texture {0} for index {1}",texture,index);
                 }
-                
+
                 CachedTextureResponseArg response = new CachedTextureResponseArg();
                 response.BakedTextureIndex = index;
                 response.BakedTextureID = texture;
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 cachedTextureResponse.Add(response);
             }
-            
+
             // m_log.WarnFormat("[AVFACTORY]: serial is {0}",serial);
             // The serial number appears to be used to match requests and responses
             // in the texture transaction. We just send back the serial number
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index dd93449..33489d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             // TODO: Use the actual BunchOfCaps functionality once we slot in the CapabilitiesModules
             AssetBase bakedTextureAsset;
-            bakedTextureAsset 
+            bakedTextureAsset
                 = new AssetBase(
                     bakedTextureID, "Test Baked Texture", (sbyte)AssetType.Texture, userId.ToString());
             bakedTextureAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = bakedTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
 
             AssetBase eyesBake = scene.AssetService.Get(bakedTextureID.ToString());
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// Test appearance setting where the baked texture UUID are library alpha textures.
         /// </summary>
         /// <remarks>
-        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to 
+        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to
         /// rebake.
         /// </remarks>
         [Test]
@@ -113,14 +113,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
             AssetBase libraryAsset;
-            libraryAsset 
+            libraryAsset
                 = new AssetBase(
                     alphaTextureID, "Default Alpha Layer Texture", (sbyte)AssetType.Texture, userId.ToString());
             libraryAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = alphaTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
         }
 
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index 6d97251..27e84b0 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
         private UTF8Encoding enc = new UTF8Encoding();
         private string m_URL = String.Empty;
         private static XmlSerializer m_serializer = new XmlSerializer(typeof(AssetBase));
-                private static bool m_enabled = false;
+        private static bool m_enabled = false;
 
         private static IServiceAuth m_Auth;
 
@@ -64,18 +64,18 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
                 return;
 
             m_URL = config.GetString("URL", String.Empty);
-                        if (m_URL == String.Empty)
-                                return;
+            if (m_URL == String.Empty)
+                return;
 
-                        m_enabled = true;
+            m_enabled = true;
 
             m_Auth = ServiceAuth.Create(configSource, "XBakes");
         }
 
         public void AddRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             // m_log.InfoFormat("[XBakes]: Enabled for region {0}", scene.RegionInfo.RegionName);
             m_Scene = scene;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
 
             int numberWears = 0;
             MemoryStream reqStream;
-           
+
             using (MemoryStream bakeStream = new MemoryStream())
             using (XmlTextWriter bakeWriter = new XmlTextWriter(bakeStream, null))
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 5164289..53800bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     m_enabled = false;
                     return;
                 }
- 
+
             m_whisperdistance = m_config.GetInt("whisper_distance", m_whisperdistance);
             m_saydistance = m_config.GetInt("say_distance", m_saydistance);
             m_shoutdistance = m_config.GetInt("shout_distance", m_shoutdistance);
@@ -123,7 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 }
             }
         }
-        
+
         public virtual void Close()
         {
         }
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         {
         }
 
-        public virtual Type ReplaceableInterface 
+        public virtual Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            switch (sourceType) 
+            switch (sourceType)
             {
                 case ChatSourceType.Agent:
                     ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     }
                     destination = UUID.Zero; // Avatars cant "SayTo"
                     ownerID = c.Sender.AgentId;
-                
+
                     hidePos = fromPos;
                     break;
 
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}",
 //                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
@@ -317,13 +317,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                         }
                     }
                 });
-            
+
             scene.EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
 
         static protected Vector3 CenterOfRegion = new Vector3(128, 128, 30);
-        
+
         public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
         {
             if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
@@ -341,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             // broadcast chat works by redistributing every incoming chat
             // message to each avatar in the scene.
             string fromName = c.From;
-            
+
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
             ChatSourceType sourceType = ChatSourceType.Object;
@@ -353,15 +353,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 ownerID = c.Sender.AgentId;
                 sourceType = ChatSourceType.Agent;
             }
-            else if (c.SenderUUID != UUID.Zero) 
+            else if (c.SenderUUID != UUID.Zero)
             {
                 fromID = c.SenderUUID;
                 ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
             }
-            
+
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-            
+
             if (c.Scene != null)
             {
                 ((Scene)c.Scene).ForEachRootClient
@@ -374,7 +374,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             (null != c.SenderObject) &&
                             (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
                             return;
-                        
+
                         client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
                                                (byte)sourceType, (byte)ChatAudibleLevel.Fully);
                         receiverIDs.Add(client.AgentId);
@@ -400,7 +400,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// <param name="type"></param>
         /// <param name="message"></param>
         /// <param name="src"></param>
-        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a 
+        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a
         /// precondition</returns>
         protected virtual bool TrySendChatMessage(
             ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
@@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             presence.ControllingClient.SendChatMessage(
                 message, (byte) type, fromPos, fromName,
                 fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
-            
+
             return true;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
index a720ad9..5457dc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 {
     [TestFixture]
     public class ChatModuleTests : OpenSimTestCase
-    {  
+    {
         [TestFixtureSetUp]
         public void FixtureInit()
         {
@@ -66,14 +66,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
         }
 
         private void SetupNeighbourRegions(TestScene sceneA, TestScene sceneB)
-        {            
-            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the 
+        {
+            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the
             // CapabilitiesModule complain when it can't set up HTTP endpoints.
             BaseHttpServer httpServer = new BaseHttpServer(99999);
             MainServer.AddHttpServer(httpServer);
             MainServer.Instance = httpServer;
 
-            // We need entity transfer modules so that when sp2 logs into the east region, the region calls 
+            // We need entity transfer modules so that when sp2 logs into the east region, the region calls
             // EntityTransferModuleto set up a child agent on the west region.
             // XXX: However, this is not an entity transfer so is misleading.
             EntityTransferModule etmA = new EntityTransferModule();
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             modulesConfig.Set("SimulationServices", lscm.Name);
 
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
-            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());           
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB, new ChatModule());
         }
 
@@ -111,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(250, 128, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);            
+            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);
 
             SetupNeighbourRegions(sceneWest, sceneEast);
 
@@ -124,12 +124,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneWest, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -147,19 +147,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z), 
+                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
@@ -202,8 +202,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(128, 6, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);            
+            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);
 
             SetupNeighbourRegions(sceneNorth, sceneSouth);
 
@@ -215,12 +215,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneSouth, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneSouth, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneNorth, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -238,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z), 
+                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -266,13 +266,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
             TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
         }
-    
+
         private void TestUserInRange(TestClient speakClient, string testMessage, ref string receivedMessage)
         {
             receivedMessage = "";
diff --git a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
index 764adf9..cf65c47 100644
--- a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
@@ -62,19 +62,19 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
         private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
 
         public string Name { get { return "User Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[USER COMMANDS MODULE]: CLOSED MODULE");
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index aaa331b..7980de3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_Enabled = true;
                     m_log.DebugFormat("[FRIENDS MODULE]: {0} enabled.", Name);
                 }
-            }            
+            }
         }
 
         protected virtual void InitModule(IConfigSource config)
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
-            { 
+            {
                 // we got a friendship offer
                 UUID principalID = new UUID(im.fromAgentID);
                 UUID friendID = new UUID(im.toAgentID);
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             im.imSessionID = im.fromAgentID;
             im.fromAgentName = GetFriendshipRequesterName(agentID);
 
-            // Try the local sim            
+            // Try the local sim
             if (LocalFriendshipOffered(friendID, im))
                 return true;
 
@@ -648,7 +648,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
             }
 
-            // Update the local cache. 
+            // Update the local cache.
             RecacheFriends(client);
 
             //
@@ -704,7 +704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 }
             }
         }
-        
+
         public void RemoveFriendship(IClientAPI client, UUID exfriendID)
         {
             if (!DeleteFriendship(client.AgentId, exfriendID))
@@ -732,7 +732,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     m_FriendsSimConnector.FriendshipTerminated(region, client.AgentId, exfriendID);
                 }
-            }            
+            }
         }
 
         public void FindFriend(IClientAPI remoteClient,UUID HunterID ,UUID PreyID)
@@ -740,7 +740,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UUID requester = remoteClient.AgentId;
             if(requester != HunterID) // only allow client agent to be the hunter (?)
                 return;
-            
+
             FriendInfo[] friends = GetFriendsFromCache(requester);
             if (friends.Length == 0)
                 return;
@@ -773,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { PreyID.ToString() });
-            
+
             if (friendSessions == null || friendSessions.Length == 0)
                 return;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index c421740..81aa882 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID);
             string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
 
-            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 
+            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID,
                 (byte)InstantMessageDialog.FriendshipOffered, message, false, Vector3.Zero);
 
             // !! HACK
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 9954749..ac05a6e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -539,8 +539,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         //            m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
         //              agentUUI, friendUUI, agentFriendService, friendFriendService);
 
-                }                
-                
+                }
+
                 // Delete any previous friendship relations
                 DeletePreviousRelations(agentID, friendID);
 
@@ -641,11 +641,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a1, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a1.ToString());
-                        }                            
+                        }
                     }
                 }
             }
-                        
+
             finfos = GetFriendsFromCache(a1);
             if (finfos != null)
             {
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             FriendsService.Delete(a2, f.Friend);
                             // and also the converse
                             FriendsService.Delete(f.Friend, a2.ToString());
-                        }                            
+                        }
                     }
                 }
             }
@@ -783,7 +783,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL);
                     GridRegion region = new GridRegion();
                     region.ServerURI = friendsURL;
-                    
+
                     string name = im.fromAgentName;
                     if (m_uMan.IsLocalGridUser(agentID))
                     {
@@ -815,7 +815,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     }
 
                     m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name);
-                 
+
                     return true;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
index 1fa4dd6..3fae271 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             {
                 if (kvp.Key != "local")
                 {
-                    // For the others, call the user agent service 
+                    // For the others, call the user agent service
                     List<string> ids = new List<string>();
                     foreach (FriendInfo f in kvp.Value)
                         ids.Add(f.Friend);
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index e6fd54e..3d9bd35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
             // so that different services and simulator can share the data in standalone mode.  This is pretty horrible
             // effectively the statics are global variables.
             NullFriendsData.Clear();
-                
+
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             // Not strictly necessary since FriendsModule assumes it is the default (!)
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 4efcd3b..03e2c5a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -42,11 +42,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GesturesModule")]
     public class GesturesModule : INonSharedRegionModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             m_scene.EventManager.OnNewClient -= OnNewClient;
             m_scene = null;
         }
-        
+
         public void Close() {}
         public string Name { get { return "Gestures Module"; } }
 
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             client.OnActivateGesture += ActivateGesture;
             client.OnDeactivateGesture += DeactivateGesture;
         }
-        
+
         public virtual void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId)
         {
             IInventoryService invService = m_scene.InventoryService;
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                 item.Flags |= 1;
                 invService.UpdateItem(item);
             }
-            else 
+            else
                 m_log.WarnFormat(
                     "[GESTURES]: Unable to find gesture {0} to activate for {1}", gestureId, client.Name);
         }
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                 item.Flags &= ~(uint)1;
                 invService.UpdateItem(item);
             }
-            else 
+            else
                 m_log.ErrorFormat(
                     "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index db02379..8d3c10d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -112,19 +112,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnGodKickUser += KickUser;
             client.OnRequestGodlikePowers += RequestGodlikePowers;
         }
-        
+
         public void UnsubscribeFromClientEvents(IClientAPI client)
         {
             client.OnGodKickUser -= KickUser;
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
-        
+
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
             string uri = "/CAPS/" + UUID.Random();
 
             caps.RegisterHandler(
-                "UntrustedSimulatorMessage", 
+                "UntrustedSimulatorMessage",
                 new RestStreamHandler("POST", uri, HandleUntrustedSimulatorMessage, "UntrustedSimulatorMessage", null));
         }
 
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if (godLike && sp.GodLevel < 200 && DialogModule != null)
                DialogModule.SendAlertToUser(agentID, "Request for god powers denied");
         }
-        
+
         /// <summary>
         /// Kicks or freezes User specified from the simulator. This logs them off of the grid
         /// </summary>
@@ -261,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if(sp.IsDeleted || sp.IsChildAgent)
                 return;
             sp.ControllingClient.Kick(reason);
-            sp.Scene.CloseAgent(sp.UUID, true); 
+            sp.Scene.CloseAgent(sp.UUID, true);
         }
 
         private void OnIncomingInstantMessage(GridInstantMessage msg)
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 543410e..7f91a61 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                 return;
 
 //            m_log.Debug("[GROUPS]: Shutting down group module.");
-            
+
             lock (m_ClientMap)
             {
                 m_ClientMap.Clear();
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 63b3dba..16e2ec3 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -144,11 +144,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (Scene scene in m_Scenes)
             {
 //                m_log.DebugFormat(
-//                    "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
+//                    "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}",
 //                    toAgentID.ToString(), scene.RegionInfo.RegionName);
-                ScenePresence sp = scene.GetScenePresence(toAgentID); 
+                ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null && !sp.IsChildAgent && !sp.IsDeleted)
-                {                                        
+                {
                     // Local message
 //                  m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
                     sp.ControllingClient.SendInstantMessage(im);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 7d54a00..71c0a8a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// Is this module enabled?
         /// </value>
         protected bool m_enabled = false;
-        
+
         protected readonly List<Scene> m_scenes = new List<Scene>();
 
         #region Region Module interface
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule")
                     return;
             }
-            
+
             m_enabled = true;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 6b120fb..efb9421 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -207,10 +207,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             bool successful = false;
-            
+
             // TODO: For now, as IMs seem to be a bit unreliable on OSGrid, catch all exception that
             // happen here and aren't caught and log them.
-            try 
+            try
             {
                 // various rational defaults
                 UUID fromAgentID = UUID.Zero;
@@ -475,7 +475,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// </summary>
 
         /// <param name="prevRegionHandle">
-        /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
+        /// Pass in 0 the first time this method is called.  It will be called recursively with the last
         /// regionhandle tried
         /// </param>
         private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 315d372..2d57193 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             get { return null; }
         }
-        
+
         public void Close()
         {
         }
-       
+
         private void OnNewClient(IClientAPI client)
         {
             client.OnMuteListRequest += OnMuteListRequest;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 369d480..d1f6054 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             get { return null; }
         }
-        
+
         public void Close()
         {
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 4a06fd1..3838316 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// bumps here should be compatible.
         /// </summary>
         public static int MAX_MAJOR_VERSION = 1;
-        
+
         protected TarArchiveReader archive;
 
         private UserAccount m_userInfo;
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// ID of this request
         /// </value>
         protected UUID m_id;
-        
+
         /// <summary>
         /// Do we want to merge this load with existing inventory?
         /// </summary>
@@ -82,41 +82,41 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The stream from which the inventory archive will be loaded.
         /// </value>
         private Stream m_loadStream;
-        
+
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
         public bool ControlFileLoaded { get; private set; }
-        
+
         /// <summary>
         /// Do we want to enforce the check.  IAR versions before 0.2 and 1.1 do not guarantee this order, so we can't
         /// enforce.
         /// </summary>
         public bool EnforceControlFileCheck { get; private set; }
-        
+
         protected bool m_assetsLoaded;
         protected bool m_inventoryNodesLoaded;
-        
+
         protected int m_successfulAssetRestores;
         protected int m_failedAssetRestores;
-        protected int m_successfulItemRestores;                
-        
+        protected int m_successfulItemRestores;
+
         /// <summary>
         /// Root destination folder for the IAR load.
         /// </summary>
         protected InventoryFolderBase m_rootDestinationFolder;
-        
+
         /// <summary>
         /// Inventory nodes loaded from the iar.
         /// </summary>
-        protected HashSet<InventoryNodeBase> m_loadedNodes = new HashSet<InventoryNodeBase>();   
-        
+        protected HashSet<InventoryNodeBase> m_loadedNodes = new HashSet<InventoryNodeBase>();
+
         /// <summary>
         /// In order to load identically named folders, we need to keep track of the folders that we have already
         /// resolved.
         /// </summary>
-        Dictionary <string, InventoryFolderBase> m_resolvedFolders = new Dictionary<string, InventoryFolderBase>();        
-                
+        Dictionary <string, InventoryFolderBase> m_resolvedFolders = new Dictionary<string, InventoryFolderBase>();
+
         /// <summary>
         /// Record the creator id that should be associated with an asset.  This is used to adjust asset creator ids
         /// after OSP resolution (since OSP creators are only stored in the item
@@ -163,9 +163,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_invPath = invPath;
             m_loadStream = loadStream;
             m_module = module;
-            
+
             // FIXME: Do not perform this check since older versions of OpenSim do save the control file after other things
-            // (I thought they weren't).  We will need to bump the version number and perform this check on all 
+            // (I thought they weren't).  We will need to bump the version number and perform this check on all
             // subsequent IAR versions only
             ControlFileLoaded = true;
         }
@@ -188,19 +188,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 Exception reportedException = null;
 
                 string filePath = "ERROR";
-               
+
                 List<InventoryFolderBase> folderCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(
                         m_InventoryService, m_userInfo.PrincipalID, m_invPath);
-    
+
                 if (folderCandidates.Count == 0)
                 {
                     // Possibly provide an option later on to automatically create this folder if it does not exist
                     m_log.ErrorFormat("[INVENTORY ARCHIVER]: Inventory path {0} does not exist", m_invPath);
-    
+
                     return m_loadedNodes;
                 }
-                
+
                 m_rootDestinationFolder = folderCandidates[0];
                 archive = new TarArchiveReader(m_loadStream);
                 byte[] data;
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
                         LoadControlFile(filePath, data);
-                    }                    
+                    }
                     else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
                     {
                         LoadAssetFile(filePath, data);
@@ -221,17 +221,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         LoadInventoryFile(filePath, entryType, data);
                     }
                 }
-                
+
                 archive.Close();
 
                 m_log.DebugFormat(
-                    "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
+                    "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures",
                     m_successfulAssetRestores, m_failedAssetRestores);
 
                 //Alicia: When this is called by LibraryModule or Tests, m_module will be null as event is not required
                 if(m_module != null)
                     m_module.TriggerInventoryArchiveLoaded(m_id, true, m_userInfo, m_invPath, m_loadStream, reportedException, m_successfulItemRestores);
-                
+
                 return m_loadedNodes;
             }
             catch(Exception Ex)
@@ -268,8 +268,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </param>
         /// <returns>The last user inventory folder created or found for the archive path</returns>
         public InventoryFolderBase ReplicateArchivePathToUserInventory(
-            string iarPath, 
-            InventoryFolderBase rootDestFolder, 
+            string iarPath,
+            InventoryFolderBase rootDestFolder,
             Dictionary <string, InventoryFolderBase> resolvedFolders,
             HashSet<InventoryNodeBase> loadedNodes)
         {
@@ -277,27 +277,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
 //            m_log.DebugFormat(
 //                "[INVENTORY ARCHIVER]: Loading folder {0} {1}", rootDestFolder.Name, rootDestFolder.ID);
-                        
-            InventoryFolderBase destFolder 
+
+            InventoryFolderBase destFolder
                 = ResolveDestinationFolder(rootDestFolder, ref iarPathExisting, resolvedFolders);
-            
+
 //            m_log.DebugFormat(
-//                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]", 
+//                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]",
 //                iarPath, iarPathExisting);
-            
+
             string iarPathToCreate = iarPath.Substring(iarPathExisting.Length);
             CreateFoldersForPath(destFolder, iarPathExisting, iarPathToCreate, resolvedFolders, loadedNodes);
-            
+
             return destFolder;
         }
 
         /// <summary>
         /// Resolve a destination folder
         /// </summary>
-        /// 
+        ///
         /// We require here a root destination folder (usually the root of the user's inventory) and the archive
         /// path.  We also pass in a list of previously resolved folders in case we've found this one previously.
-        /// 
+        ///
         /// <param name="archivePath">
         /// The item archive path to resolve.  The portion of the path passed back is that
         /// which corresponds to the resolved desintation folder.
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             while (archivePath.Length > 0)
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
-                
+
                 if (resolvedFolders.ContainsKey(archivePath))
                 {
 //                    m_log.DebugFormat(
@@ -332,13 +332,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     if (m_merge)
                     {
-                        // TODO: Using m_invPath is totally wrong - what we need to do is strip the uuid from the 
+                        // TODO: Using m_invPath is totally wrong - what we need to do is strip the uuid from the
                         // iar name and try to find that instead.
                         string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath);
                         List<InventoryFolderBase> folderCandidates
                             = InventoryArchiveUtils.FindFoldersByPath(
                                 m_InventoryService, m_userInfo.PrincipalID, plainPath);
-            
+
                         if (folderCandidates.Count != 0)
                         {
                             InventoryFolderBase destFolder = folderCandidates[0];
@@ -346,7 +346,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             return destFolder;
                         }
                     }
-                    
+
                     // Don't include the last slash so find the penultimate one
                     int penultimateSlashIndex = archivePath.LastIndexOf("/", archivePath.Length - 2);
 
@@ -365,10 +365,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     }
                 }
             }
-            
+
             return rootDestFolder;
         }
-        
+
         /// <summary>
         /// Create a set of folders for the given path.
         /// </summary>
@@ -388,10 +388,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Track the inventory nodes created.
         /// </param>
         protected void CreateFoldersForPath(
-            InventoryFolderBase destFolder, 
+            InventoryFolderBase destFolder,
             string iarPathExisting,
-            string iarPathToReplicate, 
-            Dictionary <string, InventoryFolderBase> resolvedFolders, 
+            string iarPathToReplicate,
+            Dictionary <string, InventoryFolderBase> resolvedFolders,
             HashSet<InventoryNodeBase> loadedNodes)
         {
             string[] rawDirsToCreate = iarPathToReplicate.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
@@ -402,7 +402,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 if (!rawDirsToCreate[i].Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
                     continue;
-                
+
                 int identicalNameIdentifierIndex
                     = rawDirsToCreate[i].LastIndexOf(
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);
                 UUID newFolderId = UUID.Random();
 
-                destFolder 
+                destFolder
                     = new InventoryFolderBase(
                         newFolderId, newFolderName, m_userInfo.PrincipalID,
                         (short)FolderType.None, destFolder.ID, 1);
@@ -427,7 +427,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     loadedNodes.Add(destFolder);
             }
         }
-        
+
         /// <summary>
         /// Load an item from the archive
         /// </summary>
@@ -438,7 +438,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected InventoryItemBase LoadItem(byte[] data, InventoryFolderBase loadFolder)
         {
             InventoryItemBase item = UserInventoryItemSerializer.Deserialize(data);
-            
+
             // Don't use the item ID that's in the file
             item.ID = UUID.Random();
 
@@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (UUID.Zero != ospResolvedId) // The user exists in this grid
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
-                
+
 //                item.CreatorIdAsUuid = ospResolvedId;
 
                 // Don't preserve the OSPA in the creator id (which actually gets persisted to the
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             if (!m_InventoryService.AddItem(item))
                 m_log.WarnFormat("[INVENTORY ARCHIVER]: Unable to save item {0} in folder {1}", item.Name, item.Folder);
-        
+
             return item;
         }
 
@@ -519,7 +519,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         data = SceneObjectSerializer.ModifySerializedObject(assetId, data,
                             sog => {
                                 bool modified = false;
-                                
+
                                 foreach (SceneObjectPart sop in sog.Parts)
                                 {
                                     if (string.IsNullOrEmpty(sop.CreatorData))
@@ -528,10 +528,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                                         modified = true;
                                     }
                                 }
-                                
+
                                 return modified;
                             });
-                        
+
                         if (data == null)
                             return false;
                     }
@@ -568,7 +568,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             int majorVersion = int.Parse(archiveElement.Attribute("major_version").Value);
             int minorVersion = int.Parse(archiveElement.Attribute("minor_version").Value);
             string version = string.Format("{0}.{1}", majorVersion, minorVersion);
-                        
+
             if (majorVersion > MAX_MAJOR_VERSION)
             {
                 throw new Exception(
@@ -576,38 +576,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         "The IAR you are trying to load has major version number of {0} but this version of OpenSim can only load IARs with major version number {1} and below",
                         majorVersion, MAX_MAJOR_VERSION));
             }
-            
-            ControlFileLoaded = true;            
-            m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version);                        
+
+            ControlFileLoaded = true;
+            m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version);
         }
-        
+
         /// <summary>
         /// Load inventory file
         /// </summary>
         /// <param name="path"></param>
         /// <param name="entryType"></param>
-        /// <param name="data"></param>        
+        /// <param name="data"></param>
         protected void LoadInventoryFile(string path, TarArchiveReader.TarEntryType entryType, byte[] data)
         {
             if (!ControlFileLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load", 
+                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load",
                         ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.INVENTORY_PATH));
-            
+
             if (m_assetsLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load", 
-                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));                            
-            
+                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load",
+                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));
+
             path = path.Substring(ArchiveConstants.INVENTORY_PATH.Length);
-            
+
             // Trim off the file portion if we aren't already dealing with a directory path
             if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
                 path = path.Remove(path.LastIndexOf("/") + 1);
-            
-            InventoryFolderBase foundFolder 
+
+            InventoryFolderBase foundFolder
                 = ReplicateArchivePathToUserInventory(
                     path, m_rootDestinationFolder, m_resolvedFolders, m_loadedNodes);
 
@@ -618,17 +618,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (item != null)
                 {
                     m_successfulItemRestores++;
-                    
-                    // If we aren't loading the folder containing the item then well need to update the 
+
+                    // If we aren't loading the folder containing the item then well need to update the
                     // viewer separately for that item.
                     if (!m_loadedNodes.Contains(foundFolder))
                         m_loadedNodes.Add(item);
                 }
             }
-            
-            m_inventoryNodesLoaded = true;            
+
+            m_inventoryNodesLoaded = true;
         }
-        
+
         /// <summary>
         /// Load asset file
         /// </summary>
@@ -639,15 +639,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (!ControlFileLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load", 
+                        "The IAR you are trying to load does not list {0} before {1}.  Aborting load",
                         ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.ASSETS_PATH));
-            
+
             if (!m_inventoryNodesLoaded)
                 throw new Exception(
                     string.Format(
-                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load", 
-                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));                            
-            
+                        "The IAR you are trying to load does not list all {0} before {1}.  Aborting load",
+                        ArchiveConstants.INVENTORY_PATH, ArchiveConstants.ASSETS_PATH));
+
             if (LoadAsset(path, data))
                 m_successfulAssetRestores++;
             else
@@ -655,10 +655,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             if ((m_successfulAssetRestores) % 50 == 0)
                 m_log.DebugFormat(
-                    "[INVENTORY ARCHIVER]: Loaded {0} assets...", 
-                    m_successfulAssetRestores);                       
-            
-            m_assetsLoaded = true;            
-        }                 
+                    "[INVENTORY ARCHIVER]: Loaded {0} assets...",
+                    m_successfulAssetRestores);
+
+            m_assetsLoaded = true;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index dbaf2aa..b66aad5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
-        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an 
+        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an
         /// unspecified one will be returned.  If no such folder eixsts then null is returned</returns>
         public static InventoryFolderBase FindFolderByPath(
             IInventoryService inventoryService, UUID userId, string path)
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
         /// </param>
-        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an 
+        /// <returns>The folder found.  Please note that if there are multiple folders with the same name then an
         /// unspecified one will be returned.  If no such folder eixsts then null is returned</returns>
         public static InventoryFolderBase FindFolderByPath(
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return FindFoldersByPath(inventoryService, rootFolder, path);
         }
-        
+
         /// <summary>
         /// Find a set of folders given a PATH_DELIMITER delimited path starting from this folder
         /// </summary>
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
         {
             List<InventoryFolderBase> foundFolders = new List<InventoryFolderBase>();
-            
+
             if (path == string.Empty)
             {
                 foundFolders.Add(startFolder);
@@ -189,17 +189,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 foundFolders.Add(startFolder);
                 return foundFolders;
             }
-                        
+
             // If the path isn't just / then trim any starting extraneous slashes
             path = path.TrimStart(new char[] { PATH_DELIMITER });
-            
+
 //            m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Adjusted path in FindFolderByPath() is [{0}]", path);
 
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
 
             //string[] components = path.Split(new string[] { PATH_DELIMITER.ToString() }, 2, StringSplitOptions.None);
-            
+
             InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
 
 //            m_log.DebugFormat(
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
         /// </remarks>
-        /// 
+        ///
         /// <param name="inventoryService">
         /// Inventory service to query
         /// </param>
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
         /// </remarks>
-        /// 
+        ///
         /// <param name="inventoryService">Inventory service to query</param>
         /// <param name="startFolder">The folder from which the path starts</param>
         /// <param name="path">The path to the required item.</param>
@@ -313,10 +313,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             // If the path isn't just / then trim any starting extraneous slashes
             path = path.TrimStart(new char[] { PATH_DELIMITER });
-            
+
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
-                            
+
             //string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
 
             if (components.Length == 1)
@@ -324,15 +324,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                m_log.DebugFormat(
 //                    "FOUND SINGLE COMPONENT [{0}].  Looking for this in [{1}] {2}",
 //                    components[0], startFolder.Name, startFolder.ID);
-                
+
                 List<InventoryItemBase> items = inventoryService.GetFolderItems(startFolder.Owner, startFolder.ID);
 
 //                m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Found {0} items in FindItemByPath()", items.Count);
-                
+
                 foreach (InventoryItemBase item in items)
                 {
 //                    m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Inspecting item {0} {1}", item.Name, item.ID);
-                    
+
                     if (item.Name == components[0])
                         foundItems.Add(item);
                 }
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                m_log.DebugFormat("FOUND COMPONENTS [{0}] and [{1}]", components[0], components[1]);
 
                 InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
-                
+
                 foreach (InventoryFolderBase folder in contents.Folders)
                 {
                     if (folder.Name == components[0])
@@ -365,9 +365,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static string[] SplitEscapedPath(string path)
         {
 //            m_log.DebugFormat("SPLITTING PATH {0}", path);
-            
+
             bool singleEscapeChar = false;
-            
+
             for (int i = 0; i < path.Length; i++)
             {
                 if (path[i] == ESCAPE_CHARACTER && !singleEscapeChar)
@@ -395,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static string UnescapePath(string path)
         {
 //            m_log.DebugFormat("ESCAPING PATH {0}", path);
-            
+
             StringBuilder sb = new StringBuilder();
 
             bool singleEscapeChar = false;
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
 //            m_log.DebugFormat("ESCAPED PATH TO {0}", sb);
-            
+
             return sb.ToString();
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 8847414..be59eb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         public string Name { get { return "Inventory Archiver Module"; } }
 
-        #endregion 
+        #endregion
 
         /// <summary>
         /// Trigger the inventory archive saved event.
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
index c2e645f..f559c2e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
@@ -56,23 +56,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            
+
             // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
             Scene scene = new SceneHelpers().SetupScene();
-            
+
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
 
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood");
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
 
-            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
-            
-            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");            
+
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 
             // Now try loading to a root child folder
             UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false);
@@ -90,9 +90,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryItemBase foundItem3
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name);
-            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");            
+            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
         }
-        
+
         /// <summary>
         /// Test that things work when the load path specified starts with a slash
         /// </summary>
@@ -101,22 +101,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
             Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-            
+
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
             archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
                     scene.InventoryService, m_uaMT.PrincipalID, "/Objects/" + m_item1Name);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()");
         }
- 
+
         [Test]
         public void TestLoadIarPathWithEscapedChars()
         {
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userLastName = "Stirrup";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
             UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
-            
+
             // Create asset
             SceneObjectGroup object1;
             SceneObjectPart part1;
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.Name = itemName;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             scene.AddInventoryItem(item1);
@@ -189,16 +189,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
                     scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 //            Assert.That(
-//                foundItem1.CreatorId, Is.EqualTo(userUuid), 
+//                foundItem1.CreatorId, Is.EqualTo(userUuid),
 //                "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
-                foundItem1.Name, Is.EqualTo(itemName), 
+                foundItem1.Name, Is.EqualTo(itemName),
                 "Loaded item name doesn't match saved name");
         }
-        
+
         /// <summary>
         /// Test replication of an archive path to the user's inventory.
         /// </summary>
@@ -207,21 +207,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
             HashSet<InventoryNodeBase> nodesLoaded = new HashSet<InventoryNodeBase>();
-            
+
             string folder1Name = "1";
             string folder2aName = "2a";
             string folder2bName = "2b";
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
             string folder2aArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2aName, UUID.Random());
             string folder2bArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2bName, UUID.Random());
-            
+
             string iarPath1 = string.Join("", new string[] { folder1ArchiveName, folder2aArchiveName });
             string iarPath2 = string.Join("", new string[] { folder1ArchiveName, folder2bArchiveName });
 
@@ -229,42 +229,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 // Test replication of path1
                 new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
-                        iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                        iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                         foldersCreated, nodesLoaded);
-    
+
                 List<InventoryFolderBase> folder1Candidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
                 Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-                
+
                 InventoryFolderBase folder1 = folder1Candidates[0];
-                List<InventoryFolderBase> folder2aCandidates 
+                List<InventoryFolderBase> folder2aCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2aName);
                 Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
             }
-            
+
             {
                 // Test replication of path2
                 new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
-                        iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                        iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                         foldersCreated, nodesLoaded);
-    
+
                 List<InventoryFolderBase> folder1Candidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
                 Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-                
-                InventoryFolderBase folder1 = folder1Candidates[0]; 
-                
-                List<InventoryFolderBase> folder2aCandidates 
+
+                InventoryFolderBase folder1 = folder1Candidates[0];
+
+                List<InventoryFolderBase> folder2aCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2aName);
                 Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
-                
-                List<InventoryFolderBase> folder2bCandidates 
+
+                List<InventoryFolderBase> folder2bCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1, folder2bName);
                 Assert.That(folder2bCandidates.Count, Is.EqualTo(1));
             }
         }
-        
+
         /// <summary>
         /// Test replication of a partly existing archive path to the user's inventory.  This should create
         /// a duplicate path without the merge option.
@@ -274,31 +274,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             string folder1ExistingName = "a";
             string folder2Name = "b";
-            
-            InventoryFolderBase folder1 
+
+            InventoryFolderBase folder1
                 = UserInventoryHelpers.CreateInventoryFolder(
                     scene.InventoryService, ua1.PrincipalID, folder1ExistingName, false);
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-            
+
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
             new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                 .ReplicateArchivePathToUserInventory(
-                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
 
-            List<InventoryFolderBase> folder1PostCandidates 
+            List<InventoryFolderBase> folder1PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
             Assert.That(folder1PostCandidates.Count, Is.EqualTo(2));
-            
+
             // FIXME: Temporarily, we're going to do something messy to make sure we pick up the created folder.
             InventoryFolderBase folder1Post = null;
             foreach (InventoryFolderBase folder in folder1PostCandidates)
@@ -311,11 +311,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             }
 //            Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
 
-            List<InventoryFolderBase> folder2PostCandidates 
+            List<InventoryFolderBase> folder2PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1Post, "b");
             Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
         }
-        
+
         /// <summary>
         /// Test replication of a partly existing archive path to the user's inventory.  This should create
         /// a merged path.
@@ -325,33 +325,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
-            
+
             string folder1ExistingName = "a";
             string folder2Name = "b";
-            
-            InventoryFolderBase folder1 
+
+            InventoryFolderBase folder1
                 = UserInventoryHelpers.CreateInventoryFolder(
                     scene.InventoryService, ua1.PrincipalID, folder1ExistingName, false);
-            
+
             string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-            
+
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
             new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true)
                 .ReplicateArchivePathToUserInventory(
-                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
 
-            List<InventoryFolderBase> folder1PostCandidates 
+            List<InventoryFolderBase> folder1PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
             Assert.That(folder1PostCandidates.Count, Is.EqualTo(1));
             Assert.That(folder1PostCandidates[0].ID, Is.EqualTo(folder1.ID));
 
-            List<InventoryFolderBase> folder2PostCandidates 
+            List<InventoryFolderBase> folder2PostCandidates
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, folder1PostCandidates[0], "b");
             Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
index 57b4f80..d0bdc91 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
     [TestFixture]
     public class InventoryArchiveLoadTests : InventoryArchiveTestCase
-    {               
+    {
         protected TestScene m_scene;
         protected InventoryArchiverModule m_archiverModule;
 
@@ -55,12 +55,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public override void SetUp()
         {
             base.SetUp();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
+            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
         }
 
         [Test]
@@ -68,35 +68,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
-            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
-            
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);
+
             InventoryItemBase coaItem
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
-            
-            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");            
-            
+
+            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");
+
             string assetXml = AssetHelpers.ReadAssetAsString(m_scene.AssetService, coaItem.AssetID);
-            
-            CoalescedSceneObjects coa;            
+
+            CoalescedSceneObjects coa;
             bool readResult = CoalescedSceneObjectsSerializer.TryFromXml(assetXml, out coa);
-            
+
             Assert.That(readResult, Is.True);
             Assert.That(coa.Count, Is.EqualTo(2));
-            
+
             List<SceneObjectGroup> coaObjects = coa.Objects;
             Assert.That(coaObjects[0].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000120")));
             Assert.That(coaObjects[0].AbsolutePosition, Is.EqualTo(new Vector3(15, 30, 45)));
-            
+
             Assert.That(coaObjects[1].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000140")));
-            Assert.That(coaObjects[1].AbsolutePosition, Is.EqualTo(new Vector3(25, 50, 75)));            
-        }   
+            Assert.That(coaObjects[1].AbsolutePosition, Is.EqualTo(new Vector3(25, 50, 75)));
+        }
 
         /// <summary>
         /// Test case where a creator account exists for the creator UUID embedded in item metadata and serialized
         /// objects.
-        /// </summary>        
+        /// </summary>
         [Test]
         public void TestLoadIarCreatorAccountPresent()
         {
@@ -105,26 +105,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
 
-            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);            
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_item1Name);
 
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaLL1.PrincipalID.ToString()), 
-                "Loaded item non-uuid creator doesn't match original");            
+                foundItem1.CreatorId, Is.EqualTo(m_uaLL1.PrincipalID.ToString()),
+                "Loaded item non-uuid creator doesn't match original");
             Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL1.PrincipalID), 
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL1.PrincipalID),
                 "Loaded item uuid creator doesn't match original");
             Assert.That(foundItem1.Owner, Is.EqualTo(m_uaLL1.PrincipalID),
                 "Loaded item owner doesn't match inventory reciever");
-            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+
+            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
             string xmlData = Utils.BytesToString(asset1.Data);
             SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));            
+
+            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));
         }
-        
+
 //        /// <summary>
 //        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
 //        /// an account exists with the same name as the creator, though not the same id.
@@ -137,24 +137,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
-//            
-//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+//
+//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
 //            InventoryItemBase foundItem1
 //                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
 //
 //            Assert.That(
-//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
-//                "Loaded item non-uuid creator doesn't match original");            
+//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()),
+//                "Loaded item non-uuid creator doesn't match original");
 //            Assert.That(
-//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
+//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID),
 //                "Loaded item uuid creator doesn't match original");
 //            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
 //                "Loaded item owner doesn't match inventory reciever");
-//            
-//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+//
+//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
 //            string xmlData = Utils.BytesToString(asset1.Data);
 //            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-//            
+//
 //            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
 //        }
 
@@ -167,26 +167,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");
             m_archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
-            
+
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()), 
+                foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()),
                 "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID), 
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID),
                 "Loaded item uuid creator doesn't match that of the loading user");
-            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+
+            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
             string xmlData = Utils.BytesToString(asset1.Data);
             SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));            
+
+            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index 7265405..bd112b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -50,19 +50,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     {
         protected TestScene m_scene;
         protected InventoryArchiverModule m_archiverModule;
-            
+
         [SetUp]
         public override void SetUp()
         {
             base.SetUp();
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
+            SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
         }
-        
+
         /// <summary>
         /// Test that the IAR has the required files in the right order.
         /// </summary>
@@ -73,20 +73,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public void TestOrder()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();            
-            
+//            log4net.Config.XmlConfigurator.Configure();
+
             MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes);
-            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);            
+            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
-            
+
             InventoryArchiveReadRequest iarr
                 = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false);
             iarr.LoadControlFile(filePath, data);
-            
+
             Assert.That(iarr.ControlFileLoaded, Is.True);
         }
 
@@ -119,22 +119,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            InventoryArchiveUtils.
             bool gotObjectsFolder = false;
 
-            string objectsFolderName 
+            string objectsFolderName
                 = string.Format(
-                    "{0}{1}", 
-                    ArchiveConstants.INVENTORY_PATH, 
+                    "{0}{1}",
+                    ArchiveConstants.INVENTORY_PATH,
                     InventoryArchiveWriteRequest.CreateArchiveFolderName(
                         UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, userId, "Objects")));
 
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
 //                Console.WriteLine("Got {0}", filePath);
 
                 // Lazily, we only bother to look for the system objects folder created when we call CreateUserWithInventory()
-                // XXX: But really we need to stop all that stuff being created in tests or check for such folders 
+                // XXX: But really we need to stop all that stuff being created in tests or check for such folders
                 // more thoroughly
                 if (filePath == objectsFolderName)
                     gotObjectsFolder = true;
@@ -157,19 +157,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
 
             // Create base folder
-            InventoryFolderBase f1 
+            InventoryFolderBase f1
                 = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1", true);
-            
+
             // Create item1
-            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5);         
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5);
             InventoryItemBase i1 = UserInventoryHelpers.AddInventoryItem(m_scene, so1, 0x50, 0x60, "f1");
 
             // Create embedded folder
-            InventoryFolderBase f1_1 
+            InventoryFolderBase f1_1
                 = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1/f1.1", true);
 
             // Create embedded item
-            SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6);         
+            SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6);
             InventoryItemBase i2 = UserInventoryHelpers.AddInventoryItem(m_scene, so1_1, 0x500, 0x600, "f1/f1.1");
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -188,18 +188,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            InventoryArchiveUtils.
             bool gotf1 = false, gotf1_1 = false, gotso1 = false, gotso2 = false;
 
-            string f1FileName 
+            string f1FileName
                 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1));
-            string f1_1FileName 
+            string f1_1FileName
                 = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1_1));
-            string so1FileName 
+            string so1FileName
                 = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i1));
             string so2FileName
                 = string.Format("{0}{1}", f1_1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i2));
 
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
 //                Console.WriteLine("Got {0}", filePath);
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             // TODO: Test presence of more files and contents of files.
         }
-        
+
         /// <summary>
         /// Test saving a single inventory item to an IAR
         /// (subject to change since there is no fixed format yet).
@@ -239,10 +239,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userPassword = "troll";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
             UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
-            
+
             // Create asset
             UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             m_scene.AddInventoryItem(item1);
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TarArchiveReader.TarEntryType tarEntryType;
 
 //            Console.WriteLine("Reading archive");
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 Console.WriteLine("Got {0}", filePath);
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //                {
 //                    gotControlFile = true;
 //                }
-                
+
                 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
                 {
 //                    string fileName = filePath.Remove(0, "Objects/".Length);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 519c697..0b65829 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -49,35 +49,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     public class InventoryArchiveTestCase : OpenSimTestCase
     {
         protected ManualResetEvent mre = new ManualResetEvent(false);
-        
+
         /// <summary>
         /// A raw array of bytes that we'll use to create an IAR memory stream suitable for isolated use in each test.
         /// </summary>
         protected byte[] m_iarStreamBytes;
-                
+
         /// <summary>
         /// Stream of data representing a common IAR for load tests.
         /// </summary>
         protected MemoryStream m_iarStream;
-        
-        protected UserAccount m_uaMT 
-            = new UserAccount { 
+
+        protected UserAccount m_uaMT
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"),
                 FirstName = "Mr",
                 LastName = "Tiddles" };
-        
+
         protected UserAccount m_uaLL1
-            = new UserAccount { 
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"),
                 FirstName = "Lord",
-                LastName = "Lucan" }; 
-        
+                LastName = "Lucan" };
+
         protected UserAccount m_uaLL2
-            = new UserAccount { 
+            = new UserAccount {
                 PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000777"),
                 FirstName = "Lord",
-                LastName = "Lucan" };       
-        
+                LastName = "Lucan" };
+
         protected string m_item1Name = "Ray Gun Item";
         protected string m_coaItemName = "Coalesced Item";
 
@@ -105,72 +105,72 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             base.SetUp();
             m_iarStream = new MemoryStream(m_iarStreamBytes);
         }
-        
+
         protected void ConstructDefaultIarBytesForTestLoad()
         {
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
             Scene scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(scene, archiverModule);            
-            
+            SceneHelpers.SetupSceneModules(scene, archiverModule);
+
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
 
             MemoryStream archiveWriteStream = new MemoryStream();
-            
+
             // Create scene object asset
             UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
-            scene.AssetService.Store(asset1);            
+            scene.AssetService.Store(asset1);
 
             // Create scene object item
             InventoryItemBase item1 = new InventoryItemBase();
             item1.Name = m_item1Name;
-            item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");            
+            item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");
             item1.AssetID = asset1.FullID;
             item1.GroupID = UUID.Random();
             item1.CreatorId = m_uaLL1.PrincipalID.ToString();
             item1.Owner = m_uaLL1.PrincipalID;
-            item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
+            item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
             scene.AddInventoryItem(item1);
-            
+
             // Create coalesced objects asset
             SceneObjectGroup cobj1 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object1", 0x120);
             cobj1.AbsolutePosition = new Vector3(15, 30, 45);
-            
+
             SceneObjectGroup cobj2 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object2", 0x140);
-            cobj2.AbsolutePosition = new Vector3(25, 50, 75);               
-            
+            cobj2.AbsolutePosition = new Vector3(25, 50, 75);
+
             CoalescedSceneObjects coa = new CoalescedSceneObjects(m_uaLL1.PrincipalID, cobj1, cobj2);
-            
+
             AssetBase coaAsset = AssetHelpers.CreateAsset(0x160, coa);
-            scene.AssetService.Store(coaAsset);            
-            
+            scene.AssetService.Store(coaAsset);
+
             // Create coalesced objects inventory item
             InventoryItemBase coaItem = new InventoryItemBase();
             coaItem.Name = m_coaItemName;
-            coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");            
+            coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");
             coaItem.AssetID = coaAsset.FullID;
             coaItem.GroupID = UUID.Random();
             coaItem.CreatorId = m_uaLL1.PrincipalID.ToString();
             coaItem.Owner = m_uaLL1.PrincipalID;
-            coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
-            scene.AddInventoryItem(coaItem);            
-            
+            coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
+            scene.AddInventoryItem(coaItem);
+
             archiverModule.ArchiveInventory(
-                UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);            
-            
+                UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);
+
             m_iarStreamBytes = archiveWriteStream.ToArray();
         }
-        
+
         protected void SaveCompleted(
-            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
             Exception reportedException, int SaveCount, int FilterCount)
         {
             mre.Set();
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 46da5a9..5d7f25c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -149,10 +149,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
 //            m_log.DebugFormat(
-//                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", 
+//                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}",
 //                (InstantMessageDialog)im.dialog, client.Name,
 //                im.fromAgentID, im.fromAgentName, im.toAgentID);
-          
+
             Scene scene = FindClientScene(client.AgentId);
 
             if (scene == null) // Something seriously wrong here.
@@ -164,31 +164,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
                 ScenePresence user = scene.GetScenePresence(recipientID);
                 UUID copyID;
 
                 // First byte is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
-                    
+
                     m_log.DebugFormat(
                         "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory",
                         folderID, new UUID(im.toAgentID));
-                    
+
                     InventoryFolderBase folderCopy
                         = scene.GiveInventoryFolder(client, recipientID, client.AgentId, folderID, UUID.Zero);
-                    
+
                     if (folderCopy == null)
                     {
                         client.SendAgentAlertMessage("Can't find folder to give. Nothing given.", false);
                         return;
                     }
-                                                           
+
                     // The outgoing binary bucket should contain only the byte which signals an asset folder is
                     // being copied and the following bytes for the copied folder's UUID
                     copyID = folderCopy.ID;
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.binaryBucket = new byte[1 + copyIDBytes.Length];
                     im.binaryBucket[0] = (byte)AssetType.Folder;
                     Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
-                    
+
                     if (user != null)
                         user.ControllingClient.SendBulkUpdateInventory(folderCopy);
 
@@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         client.SendAgentAlertMessage(message, false);
                         return;
                     }
-                    
+
                     copyID = itemCopy.ID;
                     Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);
-                    
+
                     if (user != null)
                         user.ControllingClient.SendBulkUpdateInventory(itemCopy);
 
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 else
                 {
                     if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) 
+                        m_TransferModule.SendInstantMessage(im, delegate(bool success)
                         {
                             if (!success)
                                 client.SendAlertMessage("User not online. Inventory has been saved");
@@ -308,8 +308,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             }
 
             // XXX: This code was placed here to try and accomodate RLV which moves given folders named #RLV/~<name>
-            // to the requested folder, which in this case is #RLV.  However, it is the viewer that appears to be 
-            // response from renaming the #RLV/~example folder to ~example.  For some reason this is not yet 
+            // to the requested folder, which in this case is #RLV.  However, it is the viewer that appears to be
+            // response from renaming the #RLV/~example folder to ~example.  For some reason this is not yet
             // happening, possibly because we are not sending the correct inventory update messages with the correct
             // transaction IDs
             else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID);
                 InventoryFolderBase folder = null;
                 UUID? previousParentFolderID = null;
-                
+
                 if (item != null && trashFolder != null)
                 {
                     previousParentFolderID = item.Folder;
@@ -404,18 +404,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         client.SendBulkUpdateInventory(folder);
                     }
                 }
-                
+
                 if ((null == item && null == folder) | null == trashFolder)
                 {
                     string reason = String.Empty;
-                    
+
                     if (trashFolder == null)
                         reason += " Trash folder not found.";
                     if (item == null)
                         reason += " Item not found.";
                     if (folder == null)
                         reason += " Folder not found.";
-                    
+
                     client.SendAgentAlertMessage("Unable to delete "+
                             "received inventory" + reason, false);
                 }
@@ -471,12 +471,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             {
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
 
                 // First byte is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
@@ -505,12 +505,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             {
                 if (im.binaryBucket.Length < 1) // Invalid
                     return;
-            
+
                 UUID recipientID = new UUID(im.toAgentID);
 
                 // Bucket is the asset type
                 AssetType assetType = (AssetType)im.binaryBucket[0];
-                
+
                 if (AssetType.Folder == assetType)
                 {
                     UUID folderID = new UUID(im.imSessionID);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
index 7ddc396..82ed091 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -44,9 +44,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
 {
     [TestFixture]
     public class InventoryTransferModuleTests : OpenSimTestCase
-    {    
-        protected TestScene m_scene;       
-            
+    {
+        protected TestScene m_scene;
+
         [SetUp]
         public override void SetUp()
         {
@@ -56,9 +56,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             config.AddConfig("Messaging");
             config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
 
-            m_scene = new SceneHelpers().SetupScene();            
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, new InventoryTransferModule());
-        } 
+        }
 
         [Test]
         public void TestAcceptGivenItem()
@@ -69,9 +69,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID itemId = TestHelpers.ParseTail(0x100);
             UUID assetId = TestHelpers.ParseTail(0x200);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the object to test give
-            InventoryItemBase originalItem 
+            InventoryItemBase originalItem
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
 
@@ -89,35 +89,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = itemId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
-            GridInstantMessage acceptIm 
+            // These details might not all be correct.
+            GridInstantMessage acceptIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryAccepted,
                     false,
-                    "inventory accepted msg", 
+                    "inventory accepted msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Objects/givenObj");
 
             Assert.That(receivedItem, Is.Not.Null);
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterDelete, Is.Not.Null);
 
             // TODO: Test scenario where giver deletes their item first.
-        }       
+        }
 
         /// <summary>
         /// Test user rejection of a given item.
@@ -165,9 +165,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID itemId = TestHelpers.ParseTail(0x100);
             UUID assetId = TestHelpers.ParseTail(0x200);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the object to test give
-            InventoryItemBase originalItem 
+            InventoryItemBase originalItem
                 = UserInventoryHelpers.CreateInventoryItem(
                     m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
 
@@ -188,36 +188,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = itemId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
+            // These details might not all be correct.
             // Session ID is now the created item ID (!)
-            GridInstantMessage rejectIm 
+            GridInstantMessage rejectIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryDeclined,
                     false,
-                    "inventory declined msg", 
+                    "inventory declined msg",
                     new UUID(receivedIm.imSessionID),
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryItemBase receivedItem 
+            InventoryItemBase receivedItem
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj");
 
             InventoryFolderBase trashFolder
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
 
             Assert.That(originalItemAfterDelete, Is.Not.Null);
-        }  
+        }
 
         [Test]
         public void TestAcceptGivenFolder()
@@ -261,9 +261,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID initialSessionId = TestHelpers.ParseTail(0x10);
             UUID folderId = TestHelpers.ParseTail(0x100);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
-            InventoryFolderBase originalFolder 
+            InventoryFolderBase originalFolder
                 = UserInventoryHelpers.CreateInventoryFolder(
                     m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
 
@@ -281,35 +281,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = folderId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
-            GridInstantMessage acceptIm 
+            // These details might not all be correct.
+            GridInstantMessage acceptIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryAccepted,
                     false,
-                    "inventory accepted msg", 
+                    "inventory accepted msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
 
             // Test for item successfully making it into the receiver's inventory
-            InventoryFolderBase receivedFolder 
+            InventoryFolderBase receivedFolder
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "f1");
 
             Assert.That(receivedFolder, Is.Not.Null);
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterDelete, Is.Not.Null);
 
             // TODO: Test scenario where giver deletes their item first.
-        }       
+        }
 
         /// <summary>
         /// Test user rejection of a given item.
@@ -357,9 +357,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             UUID initialSessionId = TestHelpers.ParseTail(0x10);
             UUID folderId = TestHelpers.ParseTail(0x100);
 
-            UserAccount ua1 
+            UserAccount ua1
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
-            UserAccount ua2 
+            UserAccount ua2
                 = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
 
             ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
 
             // Create the folder to test give
-            InventoryFolderBase originalFolder 
+            InventoryFolderBase originalFolder
                 = UserInventoryHelpers.CreateInventoryFolder(
                     m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
 
@@ -381,36 +381,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             byte[] itemIdBytes = folderId.GetBytes();
             Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
 
-            GridInstantMessage giveIm 
+            GridInstantMessage giveIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    giverSp.UUID, 
-                    giverSp.Name, 
-                    receiverSp.UUID, 
+                    m_scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
                     (byte)InstantMessageDialog.InventoryOffered,
                     false,
-                    "inventory offered msg", 
+                    "inventory offered msg",
                     initialSessionId,
-                    false, 
+                    false,
                     Vector3.Zero,
                     giveImBinaryBucket,
                     true);
 
             giverClient.HandleImprovedInstantMessage(giveIm);
 
-            // These details might not all be correct.  
+            // These details might not all be correct.
             // Session ID is now the created item ID (!)
-            GridInstantMessage rejectIm 
+            GridInstantMessage rejectIm
                 = new GridInstantMessage(
-                    m_scene, 
-                    receiverSp.UUID, 
-                    receiverSp.Name, 
-                    giverSp.UUID, 
-                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    m_scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryDeclined,
                     false,
-                    "inventory declined msg", 
+                    "inventory declined msg",
                     new UUID(receivedIm.imSessionID),
-                    false, 
+                    false,
                     Vector3.Zero,
                     null,
                     true);
@@ -426,7 +426,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
 
             // Test for folder successfully making it into the receiver's inventory
-            InventoryFolderBase receivedFolder 
+            InventoryFolderBase receivedFolder
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1");
 
             InventoryFolderBase trashFolder
@@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
 
             Assert.That(originalFolderAfterDelete, Is.Not.Null);
-        }  
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 24286a4..10781e9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                 {
                     m_Enabled = true;
 
-                    m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 
+                    m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                         new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty);
                     // Legacy. Remove soon!
                     m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         void OnIncomingInstantMessage(GridInstantMessage im)
         {
-            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport 
+            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport
                 || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport)
             {
                 UUID sessionID = new UUID(im.imSessionID);
@@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
             m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message);
             m_PendingLures.Add(sessionID, m, 7200); // 2 hours
-                    
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index 0b1dbc7..1e1caca 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
         {
             if (!m_Enabled)
                 return;
-            
+
             lock (m_Scenes)
             {
                 if (!m_Scenes.Contains(scene))
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index df5265c..138c0f7 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// The configuration
         /// </value>
-        public IConfigSource Config 
+        public IConfigSource Config
         {
             get;
             set;
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// The profile server URI.
         /// </value>
-        public string ProfileServerUri 
+        public string ProfileServerUri
         {
             get;
             set;
@@ -120,13 +120,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <value>
         /// <c>true</c> if enabled; otherwise, <c>false</c>.
         /// </value>
-        public bool Enabled 
+        public bool Enabled
         {
             get;
             set;
         }
 
-        public string MyGatekeeper 
+        public string MyGatekeeper
         {
             get; private set;
         }
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// <summary>
         ///  This is called to initialize the region module. For shared modules, this is called exactly once, after
         /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after
-        /// the instace for the region has been created. 
+        /// the instace for the region has been created.
         /// </summary>
         /// <param name='source'>
         /// Source.
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 Enabled = false;
                 return;
             }
-            
+
             m_allowUserProfileWebURLs = profileConfig.GetBoolean("AllowUserProfileWebURLs", m_allowUserProfileWebURLs);
 
             m_log.Debug("[PROFILES]: Full Profiles Enabled");
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         ///  This will be called once for every scene loaded. In a shared module this will be multiple times in one
         /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion
         /// has been called in all modules for that scene, providing an opportunity to request another module's
-        /// interface, or hook an event from another module. 
+        /// interface, or hook an event from another module.
         /// </summary>
         /// <param name='scene'>
         /// Scene.
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// module has registered the interface by then, this module will be activated, else it will remain inactive,
         /// letting the other module take over. This should return non-null ONLY in modules that are intended to be
         /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party
-        /// provided modules. 
+        /// provided modules.
         /// </summary>
         /// <value>
         /// The replaceable interface.
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         }
 
         /// <value>
-        ///  The name of the module 
+        ///  The name of the module
         /// </value>
         /// <summary>
         /// Gets the module name.
@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         }
 
         public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient)
-        {    
+        {
             UUID target = remoteClient.AgentId;
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
@@ -459,7 +459,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             lock (m_classifiedCache)
             {
                 if (m_classifiedCache.ContainsKey(queryClassifiedID))
-                {   
+                {
                     target = m_classifiedCache[queryClassifiedID];
 
                     m_classifiedInterest[queryClassifiedID] --;
@@ -870,7 +870,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             string theirGatekeeperURI;
             GetUserGatekeeperURI(targetID, out theirGatekeeperURI);
-                
+
             object Pick = (object)pick;
             if (!rpc.JsonRpcRequest (ref Pick, "pickinforequest", serverURI, UUID.Random ().ToString ())) {
                 remoteClient.SendAgentAlertMessage (
@@ -880,11 +880,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             pick = (UserProfilePick)Pick;
             if(foreign)
                 cacheForeignImage(targetID, pick.SnapshotId);
-            
+
             Vector3 globalPos = new Vector3(Vector3.Zero);
             Vector3.TryParse(pick.GlobalPos, out globalPos);
-            
-            if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper) 
+
+            if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper)
             {
                 // Setup the illusion
                 string region = string.Format("{0} {1}",pick.Gatekeeper,pick.SimName);
@@ -896,7 +896,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 }
                 else
                 {
-                    // we have a proxy on map 
+                    // we have a proxy on map
                     ulong oriHandle;
                     uint oriX;
                     uint oriY;
@@ -909,7 +909,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     }
                     else
                     {
-                        // this is a fail on large regions                  
+                        // this is a fail on large regions
                         uint gtmp = (uint)globalPos.X >> 8;
                         globalPos.X -= (gtmp << 8);
 
@@ -975,7 +975,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         /// Enabled.
         /// </param>
         public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled)
-        {        
+        {
             m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
 
             UserProfilePick pick = new UserProfilePick();
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             else
             {
                 m_log.WarnFormat(
-                    "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}", 
+                    "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}",
                     avaPos.X, avaPos.Y, p.Scene.Name);
             }
 
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
                 return;
             }
-            note = (UserProfileNotes) Note;               
+            note = (UserProfileNotes) Note;
             remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
         }
 
@@ -1225,10 +1225,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             {
                 m_log.InfoFormat("[PROFILES]: UserPreferences update error");
                 remoteClient.SendAgentAlertMessage("Error updating preferences", false);
-                return;   
+                return;
             }
         }
-        
+
         /// <summary>
         /// Users the preferences request.
         /// </summary>
@@ -1256,7 +1256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             pref = (UserPreferences) Pref;
 
             remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
-       
+
         }
         #endregion User Preferences
 
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             {
                 props.AboutText ="Profile not available at this time. User may still be unknown to this grid";
             }
-            
+
             if(!m_allowUserProfileWebURLs)
                 props.WebUrl ="";
 
@@ -1568,7 +1568,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     {
                         m_log.Debug(
                             string.Format(
-                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed", 
+                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed",
                                 properties.UserId, serverURI),
                             e);
 
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     return false;
                 }
             }
-                      
+
             properties = (UserProfileProperties)Prop;
             if(foreign)
             {
@@ -1704,7 +1704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         {
             bool local;
             local = UserManagementModule.IsLocalGridUser(userID);
-            
+
             if (!local)
             {
                 serverURI = UserManagementModule.GetUserServerURL(userID, "GatekeeperURI");
@@ -1761,13 +1761,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             string imageIDstr = imageID.ToString();
 
-            
+
             if(m_assetCache != null && m_assetCache.Check(imageIDstr))
                 return;
 
             if(Scene.AssetService.Get(imageIDstr) != null)
                 return;
-                    
+
             Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, imageIDstr));
         }
 
@@ -1876,7 +1876,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             if (mret.ContainsKey("error"))
                 return false;
-            
+
             // get params...
             OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
             return true;
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 386694a..292099d 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -47,23 +47,23 @@ namespace OpenSim.Region.CoreModules.Framework
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")]
     public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_showCapsCommandFormat = "   {0,-38} {1,-60}\n";
-        
+
         protected Scene m_scene;
-        
+
         /// <summary>
         /// Each agent has its own capabilities handler.
         /// </summary>
         protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>();
-        
+
         protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>();
 
-        protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds 
+        protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds
             = new Dictionary<UUID, Dictionary<ulong, string>>();
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -101,16 +101,16 @@ namespace OpenSim.Region.CoreModules.Framework
         {
             m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this);
         }
-        
-        public void PostInitialise() 
+
+        public void PostInitialise()
         {
         }
 
         public void Close() {}
 
-        public string Name 
-        { 
-            get { return "Capabilities Module"; } 
+        public string Name
+        {
+            get { return "Capabilities Module"; }
         }
 
         public Type ReplaceableInterface
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework
                         // new object created below
                         oldCaps.DeregisterHandlers();
 
-                        // Better safe ... should not be needed but also 
+                        // Better safe ... should not be needed but also
                         // no big deal
                         m_capsObjects.Remove(circuitCode);
                     }
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 }
             }
         }
-        
+
         public Caps GetCapsForUser(uint circuitCode)
         {
             lock (m_capsObjects)
@@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Framework
                     return m_capsObjects[circuitCode];
                 }
             }
-            
+
             return null;
         }
-        
+
         public void ActivateCaps(uint circuitCode)
         {
             lock (m_capsObjects)
@@ -246,10 +246,10 @@ namespace OpenSim.Region.CoreModules.Framework
                 m_capsPaths[agent.AgentID] = agent.CapsPath;
 
             lock (m_childrenSeeds)
-                m_childrenSeeds[agent.AgentID] 
+                m_childrenSeeds[agent.AgentID]
                     = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
         }
-        
+
         public string GetCapsPath(UUID agentId)
         {
             lock (m_capsPaths)
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
             return null;
         }
-        
+
         public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
         {
             Dictionary<ulong, string> seeds = null;
@@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.Framework
                     {
                         receivedStats[sp.Name] = reqHandler.RequestsReceived;
                         handledStats[sp.Name] = reqHandler.RequestsHandled;
-                    }        
-                    else 
+                    }
+                    else
                     {
                         PollServiceEventArgs pollHandler = null;
                         if (caps.TryGetPollHandler(capName, out pollHandler))
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework
                     Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
 
                     if (caps == null)
-                        return;            
+                        return;
 
                     foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values)
                     {
@@ -490,7 +490,7 @@ namespace OpenSim.Region.CoreModules.Framework
                     }
                 }
             );
-                    
+
             foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value))
                 cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]);
 
@@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled));
 
             foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived))
-                cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);            
+                cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);
 
             sb.Append(cdt.ToString());
             */
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework
                         totalRequestsReceived += handler.RequestsReceived;
                         totalRequestsHandled += handler.RequestsHandled;
                     }
-                    
+
                     cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled);
                 }
             );
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
index 0c632b1..d652f43 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
@@ -53,12 +53,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
 
         protected Scene m_scene;
         protected IDialogModule m_dialogMod;
-        
-        public string Name { get { return "DAExample Module"; } }        
-        public Type ReplaceableInterface { get { return null; } }        
+
+        public string Name { get { return "DAExample Module"; } }
+        public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             if (ENABLED)
@@ -70,22 +70,22 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
                 m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name);
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             if (ENABLED)
             {
                 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
             }
         }
-        
+
         public void RegionLoaded(Scene scene) {}
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
-        
+
         protected bool OnSceneGroupMove(UUID groupId, Vector3 delta)
         {
             OSDMap attrs = null;
@@ -96,28 +96,28 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
 
             if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs))
                 attrs = new OSDMap();
-            
+
             OSDInteger newValue;
 
             // We have to lock on the entire dynamic attributes map to avoid race conditions with serialization code.
-            lock (sop.DynAttrs)            
+            lock (sop.DynAttrs)
             {
                 if (!attrs.ContainsKey("moves"))
                     newValue = new OSDInteger(1);
                 else
                     newValue = new OSDInteger(attrs["moves"].AsInteger() + 1);
-                        
+
                 attrs["moves"] = newValue;
 
                 sop.DynAttrs.SetStore(Namespace, StoreName, attrs);
             }
 
             sop.ParentGroup.HasGroupChanged = true;
-    
+
             string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue);
             m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg);
             m_dialogMod.SendGeneralAlert(msg);
-            
+
             return true;
         }
     }
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
index 166a994..3364cbc 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
         private Scene m_scene;
         private IDialogModule m_dialogMod;
 
-        public string Name { get { return "DO"; } }        
-        public Type ReplaceableInterface { get { return null; } }        
+        public string Name { get { return "DO"; } }
+        public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             if (ENABLED)
@@ -80,18 +80,18 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
                 m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>();
             }
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             if (ENABLED)
             {
                 m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
             }
         }
-        
+
         public void RegionLoaded(Scene scene) {}
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
 
             rootPart.DynObjs.Add(DAExampleModule.Namespace, Name, new MyObject(movesSoFar));
         }
-        
+
         private bool OnSceneGroupMove(UUID groupId, Vector3 delta)
         {
             SceneObjectGroup so = m_scene.GetSceneObjectGroup(groupId);
@@ -129,11 +129,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
             if (rawObj != null)
             {
                 MyObject myObj = (MyObject)rawObj;
-               
+
                 m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", so.Name, so.UUID, ++myObj.Moves));
             }
-            
+
             return true;
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 58d6cf2..6b1eb54 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -72,9 +72,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// If true then we ask the viewer to disable teleport cancellation and ignore teleport requests.
         /// </summary>
         /// <remarks>
-        /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a 
+        /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a
         /// situation where avatars can be come 'stuck' due to a failed teleport cancellation.  Unfortunately, the
-        /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport 
+        /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport
         /// cancellation consistently suceed.
         /// </remarks>
         public bool DisableInterRegionTeleportCancellation { get; set; }
@@ -221,12 +221,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             IConfig transferConfig = source.Configs["EntityTransfer"];
             if (transferConfig != null)
             {
-                DisableInterRegionTeleportCancellation 
+                DisableInterRegionTeleportCancellation
                     = transferConfig.GetBoolean("DisableInterRegionTeleportCancellation", false);
 
                 WaitForAgentArrivedAtDestination
                     = transferConfig.GetBoolean("wait_for_callback", WaitForAgentArrivedAtDestinationDefault);
-                
+
                 MaxTransferDistance = transferConfig.GetInt("max_distance", DefaultMaxTransferDistance);
             }
             else
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             Scene = scene;
 
-            m_interRegionTeleportAttempts = 
+            m_interRegionTeleportAttempts =
                 new Stat(
                     "InterRegionTeleportAttempts",
                     "Number of inter-region teleports attempted.",
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportAborts = 
+            m_interRegionTeleportAborts =
                 new Stat(
                     "InterRegionTeleportAborts",
                     "Number of inter-region teleports aborted due to client actions.",
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportCancels = 
+            m_interRegionTeleportCancels =
                 new Stat(
                     "InterRegionTeleportCancels",
                     "Number of inter-region teleports cancelled by the client.",
@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     null,
                     StatVerbosity.Debug);
 
-            m_interRegionTeleportFailures = 
+            m_interRegionTeleportFailures =
                 new Stat(
                     "InterRegionTeleportFailures",
                     "Number of inter-region teleports that failed due to server/client/network issues.",
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public virtual void Close() {}
 
-        public virtual void RemoveRegion(Scene scene) 
+        public virtual void RemoveRegion(Scene scene)
         {
             if (m_Enabled)
             {
@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", 
+                    "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout",
                     client.Name, Scene.Name);
             }
         }
@@ -672,7 +672,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.ControllingClient.SendTeleportFailed("Agent is already in transit.");
                 return;
             }
-            
+
             try
             {
                 DoTeleportInternal(sp, reg, finalDestination, position, lookAt, teleportFlags);
@@ -766,7 +766,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_interRegionTeleportAttempts.Value++;
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}", 
+                "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}",
                 sp.Scene.Name, finalDestination.RegionName, ctx.OutboundVersion, ctx.InboundVersion);
 
             // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
@@ -797,7 +797,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
             agentCircuit.startpos = position;
             agentCircuit.child = true;
-            
+
 //            agentCircuit.Appearance = sp.Appearance;
 //            agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false);
             agentCircuit.Appearance = new AvatarAppearance();
@@ -814,7 +814,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             IClientIPEndpoint ipepClient;
-       
+
             uint newRegionX, newRegionY, oldRegionX, oldRegionY;
             Util.RegionHandleToRegionLoc(destinationHandle, out newRegionX, out newRegionY);
             Util.RegionHandleToRegionLoc(sourceRegion.RegionHandle, out oldRegionX, out oldRegionY);
@@ -853,7 +853,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (ctx.OutboundVersion >= 0.2f)
                 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange , ctx, out reason);
             else
-                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason);           
+                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason);
         }
 
         private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
@@ -863,12 +863,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", 
+                "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}",
                 sp.Name, Scene.Name, finalDestination.RegionName);
 
             string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
-            // Let's create an agent there if one doesn't exist yet. 
+            // Let's create an agent there if one doesn't exist yet.
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
             if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout))
@@ -953,7 +953,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
 
-            // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to 
+            // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to
             // establish th econnection to the destination which makes it return true.
             if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
             {
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            // A common teleport failure occurs when we can send CreateAgent to the 
+            // A common teleport failure occurs when we can send CreateAgent to the
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
             // there's a further 10 second wait whilst we attempt to tell the destination to delete the agent in Fail().
@@ -1010,7 +1010,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
-            // where that neighbour simulator could otherwise request a child agent create on the source which then 
+            // where that neighbour simulator could otherwise request a child agent create on the source which then
             // closes our existing agent which is still signalled as root.
             sp.IsChildAgent = true;
 
@@ -1071,7 +1071,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentHasMovedAway(sp, logout);
 
             sp.HasMovedAway(!(OutSideViewRange || logout));
-            
+
 //            ulong sourceRegionHandle = sp.RegionHandle;
 
              // Now let's make it officially a child agent
@@ -1107,7 +1107,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);;
 
-            // Let's create an agent there if one doesn't exist yet. 
+            // Let's create an agent there if one doesn't exist yet.
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
             if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout))
@@ -1150,7 +1150,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
-            // where that neighbour simulator could otherwise request a child agent create on the source which then 
+            // where that neighbour simulator could otherwise request a child agent create on the source which then
             // closes our existing agent which is still signalled as root.
             //sp.IsChildAgent = true;
 
@@ -1166,7 +1166,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
-            // Let's send a full update of the agent. 
+            // Let's send a full update of the agent.
             AgentData agent = new AgentData();
             sp.CopyTo(agent,false);
             agent.Position = agentCircuit.startpos;
@@ -1207,7 +1207,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.IsInTransit = false;
                 return;
             }
-            
+
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
             // Need to signal neighbours whether child agents may need closing irrespective of whether this
@@ -1248,7 +1248,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //                Thread.Sleep(1000);
 
                 // OK, it got this agent. Let's close everything
-                // If we shouldn't close the agent due to some other region renewing the connection 
+                // If we shouldn't close the agent due to some other region renewing the connection
                 // then this will be handled in IncomingCloseAgent under lock conditions
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name);
@@ -1258,7 +1258,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 /*
             else
             {
-                // now we have a child agent in this region. 
+                // now we have a child agent in this region.
                 sp.Reset();
             }
  */
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </summary>
         /// <param name='sp'></param>
         /// <param name='logout'></param>
-        /// 
+        ///
         /// now just a HG hook
         protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
         {
@@ -1375,7 +1375,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         // HG Hook
         protected virtual bool NeedsClosing(GridRegion reg, bool OutViewRange)
-           
+
         {
             return OutViewRange;
         }
@@ -1399,11 +1399,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 remoteClient.SendTeleportFailed("The teleport destination could not be found.");
                 return;
             }
-            ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position, 
+            ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position,
                 Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
         }
 
-        #endregion 
+        #endregion
 
         #region Teleport Home
 
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     client.SendTeleportFailed("Your home region could not be found.");
                     return false;
                 }
-                
+
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
                     client.Name, regionInfo.RegionName, regionInfo.RegionCoordX, regionInfo.RegionCoordY);
 
@@ -1475,7 +1475,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             Scene ascene = agent.Scene;
             string homeURI = ascene.GetAgentHomeURI(agentID);
- 
+
 
             if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position,
                    agent.Scene.GetFormatsOffered(), ctx, out reason))
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         // Given a position relative to the current region and outside of it
         // find the new region that the point is actually in.
-        // returns 'null' if new region not found or if information 
+        // returns 'null' if new region not found or if information
         // and new position relative to it
         // now only works for crossings
 
@@ -1611,14 +1611,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Thread.Sleep(10000);
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}", 
+                "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",
                 agent.Name, regionX, regionY, position, initiatingScene.Name);
 
             agent.Scene.RequestTeleportLocation(
-                agent.ControllingClient, 
+                agent.ControllingClient,
                 Util.RegionGridLocToHandle(regionX, regionY),
-                position, 
-                agent.Lookat, 
+                position,
+                agent.Lookat,
                 (uint)Constants.TeleportFlags.ViaLocation);
 
             /*
@@ -1662,7 +1662,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             icon.EndInvoke(iar);
         }
 
- 
+
 
         /// <summary>
         /// This Closes child agents on neighbouring regions
@@ -1708,7 +1708,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             int ts = Util.EnvironmentTickCount();
             try
             {
-                AgentData cAgent = new AgentData(); 
+                AgentData cAgent = new AgentData();
                 agent.CopyTo(cAgent,true);
 
 //                agent.Appearance.WearableCacheItems = null;
@@ -1731,7 +1731,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
                     m_log.WarnFormat(
-                        "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.", 
+                        "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.",
                         neighbourRegion.RegionName, agent.Name);
 
                     ReInstantiateScripts(agent);
@@ -1827,7 +1827,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             return;
         }
-         
+
         private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
         {
             CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
@@ -2167,7 +2167,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return false;
                 }
             }
-            
+
             private void DoExpiration()
             {
                 List<ulong> m_toRemove = new List<ulong>();;
@@ -2179,7 +2179,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         if (kvp.Value < now)
                             m_toRemove.Add(kvp.Key);
                     }
- 
+
                     if (m_toRemove.Count > 0)
                     {
                         foreach (ulong u in m_toRemove)
@@ -2199,7 +2199,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             //    to find possible regions.
             return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize);
         }
- 
+
         // Given a world position, get the GridRegion info for
         //   the region containing that point.
         // for compatibility with old grids it does a scan to find large regions
@@ -2285,7 +2285,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (newAgent)
             {
                 // we may already had lost this sp
-                if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened 
+                if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
                    return;
 
                 Scene scene = sp.Scene;
@@ -2303,13 +2303,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (regionAccepted)
                 {
-                    // give  time for createAgent to finish, since it is async and does grid services access              
+                    // give  time for createAgent to finish, since it is async and does grid services access
                     Thread.Sleep(500);
 
                     if (m_eqModule != null)
                     {
                         #region IP Translation for NAT
-                        if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened 
+                        if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
                             return;
 
                         IClientIPEndpoint ipepClient;
@@ -2344,7 +2344,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         reg.RegionName, sp.Name, sp.UUID, reason);
                 }
             }
- 
+
         }
 
         /// <summary>
@@ -2353,7 +2353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="avatar"></param>
         /// <param name="pRegionLocX"></param>
         /// <param name="pRegionLocY"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected List<GridRegion> GetNeighbors(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
         {
             Scene pScene = avatar.Scene;
@@ -2588,7 +2588,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (Scene.RegionInfo.EstateSettings.IsBanned(so.OwnerID))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}", 
+                    "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}",
                     so.Name, so.UUID, Scene.Name, so.OwnerID);
 
                 return false;
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (!Scene.AddSceneObject(so))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ", 
+                    "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ",
                     so.Name, so.UUID, Scene.Name);
 
                 return false;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
index acfdaef..0a24555 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
                     else
                     {
-                        if (newState == AgentTransferState.Cancelling 
+                        if (newState == AgentTransferState.Cancelling
                             && (oldState == AgentTransferState.Preparing || oldState == AgentTransferState.Transferring))
                         {
                             transitionOkay = true;
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
 
                     if (!transitionOkay)
-                        failureMessage 
+                        failureMessage
                             = string.Format(
                                 "Agent with ID {0} is not allowed to move from old transit state {1} to new state {2} in {3}",
                                 id, oldState, newState, m_mod.Scene.RegionInfo.RegionName);
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_agentsInTransit[id] = newState;
 
 //                    m_log.DebugFormat(
-//                        "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", 
+//                        "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}",
 //                        id, oldState, newState, m_mod.Scene.Name);
                 }
                 else if (failIfNotOkay)
@@ -204,11 +204,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //                {
 //                    if (oldState != null)
 //                        m_log.DebugFormat(
-//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", 
+//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}",
 //                            id, oldState, newState, m_mod.Scene.Name);
 //                    else
 //                        m_log.DebugFormat(
-//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", 
+//                            "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit",
 //                            id, newState, m_mod.Scene.Name);
 //                }
             }
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             if (!m_mod.WaitForAgentArrivedAtDestination)
                 return true;
-            
+
             lock (m_agentsInTransit)
             {
                 AgentTransferState? currentState = GetAgentTransferState(id);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index a9aaf12..4ad500a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 scene.RegisterModuleInterface<IUserAgentVerificationModule>(this);
                 //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject;
 
-                m_incomingSceneObjectEngine 
+                m_incomingSceneObjectEngine
                     = new JobEngine(
-                        string.Format("HG Incoming Scene Object Engine ({0})", scene.Name), 
+                        string.Format("HG Incoming Scene Object Engine ({0})", scene.Name),
                         "HG INCOMING SCENE OBJECT ENGINE");
 
                 StatsManager.RegisterStat(
@@ -291,7 +291,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                     GridRegion source = new GridRegion(Scene.RegionInfo);
                     source.RawServerURI = m_GatekeeperURI;
-                    
+
                     bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason);
                     logout = success; // flag for later logout from this grid; this is an HG TP
 
@@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                     break;
                                 }
 
-                            if (!found) 
+                            if (!found)
                             {
                                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
                                return false;
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //            // Rez needed npc attachments
         //            Scene.AttachmentsModule.RezAttachments(sp);
 
-                   
+
         //            IAvatarFactoryModule module = Scene.RequestModuleInterface<IAvatarFactoryModule>();
         //            //module.SendAppearance(sp.UUID);
         //            module.RequestRebake(sp, false);
@@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
-                          
+
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
@@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             // Foreign user wants to go home
-            // 
+            //
             AgentCircuitData aCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
             if (aCircuit == null || (aCircuit != null && !aCircuit.ServiceURLs.ContainsKey("HomeURI")))
             {
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_log.Debug("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e);
             }
-            
+
             if (finalDestination == null)
             {
                 client.SendTeleportFailed("Your home region could not be found");
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
-            
+
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="position"></param>
         public override void RequestTeleportLandmark(IClientAPI remoteClient, AssetLandmark lm)
         {
-            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}", 
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}",
                 (lm.Gatekeeper == string.Empty) ? "local" : lm.Gatekeeper, lm.RegionID, lm.Position);
 
             if (lm.Gatekeeper == string.Empty)
@@ -521,7 +521,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     remoteClient, info.RegionHandle, lm.Position,
                     Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
             }
-            else 
+            else
             {
                 // Foreign region
                 GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
@@ -581,7 +581,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 jobsRemoved, commonIdToRemove, jobsToReinsert.Count);
 
             if (jobsToReinsert.Count > 0)
-            {                                        
+            {
                 foreach (JobEngine.Job jobToReinsert in jobsToReinsert)
                     m_incomingSceneObjectEngine.QueueJob(jobToReinsert);
             }
@@ -611,16 +611,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
                     {
                         m_incomingSceneObjectEngine.QueueJob(
-                            string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name), 
-                            () => 
+                            string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name),
+                            () =>
                             {
                                 string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
     //                            m_log.DebugFormat(
-    //                                "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", 
+    //                                "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}",
     //                                so.Name, so.AttachedAvatar, url);
 
                                 IDictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
-                                HGUuidGatherer uuidGatherer 
+                                HGUuidGatherer uuidGatherer
                                     = new HGUuidGatherer(Scene.AssetService, url, ids);
                                 uuidGatherer.AddForInspection(so);
 
@@ -646,7 +646,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                         RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
 
                                         return;
-                                    }                                                           
+                                    }
                                 }
 
     //                            m_log.DebugFormat(
@@ -657,7 +657,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                 {
                                     int tickStart = Util.EnvironmentTickCount();
 
-                                    uuidGatherer.FetchAsset(kvp.Key);   
+                                    uuidGatherer.FetchAsset(kvp.Key);
 
                                     int ticksElapsed = Util.EnvironmentTickCountSubtract(tickStart);
 
@@ -670,15 +670,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                         RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
 
                                         return;
-                                    }   
+                                    }
                                 }
 
                                 base.HandleIncomingSceneObject(so, newPosition);
 
     //                            m_log.DebugFormat(
-    //                                "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}", 
+    //                                "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}",
     //                                so.Name, so.OwnerID, url);
-                            },                             
+                            },
                             so.OwnerID.ToString());
                     }
                 }
@@ -698,7 +698,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
                 return security.VerifyClient(aCircuit.SessionID, token);
-            } 
+            }
             else
             {
                 m_log.DebugFormat(
@@ -746,7 +746,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion region = new GridRegion();
 
             Uri uri = null;
-            if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") || 
+            if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") ||
                 (aCircuit.ServiceURLs.ContainsKey("HomeURI") && !Uri.TryCreate(aCircuit.ServiceURLs["HomeURI"].ToString(), UriKind.Absolute, out uri)))
                 return null;
 
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index b5a4005..63dbb19 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -41,34 +41,34 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
     public class Commander : ICommander
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         /// <value>
         /// Used in runtime class generation
         /// </summary>
         private string m_generatedApiClassName;
-        
+
         public string Name
         {
             get { return m_name; }
         }
         private string m_name;
-        
+
         public string Help
         {
             get
             {
                 StringBuilder sb = new StringBuilder();
-                
+
                 sb.AppendLine("=== " + m_name + " ===");
-                
+
                 foreach (ICommand com in m_commands.Values)
                 {
                     sb.AppendLine("* " + Name + " " + com.Name + " - " + com.Help);
                 }
-                
+
                 return sb.ToString();
             }
-        }        
+        }
 
         /// <summary>
         /// Constructor
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
         {
             m_name = name;
             m_generatedApiClassName = m_name[0].ToString().ToUpper();
-            
+
             if (m_name.Length > 1)
                 m_generatedApiClassName += m_name.Substring(1);
         }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
         {
             get { return m_commands; }
         }
-        private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();        
+        private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();
 
         #region ICommander Members
 
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
                 {
                     if (function != "help")
                         Console.WriteLine("ERROR: Invalid command - No such command exists");
-                    
+
                     Console.Write(Help);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index f54298c..51ae217 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             {
                 UUID uuid = UUID.Zero;
                 UUID.TryParse(meta.CreatorID, out uuid);
-                UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid); 
+                UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
                 if (creator != null)
                     meta.CreatorID = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
             }
@@ -300,8 +300,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         {
                             m_log.Error(
                                 string.Format(
-                                    "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception  ", 
-                                    asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL), 
+                                    "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception  ",
+                                    asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL),
                                 e);
 
                             // For debugging purposes for now we will continue to throw the exception up the stack as was already happening.  However, after
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 else
                 {
                     m_log.DebugFormat(
-                        "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}", 
+                        "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}",
                         uuid, assetID, userAssetURL);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 4d7c25b..f89e446 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -91,9 +91,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (name == Name)
                 {
                     m_Enabled = true;
-                    
+
                     InitialiseCommon(source);
-                        
+
                     m_log.InfoFormat("[HG INVENTORY ACCESS MODULE]: {0} enabled.", Name);
 
                     IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
 
                     m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions",
-                                            new string[] { "Startup", "Permissions" }, true); 
+                                            new string[] { "Startup", "Permissions" }, true);
 
                 }
             }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         }
 
 
-        /// 
+        ///
         /// CapsUpdateInventoryItemAsset
         ///
         public override UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
@@ -268,7 +268,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return newAssetID;
         }
 
-        /// 
+        ///
         /// UpdateInventoryItemAsset
         ///
         public override bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
@@ -317,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     RezSelected, RemoveItem, fromTaskID, attachment);
         }
 
-        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, 
+        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID,
                             UUID groupID, Vector3 RayEnd, Vector3 RayStart,
                             UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
@@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (!m_CheckSeparateAssets)
                 {
                     if (!UserManagementModule.IsLocalGridUser(userID))
-                    { // foreign 
+                    { // foreign
                         ScenePresence sp = null;
                         if (m_Scene.TryGetScenePresence(userID, out sp))
                         {
@@ -524,7 +524,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         foreach (InventoryItemBase it in content.Items)
                             it.Name = it.Name + " (Unavailable)"; ;
 
-                        // Send the new names 
+                        // Send the new names
                         inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray());
 
                     }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 771e5fe..fcf373b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 return m_UserManagement;
             }
         }
-        
+
         public bool CoalesceMultipleObjectsToInventory { get; set; }
 
         #region INonSharedRegionModule
@@ -92,14 +92,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (name == Name)
                 {
                     m_Enabled = true;
-                    
+
                     InitialiseCommon(source);
-                        
-                    m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name);                                        
+
+                    m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name);
                 }
             }
         }
-        
+
         /// <summary>
         /// Common module config for both this and descendant classes.
         /// </summary>
@@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected virtual void InitialiseCommon(IConfigSource source)
         {
             IConfig inventoryConfig = source.Configs["Inventory"];
-            
+
             if (inventoryConfig != null)
-                CoalesceMultipleObjectsToInventory 
+                CoalesceMultipleObjectsToInventory
                     = inventoryConfig.GetBoolean("CoalesceMultipleObjectsToInventory", true);
             else
                 CoalesceMultipleObjectsToInventory = true;
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (item != null && item.Owner == ownerID && asset != null)
             {
 //                m_log.DebugFormat(
-//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", 
+//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}",
 //                    item.Name, item.ID, asset.ID);
 
                 item.AssetID = asset.FullID;
@@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             List<InventoryItemBase> copiedItems = new List<InventoryItemBase>();
 
             Dictionary<UUID, List<SceneObjectGroup>> bundlesToCopy = new Dictionary<UUID, List<SceneObjectGroup>>();
-            
+
             if (CoalesceMultipleObjectsToInventory)
             {
                 // The following code groups the SOG's by owner. No objects
@@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     if (!bundlesToCopy.ContainsKey(g.OwnerID))
                         bundlesToCopy[g.OwnerID] = new List<SceneObjectGroup>();
-    
+
                     bundlesToCopy[g.OwnerID].Add(g);
                 }
             }
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     List<SceneObjectGroup> bundle = new List<SceneObjectGroup>();
                     bundle.Add(g);
-                    bundlesToCopy[g.UUID] = bundle;                    
+                    bundlesToCopy[g.UUID] = bundle;
                 }
             }
 
@@ -384,10 +384,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // with distinct destinations as well.
             foreach (List<SceneObjectGroup> bundle in bundlesToCopy.Values)
                 copiedItems.Add(CopyBundleToInventory(action, folderID, bundle, remoteClient, asAttachment));
-            
+
             return copiedItems;
         }
-        
+
         /// <summary>
         /// Copy a bundle of objects to inventory.  If there is only one object, then this will create an object
         /// item.  If there are multiple objects then these will be saved as a single coalesced item.
@@ -408,7 +408,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             Dictionary<UUID, Quaternion> originalRotations = new Dictionary<UUID, Quaternion>();
             // this possible is not needed if keyframes are saved
             Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
- 
+
             foreach (SceneObjectGroup objectGroup in objlist)
             {
                 if (objectGroup.RootPart.KeyframeMotion != null)
@@ -457,7 +457,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                          (uint)PermissionMask.Export);
                 objectGroup.RootPart.NextOwnerMask |=
                         (uint)PermissionMask.Move;
-                
+
                 coa.Add(objectGroup);
             }
 
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 itemXml = CoalescedSceneObjectsSerializer.ToXml(coa, !asAttachment);
             else
                 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
-            
+
             // Restore the position of each group now that it has been stored to inventory.
             foreach (SceneObjectGroup objectGroup in objlist)
             {
@@ -493,11 +493,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
             item.CreatorData = objlist[0].RootPart.CreatorData;
-                            
+
             if (objlist.Count > 1)
             {
                 item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
-                
+
                 // If the objects have different creators then don't specify a creator at all
                 foreach (SceneObjectGroup objectGroup in objlist)
                 {
@@ -513,8 +513,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             else
             {
                 item.SaleType = objlist[0].RootPart.ObjectSaleType;
-                item.SalePrice = objlist[0].RootPart.SalePrice;                    
-            }              
+                item.SalePrice = objlist[0].RootPart.SalePrice;
+            }
 
             AssetBase asset = CreateAsset(
                 objlist[0].GetPartName(objlist[0].RootPart.LocalId),
@@ -523,7 +523,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 Utils.StringToBytes(itemXml),
                 objlist[0].OwnerID.ToString());
             m_Scene.AssetService.Store(asset);
-            
+
             item.AssetID = asset.FullID;
 
             if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -562,7 +562,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // This is a hook to do some per-asset post-processing for subclasses that need that
             if (remoteClient != null && action != DeRezAction.Delete)
                 ExportAsset(remoteClient.AgentId, asset.FullID);
-            
+
             return item;
         }
 
@@ -580,7 +580,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="remoteClient"></param>
         /// <returns></returns>
         protected InventoryItemBase AddPermissions(
-            InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, 
+            InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions,
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7;
@@ -614,7 +614,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 item.NextPermissions = perms & so.RootPart.NextOwnerMask;
                 item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
                 item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
-                
+
                 // apply next owner perms on rez
                 item.CurrentPermissions |= SceneObjectGroup.SLAM;
             }
@@ -642,11 +642,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                          7); // Preserve folded permissions
             }
 
-            //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);            
+            //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);
 
             return item;
         }
-        
+
         /// <summary>
         /// Create an item using details for the given scene object.
         /// </summary>
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID)
         {
 //            m_log.DebugFormat(
-//                "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", 
+//                "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}",
 //                so.Name, so.UUID, folderID, action);
 //
             // Get the user info of the item destination
@@ -707,7 +707,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // Delete is treated like return in this case
             // Deleting your own items makes them go to trash
             //
-            
+
             InventoryFolderBase folder = null;
             InventoryItemBase item = null;
 
@@ -723,7 +723,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     m_log.DebugFormat(
                         "[INVENTORY ACCESS MODULE]:  Object {0} {1} scheduled for save to inventory has already been deleted.",
                         so.Name, so.UUID);
-                    
+
                     return null;
                 }
             }
@@ -805,13 +805,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
                 }
 
-                item = new InventoryItemBase();                
+                item = new InventoryItemBase();
                 item.ID = UUID.Random();
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = folder.ID;
                 item.Owner = userID;
-            }   
-            
+            }
+
             return item;
         }
         // compatibility do not use
@@ -863,7 +863,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 byte BypassRayCast, bool RayEndIsIntersection,
                 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
-            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());           
+            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());
 
             if (rezAsset == null)
             {
@@ -891,7 +891,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     "[INVENTORY ACCESS MODULE]: missing data in asset {0} to RezObject()",
                     assetID, remoteClient.Name);
                 remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: missing data in asset {0} ", assetID), false);
-                return null;           
+                return null;
             }
 
             SceneObjectGroup group = null;
@@ -903,7 +903,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
             Vector3 pos;
 
-            bool single 
+            bool single
                 = m_Scene.GetObjectsToRez(
                     rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
 
@@ -1055,7 +1055,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="isAttachment"></param>
         /// <returns>true if we can processed with rezzing, false if we need to abort</returns>
         private bool DoPreRezWhenFromItem(
-            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist, 
+            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist,
             Vector3 pos, List<Vector3> veclist, bool isAttachment)
         {
             UUID fromUserInventoryItemId = UUID.Zero;
@@ -1142,7 +1142,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
                     rootPart.SalePrice = 10;
-    
+
                     if (m_Scene.Permissions.PropagatePermissions())
                     {
                         foreach (SceneObjectPart part in so.Parts)
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             part.RezzerID = item.Owner;
                             part.Inventory.ChangeInventoryOwner(item.Owner);
                         }
-    
+
                         so.ApplyNextOwnerPermissions();
 
                         // In case the user has changed flags on a received item
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             IInventoryService invService = m_Scene.RequestModuleInterface<IInventoryService>();
             InventoryItemBase item = invService.GetItem(agentID, itemID);
-            
+
             if (item != null && item.CreatorData != null && item.CreatorData != string.Empty)
                 UserManagementModule.AddUser(item.CreatorIdAsUuid, item.CreatorData);
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
index 007ff63..8f12331 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             scene.StartScripts();
 
             HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl);
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password");
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail);
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID");
             Assert.NotNull(uuidAttribute);
             // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task
-            // item created earlier. 
+            // item created earlier.
         }
 
         private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId)
@@ -131,9 +131,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             // immediately for tests rather than chunter through it's threaded mechanisms.
             AutoResetEvent chatEvent = new AutoResetEvent(false);
 
-            scene.EventManager.OnChatFromWorld += (s, c) => 
+            scene.EventManager.OnChatFromWorld += (s, c) =>
             {
-//                Console.WriteLine("Got chat [{0}]", c.Message);           
+//                Console.WriteLine("Got chat [{0}]", c.Message);
                 chatEvent.Set();
             };
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index b31d4df..de29ae9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -48,12 +48,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
 {
     [TestFixture]
     public class InventoryAccessModuleTests : OpenSimTestCase
-    {      
+    {
         protected TestScene m_scene;
         protected BasicInventoryAccessModule m_iam;
         protected UUID m_userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
         protected TestClient m_tc;
-            
+
         [SetUp]
         public override void SetUp()
         {
@@ -68,32 +68,32 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             SceneHelpers sceneHelpers = new SceneHelpers();
             m_scene = sceneHelpers.SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, m_iam);
-            
+
             // Create user
             string userFirstName = "Jock";
             string userLastName = "Stirrup";
             string userPassword = "troll";
-            UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword);                        
-            
+            UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword);
+
             AgentCircuitData acd = new AgentCircuitData();
             acd.AgentID = m_userId;
             m_tc = new TestClient(acd, m_scene);
         }
-        
+
         [Test]
         public void TestRezCoalescedObject()
         {
 /*
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             // Create asset
             SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20);
             object1.AbsolutePosition = new Vector3(15, 30, 45);
-            
+
             SceneObjectGroup object2 = SceneHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40);
-            object2.AbsolutePosition = new Vector3(25, 50, 75);                 
-            
+            object2.AbsolutePosition = new Vector3(25, 50, 75);
+
             CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
@@ -107,46 +107,46 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             item1.Flags |= (uint)InventoryItemFlags.ObjectHasMultipleItems;
             m_scene.AddInventoryItem(item1);
-            
-            SceneObjectGroup so 
+
+            SceneObjectGroup so
                 = m_iam.RezObject(
-                    m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
-            
+                    m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);
+
             Assert.That(so, Is.Not.Null);
-            
+
             Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(2));
-          
+
             SceneObjectPart retrievedObj1Part = m_scene.GetSceneObjectPart(object1.Name);
             Assert.That(retrievedObj1Part, Is.Null);
-            
+
             retrievedObj1Part = m_scene.GetSceneObjectPart(item1.Name);
             Assert.That(retrievedObj1Part, Is.Not.Null);
             Assert.That(retrievedObj1Part.Name, Is.EqualTo(item1.Name));
-            
+
             // Bottom of coalescence is placed on ground, hence we end up with 100.5 rather than 85 since the bottom
             // object is unit square.
             Assert.That(retrievedObj1Part.AbsolutePosition, Is.EqualTo(new Vector3(95, 90, 100.5f)));
-            
+
             SceneObjectPart retrievedObj2Part = m_scene.GetSceneObjectPart(object2.Name);
-            Assert.That(retrievedObj2Part, Is.Not.Null);            
+            Assert.That(retrievedObj2Part, Is.Not.Null);
             Assert.That(retrievedObj2Part.Name, Is.EqualTo(object2.Name));
             Assert.That(retrievedObj2Part.AbsolutePosition, Is.EqualTo(new Vector3(105, 110, 130.5f)));
 */
-        }        
-        
+        }
+
         [Test]
         public void TestRezObject()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             // Create asset
-            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);         
+            SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -159,17 +159,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             item1.Name = item1Name;
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            InventoryFolderBase objsFolder 
+            InventoryFolderBase objsFolder
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
             m_scene.AddInventoryItem(item1);
-            
-            SceneObjectGroup so 
+
+            SceneObjectGroup so
                 = m_iam.RezObject(
-                    m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
-            
+                    m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);
+
             Assert.That(so, Is.Not.Null);
-            
+
             SceneObjectPart retrievedPart = m_scene.GetSceneObjectPart(so.UUID);
             Assert.That(retrievedPart, Is.Not.Null);
         }
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 862f0b7..df9d4f9 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                 return;
 
             // This will never run more than once, even if the region is restarted
-            if (!m_HasRunOnce) 
+            if (!m_HasRunOnce)
             {
                 LoadLibrariesFromArchives();
                 //DumpLibrary();
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 21e00b2..c1a9457 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -259,11 +259,11 @@ namespace OpenSim.Region.CoreModules.Framework.Library
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// that hold the given assetID.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="assetID"></param>
-        /// <returns>The permissions or 0 if no such asset is found in 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         public int GetAssetPermissions(UUID userID, UUID assetID) { return 0; }
     }
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index 93a7cf2..fb3d31c 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -44,7 +44,7 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.Framework.Monitoring
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")]
-    public class MonitorModule : INonSharedRegionModule 
+    public class MonitorModule : INonSharedRegionModule
     {
         /// <summary>
         /// Is this module enabled?
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
 
             if (cnfg != null)
                 Enabled = cnfg.GetBoolean("Enabled", true);
-            
+
             if (!Enabled)
                 return;
 
@@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; });
             MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; });
         }
-        
+
         private void UnRegisterStatsManagerRegionStatistics()
         {
             foreach (Stat stat in registeredStats)
@@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             }
             registeredStats.Clear();
         }
-        
+
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
index 3849996..c04d856 100644
--- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Framework.Search
 
         #endregion ISharedRegionModule
 
- 
+
         #region Event Handlers
 
         void EventManager_OnMakeRootAgent(ScenePresence sp)
diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 36fb57a..924a1a3 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private readonly List<Scene> m_scenes = new List<Scene>();
         private JobEngine m_processorJobEngine;
- 
+
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
index f3436d1..3e6c8b5 100644
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
     public class BinaryLoggingModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected bool m_collectStats;
         protected Scene m_scene = null;
-        
+
         public string Name { get { return "Binary Statistics Logging Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
-        public void Initialise(IConfigSource source) 
+        public void Initialise(IConfigSource source)
         {
             try
             {
@@ -81,23 +81,23 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
                 // if it doesn't work, we don't collect anything
             }
         }
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
         }
-        
-        public void RegionLoaded(Scene scene) 
+
+        public void RegionLoaded(Scene scene)
         {
             if (m_collectStats)
                 m_scene.StatsReporter.OnSendStatsResult += LogSimStats;
         }
-        
-        public void Close() 
+
+        public void Close()
         {
         }
 
@@ -107,12 +107,12 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
             public string Path;
             public System.IO.BinaryWriter Log;
         }
-        
+
         static StatLogger m_statLog = null;
         static TimeSpan m_statLogPeriod = TimeSpan.FromSeconds(300);
         static string m_statsDir = String.Empty;
         static Object m_statLockObject = new Object();
-        
+
         private void LogSimStats(SimStats stats)
         {
             SimStatsPacket pack = new SimStatsPacket();
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index ea3bbe7..3e0a610 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 // This is it! Let's ask the other world
-                if (words[0].Contains(".")) 
+                if (words[0].Contains("."))
                 {
                     string[] names = words[0].Split(new char[] { '.' });
                     if (names.Length >= 2)
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         }
 
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr);
-                        
+
                         UUID userID = UUID.Zero;
                         try
                         {
@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         {
                             m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e);
                         }
-                        
+
                         if (!userID.Equals(UUID.Zero))
                         {
                             UserData ud = new UserData();
@@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             //{
             //    foreach (UserData d in m_UserCache.Values)
             //    {
-            //        if (d.LastName.StartsWith("@") && 
-            //            (d.FirstName.ToLower().StartsWith(query.ToLower()) || 
+            //        if (d.LastName.StartsWith("@") &&
+            //            (d.FirstName.ToLower().StartsWith(query.ToLower()) ||
             //             d.LastName.ToLower().StartsWith(query.ToLower())))
             //            users.Add(d);
             //    }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
index 4e3b7e5..9d91aa3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
 {
     [TestFixture]
     public class HGUserManagementModuleTests : OpenSimTestCase
-    {    
+    {
         /// <summary>
         /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 2701912..51f973a 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -345,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="uuid"></param>
         /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param>
@@ -557,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 return ret;
 
             // try grid user service
-            
+
             GridUserInfo[] pinfos = m_Scenes[0].GridUserService.GetGridUserInfo(missing.ToArray());
             if(pinfos.Length > 0)
             {
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index a5c7543..5d66d34 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
     public class HGWorldMapModule : WorldMapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         // Remember the map area that each client has been exposed to in this region
         private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>();
 
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 74dcaae..2e3ac8e 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Mono.Addins;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Region.CoreModules")]
@@ -15,8 +15,8 @@ using Mono.Addins;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -26,7 +26,7 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 665d7f7..c369d87 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -181,12 +181,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                                          string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
         {
             return AddDynamicTextureURL(simID, primID, contentType, url,
-                                          extraParams, updateTimer, SetBlending, 
+                                          extraParams, updateTimer, SetBlending,
                                          (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending, 
+                                         string extraParams, int updateTimer, bool SetBlending,
                                          int disp, byte AlphaValue, int face)
         {
             if (RenderPlugins.ContainsKey(contentType))
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
                                           string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
         {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, 
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending,
                                           (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
         }
 
@@ -478,17 +478,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
                 if (part == null || data == null || data.Length <= 1)
                 {
-                    string msg = 
+                    string msg =
                         String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
                     scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
                                   0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
-                    
+
                     return UUID.Zero;
                 }
 
                 byte[] assetData = null;
                 AssetBase oldAsset = null;
-                
+
                 if (BlendWithOldTexture)
                 {
                     Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
                 Bitmap image1 = new Bitmap(image);
                 image.Dispose();
-                
+
                 if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null)
                 {
                     image1.Dispose();
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 3948667..09891f7 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
             }
-                        
+
             htc.RequestModule = this;
             htc.LocalID = localID;
             htc.ItemID = itemID;
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         }
 
         public bool StartHttpRequest(HttpRequestClass req)
-        {          
+        {
             if (!CheckAllowed(new Uri(req.Url)))
                 return false;
 
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             try
             {
                 Request = (HttpWebRequest)WebRequest.Create(Url);
-                Request.AllowAutoRedirect = false;               
+                Request.AllowAutoRedirect = false;
 
                 //This works around some buggy HTTP Servers like Lighttpd
                 Request.ServicePoint.Expect100Continue = false;
@@ -684,9 +684,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     resStream.Close();
                 if (response != null)
                     response.Close();
-                
 
-                // We need to resubmit 
+
+                // We need to resubmit
                 if (
                     (Status == (int)HttpStatusCode.MovedPermanently
                         || Status == (int)HttpStatusCode.Found
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index d22487e..7e223d7 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -45,7 +45,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 {
     class TestWebRequestCreate : IWebRequestCreate
-    {       
+    {
         public TestWebRequest NextRequest { get; set; }
 
         public WebRequest Create(Uri uri)
@@ -65,13 +65,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
         public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; }
 
-        public TestWebRequest() : base() 
+        public TestWebRequest() : base()
         {
 //            Console.WriteLine("created");
         }
 
-//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) 
-//            : base(serializationInfo, streamingContext) 
+//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext)
+//            : base(serializationInfo, streamingContext)
 //        {
 //            Console.WriteLine("created");
 //        }
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
         public string Response { get; set; }
 
 #pragma warning disable 0618
-        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 
+        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext)
             : base(serializationInfo, streamingContext) {}
 #pragma warning restore 0618
 
@@ -111,24 +111,24 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
     {
         WaitHandle m_wh = new ManualResetEvent(true);
 
-        object IAsyncResult.AsyncState 
+        object IAsyncResult.AsyncState
         {
             get {
                 throw new System.NotImplementedException ();
             }
         }
 
-        WaitHandle IAsyncResult.AsyncWaitHandle 
+        WaitHandle IAsyncResult.AsyncWaitHandle
         {
             get { return m_wh; }
         }
 
-        bool IAsyncResult.CompletedSynchronously 
+        bool IAsyncResult.CompletedSynchronously
         {
             get { return false; }
         }
 
-        bool IAsyncResult.IsCompleted 
+        bool IAsyncResult.IsCompleted
         {
             get { return true; }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
             TestHelpers.EnableLogging();
 
             if (!Util.IsPlatformMono)
-                Assert.Ignore("Ignoring test since can only currently run on Mono");           
+                Assert.Ignore("Ignoring test since can only currently run on Mono");
 
             string rawResponse = "boom";
 
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
             TestWebRequest twr = new TestWebRequest();
             //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext());
-            twr.OnEndGetResponse += ar => 
+            twr.OnEndGetResponse += ar =>
             {
                 SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter());
                 StreamingContext sc = new StreamingContext();
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index f563c68..bb80a88 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         /// </summary>
         public int TotalUrls { get; set; }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -221,10 +221,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     urlData.allowXss = true;
 
                 m_UrlMap[url] = urlData;
-                
+
                 string uri = "/lslhttp/" + urlcode.ToString() + "/";
-               
-                PollServiceEventArgs args 
+
+                PollServiceEventArgs args
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
@@ -270,12 +270,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
                 if (options != null && options["allowXss"] != null)
                     urlData.allowXss = true;
-                
+
                 m_UrlMap[url] = urlData;
-                
+
                 string uri = "/lslhttps/" + urlcode.ToString() + "/";
-               
-                PollServiceEventArgs args 
+
+                PollServiceEventArgs args
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     foreach (UUID req in data.requests.Keys)
                         m_RequestMap.Remove(req);
                 }
-                        
+
 //                m_log.DebugFormat(
 //                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
 //                    url, data.itemID, data.hostID);
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 m_UrlMap.Remove(url);
             }
         }
-        
+
         public void HttpContentType(UUID request, string type)
         {
             lock (m_UrlMap)
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 }
             }
         }
-        
+
         public void HttpResponse(UUID request, int status, string body)
         {
             lock (m_RequestMap)
@@ -403,7 +403,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public void ScriptRemoved(UUID itemID)
         {
 //            m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID);
-            
+
             lock (m_UrlMap)
             {
                 List<string> removeURLs = new List<string>();
@@ -495,14 +495,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 return response;
             }
 
-            
+
             return response;
         }
 
         private bool HasEvents(UUID requestID, UUID sessionID)
         {
             UrlData url=null;
-            
+
             lock (m_RequestMap)
             {
                 if (!m_RequestMap.ContainsKey(requestID))
@@ -545,10 +545,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             {
                 requestData = url.requests[requestID];
             }
-            
+
             if (!requestData.requestDone)
                 return NoEvents(requestID,sessionID);
-            
+
             Hashtable response = new Hashtable();
 
             if (System.Environment.TickCount - requestData.startTime > 25000)
@@ -569,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
             if (url.allowXss)
                 response["access_control_allow_origin"] = "*";
-            
+
             //remove from map
             lock (url.requests)
             {
@@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     }
 
                     //for llGetHttpHeader support we need to store original URI here
-                    //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
+                    //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers
                     //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader
 
                     RequestData requestData = new RequestData();
@@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                                     else
                                     {
                                         queryString = queryString + val + "&";
-                                    }                                    
+                                    }
                                 }
                             }
                             if (queryString.Length > 1)
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 7267515..673a453 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             return false;
         }
 
-        public void GetDrawStringSize(string text, string fontName, int fontSize, 
+        public void GetDrawStringSize(string text, string fontName, int fontSize,
                                       out double xSize, out double ySize)
         {
             xSize = 0;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         {
             if (m_scene == null)
                 m_scene = scene;
-            
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -166,15 +166,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.AllowAutoRedirect = false;
-            
-            if (!string.IsNullOrEmpty(m_proxyurl)) 
+
+            if (!string.IsNullOrEmpty(m_proxyurl))
             {
-                if (!string.IsNullOrEmpty(m_proxyexcepts)) 
+                if (!string.IsNullOrEmpty(m_proxyexcepts))
                 {
                     string[] elist = m_proxyexcepts.Split(';');
                     request.Proxy = new WebProxy(m_proxyurl, true, elist);
-                } 
-                else 
+                }
+                else
                 {
                     request.Proxy = new WebProxy(m_proxyurl, true);
                 }
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                             {
                                 imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
                             }
-                        } 
+                        }
                         catch (Exception)
                         {
                             m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed.  Empty byte data returned!");
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index ad33f23..9c3f08e 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         public void RegionLoaded(Scene scene)
         {
             m_scriptModule = scene.RequestModuleInterface<IScriptModule>();
-            
+
             if (m_scriptModule != null)
                 m_log.Info("[MODULE COMMANDS]: Script engine found, module active");
         }
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
                 }
             }
         }
-        
+
         public Delegate[] GetScriptInvocationList()
         {
             List<Delegate> ret = new List<Delegate>();
@@ -361,14 +361,14 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         public object LookupModConstant(string cname)
         {
             // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname);
-            
+
             lock (m_constants)
             {
                 object value = null;
                 if (m_constants.TryGetValue(cname,out value))
                     return value;
             }
-            
+
             return null;
         }
 
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 2fc89fc..f12286d 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return true;
         }
 
-        public void GetDrawStringSize(string text, string fontName, int fontSize, 
+        public void GetDrawStringSize(string text, string fontName, int fontSize,
                                       out double xSize, out double ySize)
         {
             lock (this)
@@ -209,32 +209,32 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             int alpha = 255; // 0 is transparent
             Color bgColor = Color.White;  // Default background color
             char altDataDelim = ';';
-            
+
             char[] paramDelimiter = { ',' };
             char[] nvpDelimiter = { ':' };
-           
+
             extraParams = extraParams.Trim();
             extraParams = extraParams.ToLower();
-            
+
             string[] nvps = extraParams.Split(paramDelimiter);
-            
+
             int temp = -1;
             foreach (string pair in nvps)
             {
                 string[] nvp = pair.Split(nvpDelimiter);
                 string name = "";
                 string value = "";
-                
+
                 if (nvp[0] != null)
                 {
                     name = nvp[0].Trim();
                 }
-                
+
                 if (nvp.Length == 2)
                 {
                     value = nvp[1].Trim();
                 }
-                
+
                 switch (name)
                 {
                     case "width":
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                          if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
                          {
                              bgColor = Color.FromArgb(hex);
-                         } 
+                         }
                          else
                          {
                              bgColor = Color.FromName(value);
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                          }
                          else
                          {
-                             // this function used to accept an int on its own that represented both 
+                             // this function used to accept an int on its own that represented both
                              // width and height, this is to maintain backwards compat, could be removed
                              // but would break existing scripts
                              temp = parseIntParam(name);
@@ -329,10 +329,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                              {
                                  if (temp > 1024)
                                     temp = 1024;
-                                    
+
                                  if (temp < 128)
                                      temp = 128;
-                                  
+
                                  width = temp;
                                  height = temp;
                              }
@@ -358,10 +358,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
                     else
                         bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
-    
+
                     graph = Graphics.FromImage(bitmap);
-        
-                    // this is really just to save people filling the 
+
+                    // this is really just to save people filling the
                     // background color in their scripts, only do when fully opaque
                     if (alpha >= 255)
                     {
@@ -370,10 +370,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                             graph.FillRectangle(bgFillBrush, 0, 0, width, height);
                         }
                     }
-        
+
                     for (int w = 0; w < bitmap.Width; w++)
                     {
-                        if (alpha <= 255) 
+                        if (alpha <= 255)
                         {
                             for (int h = 0; h < bitmap.Height; h++)
                             {
@@ -381,10 +381,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                             }
                         }
                     }
-        
+
                     GDIDraw(data, graph, altDataDelim, out reuseable);
                 }
-    
+
                 byte[] imageJ2000 = new byte[0];
 
                 // This code exists for testing purposes, please do not remove.
@@ -394,7 +394,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 //                    imageJ2000 = s_asset2Data;
 //
 //                s_flipper = !s_flipper;
-    
+
                 try
                 {
                     imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true);
@@ -420,13 +420,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 {
                     if (graph != null)
                         graph.Dispose();
-    
+
                     if (bitmap != null)
                         bitmap.Dispose();
                 }
             }
         }
-        
+
         private int parseIntParam(string strInt)
         {
             int parsed;
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString());
                 parsed = -1;
             }
-            
+
             return parsed;
         }
 
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                                     graph.DrawString("not an image. Please check URL.", errorFont,
                                                      myBrush, new Point(startPoint.X, 12 + startPoint.Y));
                                 }
-    
+
                                 graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y);
                             }
                         }
@@ -638,11 +638,11 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                     {
                         nextLine = nextLine.Remove(0, 8);
                         nextLine = nextLine.Trim();
-    
+
                         string[] fprops = nextLine.Split(partsDelimiter);
                         foreach (string prop in fprops)
                         {
-    
+
                             switch (prop)
                             {
                                 case "B":
@@ -717,7 +717,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         else if (cap[0].ToLower() != "both")
                             return;
                         string type = cap[1].ToLower();
-                        
+
                         if (end)
                         {
                             switch (type)
@@ -760,7 +760,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         nextLine = nextLine.Remove(0, 9);
                         nextLine = nextLine.Trim();
                         int hex = 0;
-    
+
                         Color newColor;
                         if (Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
                         {
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index e1c0cd7..660e03f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                         continue;
                     if (m_scene.GetSceneObjectPart(liHostID) == null)
                         continue;
-   
+
                     if (targets.Contains(liHostID))
                         QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 87f4277..aed1372 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -621,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
         private Thread httpThread;
         public int Idata;
         private UUID _itemID;
-        public UUID ItemID 
+        public UUID ItemID
         {
             get { return _itemID; }
             set { _itemID = value; }
@@ -633,7 +633,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             set { _localID = value; }
         }
         private UUID _reqID;
-        public UUID ReqID 
+        public UUID ReqID
         {
             get { return _reqID; }
             set { _reqID = value; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 7b4668a..2c882e6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
 
                 m_log.Info("[HGAssetService]: Starting...");
 
-                
+
                 Object[] args = new Object[] { m_Config, MainServer.Instance, "HGAssetService" };
 
                 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
index 2cdffe6..a8c4e3c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index 22857d0..834cbb7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index f749295..4f87595 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         private bool m_Registered = false;
         private string m_LocalServiceDll = String.Empty;
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
                 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
 
                 m_UASHandler = new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn);
-                
+
                 new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService");
 
                 new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService", friendsConn);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 0a4e736..61e37a9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
         bool m_Registered = false;
 
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 1273f0d..21483c5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
index 425febd..065dd94 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
         {
             if (!m_Enabled)
                 return;
-            
+
             if (!m_Registered)
             {
                 m_Registered = true;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
index c14bce7..a75a156 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
-        
+
         private IConfigSource m_Config;
 
         #region Region Module interface
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index 6bf47cb..09c545c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 57d1132..7ba39d4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 4701ee6..9e75ee2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             get; private set;
         }
-        
-        public Type ReplaceableInterface 
+
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params");
         }
-        
+
         public LocalUserProfilesServicesConnector(IConfigSource source)
         {
             m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly.");
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         public void InitialiseService(IConfigSource source)
         {
             ConfigName = "UserProfilesService";
-            
+
             // Instantiate the request handler
             IHttpServer Server = MainServer.Instance;
 
@@ -107,35 +107,35 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini");
                 return;
             }
-            
+
             if(!config.GetBoolean("Enabled",false))
             {
                 Enabled = false;
                 return;
             }
-            
+
             Enabled = true;
-            
+
             string serviceDll = config.GetString("LocalServiceModule",
                                                       String.Empty);
-            
+
             if (serviceDll == String.Empty)
             {
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService");
                 return;
             }
-            
+
             Object[] args = new Object[] { source, ConfigName };
             ServiceModule =
                 ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll,
                                                      args);
-            
+
             if (ServiceModule == null)
             {
                 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service");
                 return;
             }
-            
+
             Enabled = true;
 
             JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         {
             if (!Enabled)
                 return;
-            
+
             lock (regions)
             {
                 if (regions.ContainsKey(scene.RegionInfo.RegionID))
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         void IRegionModuleBase.RemoveRegion(Scene scene)
         {
             if (!Enabled)
-                return; 
+                return;
 
             lock (regions)
             {
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
         void IRegionModuleBase.RegionLoaded(Scene scene)
         {
             if (!Enabled)
-                return; 
+                return;
         }
         #endregion
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
index 41ae53f..5cd68d9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
index a827c4c..d60236a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
@@ -44,14 +44,14 @@ using Nini.Config;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAgentPreferencesServicesConnector")]
-    public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector, 
+    public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector,
             ISharedRegionModule, IAgentPreferencesService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 31d1129..f5aa971 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private AssetPermissions m_AssetPerms;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             if (!m_Enabled)
                 return;
-            
+
             m_aScene = scene;
 
             m_aScene.RegisterModuleInterface<IAssetService>(this);
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
                 if (!(m_Cache is ISharedRegionModule))
                     m_Cache = null;
-                
+
             }
 
             m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName);
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             //m_log.DebugFormat("[HG ASSET CONNECTOR]: Get {0}", id);
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 asset = m_Cache.Get(id);
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public AssetMetadata GetMetadata(string id)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 if (m_Cache != null)
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public byte[] GetData(string id)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
             {
                 if (m_Cache != null)
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
 
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             bool isHG = IsHG(asset.ID);
             if ((m_Cache != null) && !isHG)
-                // Don't store it in the cache if the asset is to 
+                // Don't store it in the cache if the asset is to
                 // be sent to the other grid, because this is already
                 // a copy of the local asset.
                 m_Cache.Cache(asset);
@@ -366,7 +366,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (String.IsNullOrEmpty(id))
                 return string.Empty;
-            
+
            if(asset.ID != id)
            {
                 asset.ID = id;
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool UpdateContent(string id, byte[] data)
         {
             AssetBase asset = null;
-            
+
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index d5d6667..7190aa0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public AssetBase Get(string id)
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Synchronously requesting asset {0}", id);
-            
+
             AssetBase asset = null;
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //                if (null == asset)
 //                    m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not synchronously find asset with id {0}", id);
             }
-            
+
             return asset;
         }
 
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 return asset.Metadata;
 
             asset = m_AssetService.Get(id);
-            if (asset != null) 
+            if (asset != null)
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Asynchronously requesting asset {0}", id);
-                                    
+
             if (m_Cache != null)
             {
                 AssetBase asset = m_Cache.Get(id);
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             if (m_Cache != null)
                 m_Cache.Cache(asset);
-            
+
             if (asset.Local)
             {
 //                m_log.DebugFormat(
@@ -278,7 +278,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //                m_log.DebugFormat(
 //                    "[LOCAL ASSET SERVICE CONNECTOR]: Passing {0} {1} on to asset service for storage, status Temporary = {2}, Local = {3}",
 //                    asset.Name, asset.ID, asset.Temporary, asset.Local);
-                
+
                 return m_AssetService.Store(asset);
             }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index ff04f9d..1225ab5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         private bool m_Enabled = false;
         private IAssetCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index f027810..8017245 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
         {
             // Not implemented at the regions
             realID = UUID.Zero;
-            return string.Empty; 
+            return string.Empty;
         }
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             // Not implemented at the regions
-            return string.Empty; 
+            return string.Empty;
         }
 
         public bool Verify(UUID principalID, string token, int lifetime)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
index 7cb8b22..fd1d802 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index 1acb695..0be0676 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         public void Initialise(IConfigSource source)
         {
             m_log.Info("[AUTHORIZATION CONNECTOR]: Initialise");
-            
+
             IConfig moduleConfig = source.Configs["Modules"];
             if (moduleConfig != null)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index b8d409d..f312b0d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         private bool m_Enabled = false;
         private List<Scene> m_scenes = new List<Scene>();
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 m_scenes.Add(scene);
                 scene.RegisterModuleInterface<IAuthorizationService>(this);
             }
-            
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -118,16 +118,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
             m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: Enabled remote authorization for region {0}", scene.RegionInfo.RegionName);
 
         }
-        
+
         public bool IsAuthorizedForRegion(
              string userID, string firstName, string lastName, string regionID, out string message)
         {
             m_log.InfoFormat(
                 "[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID);
-            
+
             bool isAuthorized = true;
             message = String.Empty;
-            
+
             // get the scene this call is being made for
             Scene scene = null;
             lock (m_scenes)
@@ -140,11 +140,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                     }
                 }
             }
-            
+
             if (scene != null)
             {
                 string mail = String.Empty;
-                
+
                 UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID));
 
                 //if account not found, we assume its a foreign visitor from HG, else use account data...
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                     "[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0}",
                     regionID);
             }
-            
+
             return isAuthorized;
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
index c3ef588..42f6c3f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -144,12 +144,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
         {
             return m_AvatarService.GetAppearance(userID);
         }
-        
+
         public bool SetAppearance(UUID userID, AvatarAppearance appearance)
         {
             return m_AvatarService.SetAppearance(userID,appearance);
         }
-            
+
         public AvatarData GetAvatar(UUID userID)
         {
             return m_AvatarService.GetAvatar(userID);
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
         {
             return m_AvatarService.RemoveItems(userID, names);
         }
-        
+
         #endregion
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
index a087aea..37cfbbc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 70733fc..d220568 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         public LocalGridServicesConnector(IConfigSource source)
         {
             m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader);
-            InitialiseService(source, null);        
+            InitialiseService(source, null);
         }
 
         public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache)
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
-                {                   
+                {
                     if(InitialiseService(source, null))
                         m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
                 }
@@ -190,8 +190,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             // This shouldn't happen
             if (region == null)
                 return;
-            
-            m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region);           
+
+            m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region);
         }
 
         public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            return m_GridService.GetNeighbours(scopeID, regionID); 
+            return m_GridService.GetNeighbours(scopeID, regionID);
         }
 
         public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             return m_GridService.GetHyperlinks(scopeID);
         }
-        
+
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             return m_GridService.GetRegionFlags(scopeID, regionID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
index 5eb525b..84e52f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static RegionsExpiringCache m_Cache;
         private int numberInstances;
 
@@ -60,12 +60,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (rinfo != null)
                 this.Cache(rinfo.ScopeID, rinfo);
         }
-        
+
         public void Cache(UUID scopeID, GridRegion rinfo)
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS);
         }
 
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(rinfo.ScopeID, rinfo, 1e7f);
         }
 
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS);
         }
 
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (rinfo == null)
                 return;
-            
+
             m_Cache.AddOrUpdate(scopeID, rinfo, expireSeconds);
         }
 
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 inCache = true;
                 return rinfo;
             }
-            
+
             return null;
         }
 
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 inCache = true;
                 return rinfo;
             }
-            
+
             return null;
         }
     }
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private Dictionary<string, ulong> byname;
         private Dictionary<UUID, ulong> byuuid;
         // includes handles to the inside of large regions
-        private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>(); 
+        private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>();
 
         public RegionInfoForScope()
         {
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 byuuid = new Dictionary<UUID, ulong>();
 
             storage[handle] = region;
-            expires[handle] = expire; 
+            expires[handle] = expire;
             byname[region.RegionName] = handle;
             byuuid[region.RegionID] = handle;
 
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             storage[handle] = region;
             byname[region.RegionName] = handle;
             byuuid[region.RegionID] = handle;
-           
+
         }
 
         public void Remove(GridRegion region)
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if(!innerHandles.ContainsKey(handle))
                 return null;
-            
+
             ulong rhandle = innerHandles[handle];
             if(storage.ContainsKey(rhandle))
                 return storage[rhandle];
@@ -495,7 +495,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if(byname == null || !byname.ContainsKey(name))
                 return null;
-            
+
             ulong handle = byname[name];
             if(storage.ContainsKey(handle))
                 return storage[handle];
@@ -528,7 +528,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if(!innerHandles.ContainsKey(handle))
                 return null;
-            
+
             ulong rhandle = innerHandles[handle];
             if(!storage.ContainsKey(rhandle))
                 return null;
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             GridRegion r = storage[rhandle];
             if(r == null)
                 return null;
-                
+
             // extra check, possible redundant
 
             int test = r.RegionLocX;
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (y < test)
                 return r;
 
-/* 
+/*
             // next do the harder work
             foreach(KeyValuePair<ulong, GridRegion> kvp in storage)
             {
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 if(kvp.Value < now)
                     toexpire.Add(kvp.Key);
             }
- 
+
             if(toexpire.Count == 0)
                 return expires.Count;
 
@@ -597,7 +597,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 Clear();
                 return 0;
             }
-            
+
             foreach(ulong h in toexpire)
             {
                 if(storage != null)
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     innerHandles[fh.toHandle()] = handle;
                     fh.y += 256;
                 }
-                    
+
                 fh.y = startY;
                 fh.x += 256;
             }
@@ -684,18 +684,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     innerHandles.Remove(fh.toHandle());
                     fh.y += 256;
                 }
-                    
+
                 fh.y = startY;
                 fh.x += 256;
             }
         }
     }
-  
+
     public class RegionsExpiringCache
     {
         const double CACHE_PURGE_HZ = 60; // seconds
         const int MAX_LOCK_WAIT = 10000; // milliseconds
- 
+
         /// <summary>For thread safety</summary>
         object syncRoot = new object();
         /// <summary>For thread safety</summary>
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     ris = new RegionInfoForScope(region, expire);
                     InfobyScope[scope] = ris;
                 }
-                else 
+                else
                     ris.AddUpdate(region, expire);
 
                 return true;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             }
             finally { Monitor.Exit(syncRoot); }
         }
-        
+
         public bool Contains(UUID scope, GridRegion region)
         {
             if(region == null)
@@ -758,11 +758,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
-            
+
                 return ris.Contains(region);
             }
             finally { Monitor.Exit(syncRoot); }
@@ -774,11 +774,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
-            
+
                 return ris.Contains(handle);
             }
             finally { Monitor.Exit(syncRoot); }
@@ -790,7 +790,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
 
             try
-            {               
+            {
                 int count = 0;
                 foreach(RegionInfoForScope ris in InfobyScope.Values)
                     count += ris.Count();
@@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT))
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT))
                 throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms");
             try
-            {               
+            {
                 RegionInfoForScope ris = null;
                 if(!InfobyScope.TryGetValue(scope, out ris) || ris == null)
                     return false;
@@ -940,7 +940,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private void PurgeCache(object sender, System.Timers.ElapsedEventArgs e)
         {
             // Only let one thread purge at once - a buildup could cause a crash
-            // This could cause the purge to be delayed while there are lots of read/write ops 
+            // This could cause the purge to be delayed while there are lots of read/write ops
             // happening on the cache
             if (!Monitor.TryEnter(isPurging))
                 return;
@@ -961,7 +961,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                         if (kvp.Value.expire(now) == 0)
                             expiredscopes.Add(kvp.Key);
                     }
-                    
+
                     if (expiredscopes.Count > 0)
                     {
                         foreach (UUID sid in expiredscopes)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 50e4c8a..ee17093 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private IGridService m_RemoteGridService;
 
         private RegionInfoCache m_RegionInfoCache;
-        
+
         public RemoteGridServicesConnector()
         {
         }
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #region ISharedRegionmodule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 return false;
             }
 
-            Object[] args = new Object[] { source }; 
+            Object[] args = new Object[] { source };
             m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args);
 
             m_LocalGridService = new LocalGridServicesConnector(source, m_RegionInfoCache);
@@ -130,11 +130,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
             // Legacy. Remove soon!
             m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
-            
-            Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper);          
+
+            Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper);
 
             return true;
-        }   
+        }
 
         public void PostInitialise()
         {
@@ -249,14 +249,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 if(string.IsNullOrWhiteSpace(m_ThisGatekeeper))
                     return rinfo; // no HG
-            
+
                 string regionURI = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName))
-                    return rinfo; // invalid 
+                    return rinfo; // invalid
                 if(m_ThisGatekeeper != regionURI)
                     return rinfo; // not local grid
             }
-                
+
             rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName);
             m_RegionInfoCache.Cache(scopeID, rinfo);
             return rinfo;
@@ -275,10 +275,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             {
                 if(string.IsNullOrWhiteSpace(m_ThisGatekeeper))
                     return rinfo; // no HG
-            
+
                 string regionURI = "";
                 if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName))
-                    return rinfo; // invalid 
+                    return rinfo; // invalid
                 if(m_ThisGatekeeper != regionURI)
                     return rinfo; // not local grid
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 044e0e5..1378368 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             Scene s = new Scene(new RegionInfo());
             s.RegionInfo.RegionID = r1.RegionID;
             m_LocalConnector.AddRegion(s);
-            
+
             GridRegion r2 = new GridRegion();
             r2.RegionName = "Test Region 2";
             r2.RegionID = new UUID(2);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 98ccc95..c780bcd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -37,7 +37,7 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 {
-    public class ActivityDetector 
+    public class ActivityDetector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
        {
             if (sp.isNPC)
                 return;
-            
+
             if(sp.gotCrossUpdate)
             {
                 Util.FireAndForget(delegate
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index c48186f..5efdd9b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return m_InventoryURLs[userID];
 
             return null; //it means that the methods should forward to local grid's inventory
- 
+
         }
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 0d36725..fa36b66 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             if (!m_Enabled)
                 return;
-            
+
             scene.RegisterModuleInterface<IInventoryService>(this);
 
             if (Scene == null)
@@ -261,9 +261,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public bool AddItem(InventoryItemBase item)
         {
 //            m_log.DebugFormat(
-//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", 
+//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}",
 //                item.Name, item.Owner, item.Folder);
-            
+
             return m_InventoryService.AddItem(item);
         }
 
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 //            m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
 
 //            UUID requestedItemId = item.ID;
-            
+
             InventoryItemBase item = m_InventoryService.GetItem(principalID, itemID);
 
 //            if (null == item)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 62b44b1..d8ae2c4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 9e251aa..cad2061 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 77dfa4a..68c5b64 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
         private bool m_Enabled = false;
         private LocalLandServicesConnector m_LocalService;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 1357825..9888c3b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         private int m_refreshtime = 0;
         private int m_lastrefresh = 0;
         private System.Timers.Timer m_refreshTimer;
-        
+
         #region ISharedRegionModule
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        public string Name { get { return "MapImageServiceModule"; } }        
+        public string Name { get { return "MapImageServiceModule"; } }
         public void RegionLoaded(Scene scene) { }
         public void Close() { }
         public void PostInitialise() { }
@@ -115,12 +115,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service);
                 return;
             }
-   
+
             // we don't want the timer if the interval is zero, but we still want this module enables
             if(refreshminutes > 0)
             {
                 m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms
-   
+
                 m_refreshTimer = new System.Timers.Timer();
                 m_refreshTimer.Enabled = true;
                 m_refreshTimer.AutoReset = true;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
                              refreshminutes, service);
             }
-            else 
+            else
             {
                 m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with no refresh and service object {0}", service);
             }
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         }
 
         #endregion ISharedRegionModule
-        
+
         ///<summary>
         ///
         ///</summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index bda354f..e8d01b0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         public void RemoveRegion(Scene scene)
         {
-            // Always remove 
+            // Always remove
             if (m_Scenes.Contains(scene))
                 m_Scenes.Remove(scene);
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index e6772f3..fcb5521 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
         //private string serviceDll;
         //private List<Scene> m_Scenes = new List<Scene>();
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 117f02c..aafd047 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -35,7 +35,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class PresenceDetector 
+    public class PresenceDetector
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
         {
             if (sp.isNPC)
                 return;
-            
+
             if(sp.gotCrossUpdate)
             {
                 Util.FireAndForget(delegate
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 69bac82..7838d12 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
         public void TestPresenceV0_1()
         {
             SetUp();
-            
+
                 // Let's stick in a test presence
                 /*
                 PresenceData p = new PresenceData();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 3755650..57aba05 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             }
 
 //            m_log.DebugFormat(
-//                "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate", 
+//                "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate",
 //                destination.RegionName, destination.RegionID);
 
             return false;
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                     reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
                     m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied");
                     return false;
-                
+
                 }
 
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 0ebdbce..b402d2a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         }
 
         protected virtual void InitOnce(Scene scene)
-        {            
+        {
             m_aScene = scene;
             //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
         }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_remoteConnector.CloseAgent(destination, id, auth_token);
-            
+
             return false;
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index b72ffbb..77fd70b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                     account = m_Cache.Get(uuid, out inCache);
                     if (inCache)
                         ret.Add(account);
-                    else                        
+                    else
                         missing.Add(id);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index f5eda11..b510d0a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         private bool m_Enabled = false;
         private UserAccountCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index 2afd74e..f3572a2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private ExpiringCache<UUID, UserAccount> m_UUIDCache;
         private ExpiringCache<string, UUID> m_NameCache;
         private object accessLock = new object();
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public UserAccountCache()
         {
             m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
-            m_NameCache = new ExpiringCache<string, UUID>(); 
+            m_NameCache = new ExpiringCache<string, UUID>();
         }
 
         public void Cache(UUID userID, UserAccount account)
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 {
                     m_UUIDCache.AddOrUpdate(userID, account, CACHE_ALIEN_EXPIRATION_SECONDS);
                     m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_ALIEN_EXPIRATION_SECONDS);
-                }               
+                }
             //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index f567cab..081439a 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World
     public class AccessModule : ISharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         private List<Scene> m_SceneList = new List<Scene>();
 
         public void Initialise(IConfigSource config)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f523af1..6ba8cec 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 SceneObjects = new List<SceneObjectGroup>();
             }
         }
-        
+
 
         /// <summary>
         /// The maximum major version of OAR that we can read.  Minor versions shouldn't need a max number since version
         /// bumps here should be compatible.
         /// </summary>
         public static int MAX_MAJOR_VERSION = 1;
-        
+
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             m_boundingOrigin = Vector3.Zero;
             m_boundingSize = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, float.MaxValue);
-            
+
             if (options.ContainsKey("bounding-origin"))
             {
                 Vector3 boOption = (Vector3)options["bounding-origin"];
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
-                    
+
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                         continue;
 
@@ -354,11 +354,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
                         LoadRegionSettings(scene, filePath, data, dearchivedScenes);
-                    } 
+                    }
                     else if (filePath.StartsWith(ArchiveConstants.LANDDATA_PATH) && (!m_merge || m_forceParcels))
                     {
                         sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
-                    } 
+                    }
                     else if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
                         // Ignore, because we already read the control file
@@ -406,7 +406,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     LoadParcels(sceneContext.Scene, sceneContext.SerialisedParcels);
                     LoadObjects(sceneContext.Scene, sceneContext.SerialisedSceneObjects, sceneContext.SceneObjects);
-                    
+
                     // Inform any interested parties that the region has changed. We waited until now so that all
                     // of the region's objects will be loaded when we send this notification.
                     IEstateModule estateModule = sceneContext.Scene.RequestModuleInterface<IEstateModule>();
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                     continue;
-                    
+
                 if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                 {
                     LoadControlFile(filePath, data, dearchivedScenes);
@@ -517,7 +517,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             throw new Exception("[ARCHIVER]: Control file not found");
         }
-        
+
         /// <summary>
         /// Load serialized scene objects.
         /// </summary>
@@ -545,7 +545,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Really large xml files (multi megabyte) appear to cause
                 // memory problems
                 // when loading the xml.  But don't enable this check yet
-                
+
                 if (serialisedSceneObject.Length > 5000000)
                 {
                     m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);");
@@ -745,7 +745,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 Vector3 AABBMax;
 
                 // create a new LandObject that we can use to manipulate the incoming source parcel data
-                // this is ok, but just beware that some of the LandObject functions (that we haven't used here) still 
+                // this is ok, but just beware that some of the LandObject functions (that we haven't used here) still
                 // assume we're always using the destination region size
                 LandData ld = new LandData();
                 landObject = new LandObject(ld, scene);
@@ -839,7 +839,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
                 parcel.ParcelAccessList = accessList;
 
-                if (m_debug) m_log.DebugFormat("[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}", 
+                if (m_debug) m_log.DebugFormat("[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}",
                                                     parcel.Name, parcel.LocalID, parcel.OwnerID, parcel.GroupID, parcel.IsGroupOwned, parcel.Area);
 
                 landData.Add(parcel);
@@ -939,20 +939,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
                 if(asype == -2)
                 {
-                
+
                 }
 
                 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
                 return true;
             }
-            
+
             if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
 
                 if(assetType == -2)
                 {
-                
+
                 }
                 if (assetType == (sbyte)AssetType.Unknown)
                 {
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             ModifySceneObject(m_rootScene, sog);
                             return true;
                         });
-                    
+
                     if (data == null)
                         return false;
                 }
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             currentRegionSettings.Save();
 
             scene.TriggerEstateSunUpdate();
-            
+
             IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
             if (estateModule != null)
                 estateModule.sendRegionHandshakeToAll();
@@ -1129,16 +1129,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             bool multiRegion = false;
 
-            while (xtr.Read()) 
+            while (xtr.Read())
             {
-                if (xtr.NodeType == XmlNodeType.Element) 
+                if (xtr.NodeType == XmlNodeType.Element)
                 {
                     if (xtr.Name.ToString() == "archive")
                     {
                         int majorVersion = int.Parse(xtr["major_version"]);
                         int minorVersion = int.Parse(xtr["minor_version"]);
                         string version = string.Format("{0}.{1}", majorVersion, minorVersion);
-                        
+
                         if (majorVersion > MAX_MAJOR_VERSION)
                         {
                             throw new Exception(
@@ -1146,15 +1146,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                     "The OAR you are trying to load has major version number of {0} but this version of OpenSim can only load OARs with major version number {1} and below",
                                     majorVersion, MAX_MAJOR_VERSION));
                         }
-                        
+
                         m_log.InfoFormat("[ARCHIVER]: Loading OAR with version {0}", version);
                     }
-                    else if (xtr.Name.ToString() == "datetime") 
+                    else if (xtr.Name.ToString() == "datetime")
                     {
                         int value;
                         if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
                             dearchivedScenes.LoadedCreationDateTime = value;
-                    } 
+                    }
                     else if (xtr.Name.ToString() == "row")
                     {
                         multiRegion = true;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
index d8dace2..2fb4426 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// The inner dictionaries contain each row's regions (key: X coordinate).
         /// </summary>
         public SortedDictionary<uint, SortedDictionary<uint, Scene>> Regions { get; set; }
-        
+
         /// <summary>
         /// The subdirectory where each region is stored in the archive.
         /// </summary>
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
         }
-        
+
         /// <summary>
         /// Returns the scene at position 'location'.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index 6c8f37b..8dabcee 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// The minimum major version of OAR that we can write.
         /// </summary>
-        public static int MIN_MAJOR_VERSION = 0;       
-                
+        public static int MIN_MAJOR_VERSION = 0;
+
         /// <summary>
         /// The maximum major version of OAR that we can write.
         /// </summary>
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_log.ErrorFormat("{0} {1}", e.Message, e.StackTrace);
             }
         }
-        
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
 
             int numObjectsSkippedPermissions = 0;
-         
+
             // Filter entities so that we only have scene objects.
             // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
             // end up having to do this
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
                 int prevAssets = assetUuids.Count;
-                    
+
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
                     assetGatherer.AddForInspection(sceneObject);
 
@@ -276,16 +276,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             // Make sure that we also request terrain texture assets
             RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
-    
+
             if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
                 assetUuids[regionSettings.TerrainTexture1] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
                 assetUuids[regionSettings.TerrainTexture2] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
                 assetUuids[regionSettings.TerrainTexture3] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
                 assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
@@ -398,18 +398,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                string[] parts = m_options["version"].ToString().Split('.');
 //                if (parts.Length >= 1)
 //                {
-//                    majorVersion = Int32.Parse(parts[0]);                    
-//                                        
+//                    majorVersion = Int32.Parse(parts[0]);
+//
 //                    if (parts.Length >= 2)
 //                        minorVersion = Int32.Parse(parts[1]);
 //                }
 //            }
-//            
+//
 //            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
 //            {
 //                throw new Exception(
 //                    string.Format(
-//                        "OAR version number for save must be between {0} and {1}", 
+//                        "OAR version number for save must be between {0} and {1}",
 //                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
 //            }
 //            else if (majorVersion == MAX_MAJOR_VERSION)
@@ -420,9 +420,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //            else if (majorVersion == MIN_MAJOR_VERSION)
 //            {
 //                // Force 0.4
-//                minorVersion = 4;                                        
+//                minorVersion = 4;
 //            }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
             if (majorVersion == 1)
             {
@@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
 
             String s;
-            
+
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter xtw = new XmlTextWriter(sw))
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     xtw.WriteStartElement("archive");
                     xtw.WriteAttributeString("major_version", majorVersion.ToString());
                     xtw.WriteAttributeString("minor_version", minorVersion.ToString());
-        
+
                     xtw.WriteStartElement("creation_info");
                     DateTime now = DateTime.UtcNow;
                     TimeSpan t = now - new DateTime(1970, 1, 1);
@@ -448,7 +448,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (!MultiRegionFormat)
                         xtw.WriteElementString("id", m_rootScene.RegionInfo.RegionID.ToString());
                     xtw.WriteEndElement();
-        
+
                     xtw.WriteElementString("assets_included", SaveAssets.ToString());
 
                     if (MultiRegionFormat)
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
 
                     xtw.WriteEndElement();
-        
+
                     xtw.Flush();
                 }
 
@@ -525,7 +525,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Vector2 size;
 
             size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY);
-    
+
             xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
         }
 
@@ -548,7 +548,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (ILandObject lo in landObjects)
             {
                 LandData landData = lo.LandData;
-                string landDataPath 
+                string landDataPath
                     = String.Format("{0}{1}", regionDir, ArchiveConstants.CreateOarLandDataPath(landData));
                 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
             }
@@ -578,11 +578,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_archiveWriter.WriteFile(objectPath, serializedObject);
             }
         }
-        
+
         protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids, bool timedOut)
         {
             string errorMessage;
-            
+
             if (timedOut)
             {
                 errorMessage = "Loading assets timed out";
@@ -600,10 +600,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 errorMessage = String.Empty;
             }
-            
+
             CloseArchive(errorMessage);
         }
-        
+
         /// <summary>
         /// Closes the archive and notifies that we're done.
         /// </summary>
@@ -622,7 +622,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (errorMessage == string.Empty)
                     errorMessage = e.Message;
             }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_rootScene.RegionInfo.RegionName);
 
             m_rootScene.EventManager.TriggerOarFileSaved(m_requestId, errorMessage);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 150d4ec..1305545 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ArchiverModule")]
     public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Scene Scene { get; private set; }
@@ -59,13 +59,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
 
-        public string Name 
-        { 
-            get { return "RegionArchiverModule"; } 
+        public string Name
+        {
+            get { return "RegionArchiverModule"; }
         }
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
@@ -201,9 +201,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 rready.OarLoadingAlert("load");
             }
             */
-            
+
             List<string> mainParams = options.Parse(cmdparams);
-          
+
 //            m_log.DebugFormat("MERGE OAR IS [{0}]", mergeOar);
 //
 //            foreach (string param in mainParams)
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             ArchiveRegion(path, options);
         }
-        
+
         public void ArchiveRegion(string savePath, Dictionary<string, object> options)
         {
             ArchiveRegion(savePath, Guid.Empty, options);
@@ -298,7 +298,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
-            
+
             new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
         }
 
@@ -330,7 +330,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion();
         }
-        
+
         public void DearchiveRegion(Stream loadStream)
         {
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index c1ff94d..efacae3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -51,8 +51,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <value>
         /// Keep a count of the number of assets written so that we can provide status updates
         /// </value>
-        protected int m_assetsWritten; 
-        
+        protected int m_assetsWritten;
+
         protected TarArchiveWriter m_archiveWriter;
 
         public AssetsArchiver(TarArchiveWriter archiveWriter)
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_assetsWritten++;
 
             //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten);
-            
+
             if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0)
                 m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten);
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 1526b1c..d380da8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Completed,
             Aborted
         };
-        
+
         /// <value>
         /// Timeout threshold if we still need assets or missing asset notifications but have stopped receiving them
         /// from the asset service
@@ -71,14 +71,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// If a timeout does occur, limit the amount of UUID information put to the console.
         /// </value>
         protected const int MAX_UUID_DISPLAY_ON_TIMEOUT = 3;
-       
+
         protected System.Timers.Timer m_requestCallbackTimer;
 
         /// <value>
         /// State of this request
         /// </value>
         private RequestState m_requestState = RequestState.Initial;
-        
+
         /// <value>
         /// uuids to request
         /// </value>
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// List of assets that were found.  This will be passed back to the requester.
         /// </value>
         protected List<UUID> m_foundAssetUuids = new List<UUID>();
-        
+
         /// <value>
         /// Maintain a list of assets that could not be found.  This will be passed back to the requester.
         /// </value>
@@ -109,16 +109,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         protected IAssetService m_assetService;
         protected IUserAccountService m_userAccountService;
-        protected UUID m_scopeID; // the grid ID 
+        protected UUID m_scopeID; // the grid ID
 
         protected AssetsArchiver m_assetsArchiver;
 
         protected Dictionary<string, object> m_options;
 
         protected internal AssetsRequest(
-            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids, 
-            IAssetService assetService, IUserAccountService userService, 
-            UUID scope, Dictionary<string, object> options, 
+            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids,
+            IAssetService assetService, IUserAccountService userService,
+            UUID scope, Dictionary<string, object> options,
             AssetsRequestCallback assetsRequestCallback)
         {
             m_assetsArchiver = assetsArchiver;
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         protected internal void Execute()
         {
             m_requestState = RequestState.Running;
-            
+
             m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
 
             // We can stop here if there are no assets to fetch
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         timedOut = false;
                         return;
                     }
-                    
+
                     m_requestState = RequestState.Aborted;
                 }
 
@@ -196,24 +196,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     uuids.Remove(uuid);
                 }
-    
+
                 foreach (UUID uuid in m_notFoundAssetUuids)
                 {
                     uuids.Remove(uuid);
                 }
-    
+
                 m_log.ErrorFormat(
                     "[ARCHIVER]: Asset service failed to return information about {0} requested assets", uuids.Count);
-    
+
                 int i = 0;
                 foreach (UUID uuid in uuids)
                 {
                     m_log.ErrorFormat("[ARCHIVER]: No information about asset {0} received", uuid);
-    
+
                     if (++i >= MAX_UUID_DISPLAY_ON_TIMEOUT)
                         break;
                 }
-    
+
                 if (uuids.Count > MAX_UUID_DISPLAY_ON_TIMEOUT)
                     m_log.ErrorFormat(
                         "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
@@ -251,24 +251,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void AssetRequestCallback(string id, object sender, AssetBase asset)
         {
             Culture.SetCurrentCulture();
-            
+
             try
             {
                 lock (this)
                 {
                     //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
-                    
+
                     m_requestCallbackTimer.Stop();
-                    
+
                     if ((m_requestState == RequestState.Aborted) || (m_requestState == RequestState.Completed))
                     {
                         m_log.WarnFormat(
-                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.", 
+                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.",
                             id, m_requestState);
 
                         return;
                     }
-                                                           
+
                     if (asset != null)
                     {
 //                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
                         m_notFoundAssetUuids.Add(new UUID(id));
                     }
-        
+
                     if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count >= m_repliesRequired)
                     {
                         m_requestState = RequestState.Completed;
@@ -294,8 +294,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                     "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
                             m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
 
-                        
-                        // We want to stop using the asset cache thread asap 
+
+                        // We want to stop using the asset cache thread asap
                         // as we now need to do the work of producing the rest of the archive
                         WorkManager.RunInThread(PerformAssetsRequestCallback, false, "Archive Assets Request Callback");
                     }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
index e2222fe..809d863 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             string regionDirectory = parts[1];
             relativePath = parts[2];
-            
+
             RegionInfo region;
             if (m_directory2region.TryGetValue(regionDirectory, out region))
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index caa22f7..6885299 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -65,9 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         protected SerialiserModule m_serialiserModule;
 
         protected TaskInventoryItem m_soundItem;
-        
+
         private  AutoResetEvent m_oarEvent = new AutoResetEvent(false);
-        
+
         [SetUp]
         public override void SetUp()
         {
@@ -89,10 +89,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
-                m_oarEvent.Set();                
+                m_oarEvent.Set();
             }
         }
-        
+
         private void SaveCompleted(Guid requestId, string errorMessage)
         {
             lock (this)
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on SaveCompleted");
-                 m_oarEvent.Set(); 
+                 m_oarEvent.Set();
             }
         }
 
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
         }
-       
+
         private void CreateTestObjects(Scene scene, out SceneObjectGroup sog1, out SceneObjectGroup sog2, out UUID ncAssetUuid)
         {
             SceneObjectPart part1 = CreateSceneObjectPart1();
@@ -200,10 +200,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId);
             //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
             //while (assetServer.HasWaitingRequests())
-            //    assetServer.ProcessNextRequest();              
+            //    assetServer.ProcessNextRequest();
 
             m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
 
             bool gotNcAssetFile = false;
-            
+
             string expectedNcAssetFileName = string.Format("{0}_{1}", ncAssetUuid, "notecard.txt");
 
             List<string> foundPaths = new List<string>();
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -228,9 +228,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
@@ -276,10 +276,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -314,9 +314,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -345,11 +345,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             // Put in a random blank directory to check that this doesn't upset the load process
             tar.WriteDir("ignoreme");
-            
-            // Also check that direct entries which will also have a file entry containing that directory doesn't 
+
+            // Also check that direct entries which will also have a file entry containing that directory doesn't
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
 
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
                 part1.UUID);
             tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -400,9 +400,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
- 
+
             Assert.That(m_lastErrorMessage, Is.Null);
 
             TestLoadedRegion(part1, soundItemName, soundData);
@@ -475,31 +475,31 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
             UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
             UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
-            
+
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(
-                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });               
-            
+                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
@@ -529,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene2.EventManager.OnOarFileLoaded += LoadCompleted;
                 m_oarEvent.Reset();
                 archiverModule.DearchiveRegion(archiveReadStream);
-                
+
                  m_oarEvent.WaitOne(60000);
 
                 Assert.That(m_lastErrorMessage, Is.Null);
@@ -557,16 +557,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             MockGroupsServicesConnector groupsService = new MockGroupsServicesConnector();
 
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Groups");            
+            IConfig config = configSource.AddConfig("Groups");
             config.Set("Enabled", true);
-            config.Set("Module", "GroupsModule");            
+            config.Set("Module", "GroupsModule");
             config.Set("DebugEnabled", true);
             SceneHelpers.SetupSceneModules(
                 m_scene, configSource, new object[] { new GroupsModule(), groupsService, new LandManagementModule() });
 
             // Create group in scene for loading
             // FIXME: For now we'll put up with the issue that we'll get a group ID that varies across tests.
-            UUID groupID 
+            UUID groupID
                 = groupsService.CreateGroup(UUID.Zero, "group1", "", true, UUID.Zero, 3, true, true, true, UUID.Zero);
 
             // Construct OAR
@@ -594,7 +594,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(oarStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16);
@@ -617,7 +617,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
 
             tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -666,9 +666,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastErrorMessage, Is.Null);
             RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings;
 
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.AreEqual(UUID.Zero, loadedRs.TelehubObject); // because no object was found with the original UUID
             Assert.AreEqual(0, loadedRs.SpawnPoints().Count);
         }
-        
+
         /// <summary>
         /// Test merging an OpenSim Region Archive into an existing scene
         /// </summary>
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
                 m_oarEvent.Reset();
                 m_archiverModule.ArchiveRegion(archiveWriteStream);
-                
+
                  m_oarEvent.WaitOne(60000);
             }
 
@@ -758,7 +758,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 archiveOptions.Add("merge", null);
                 m_oarEvent.Reset();
                 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
-                
+
                 m_oarEvent.WaitOne(60000);
 
                 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
@@ -819,7 +819,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                     SceneObjectGroup sog1;
                     SceneObjectGroup sog2;
                     UUID ncAssetUuid;
-                    
+
                     CreateTestObjects(scene, out sog1, out sog2, out ncAssetUuid);
 
                     expectedPaths[scene.RegionInfo.RegionID] = new List<string>();
@@ -841,7 +841,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
-            
+
              m_oarEvent.WaitOne(60000);
 
 
@@ -993,7 +993,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.Close();
 
-            
+
             // Delete the current objects, to test that they're loaded from the OAR and didn't
             // just remain in the scene.
             m_sceneHelpers.SceneManager.ForEachScene(delegate(Scene scene)
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastErrorMessage, Is.Null);
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
index 617c348..a450dd6 100644
--- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
+++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.CoreModules.World
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CloudModule")]
     public class CloudModule : ICloudModule, INonSharedRegionModule
     {
-//        private static readonly log4net.ILog m_log 
+//        private static readonly log4net.ILog m_log
 //            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private uint m_frame = 0;
         private int m_frameUpdateRate = 1000;
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World
                     columnRight = 0;
                     columnLeft = x - 1;
                 }
-                else 
+                else
                 {
                     columnRight = x + 1;
                     columnLeft = x - 1;
@@ -185,14 +185,14 @@ namespace OpenSim.Region.CoreModules.World
                         rowAbove = y + 1;
                         rowBelow = y - 1;
                     }
-                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] + 
-                                             cloudCover[y * 16 + columnLeft] + 
-                                             cloudCover[rowAbove * 16 + columnLeft] + 
-                                             cloudCover[rowBelow * 16 + x] + 
-                                             cloudCover[rowAbove * 16 + x] + 
-                                             cloudCover[rowBelow * 16 + columnRight] + 
-                                             cloudCover[y * 16 + columnRight] + 
-                                             cloudCover[rowAbove * 16 + columnRight] + 
+                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] +
+                                             cloudCover[y * 16 + columnLeft] +
+                                             cloudCover[rowAbove * 16 + columnLeft] +
+                                             cloudCover[rowBelow * 16 + x] +
+                                             cloudCover[rowAbove * 16 + x] +
+                                             cloudCover[rowBelow * 16 + columnRight] +
+                                             cloudCover[y * 16 + columnRight] +
+                                             cloudCover[rowAbove * 16 + columnRight] +
                                              cloudCover[y * 16 + x]) / 9;
                     newCover[y * 16 + x] = ((neighborAverage / m_cloudDensity) + 0.175f) % 1.0f;
                     newCover[y * 16 + x] *= m_cloudDensity;
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World
             Array.Copy(newCover, cloudCover, 16 * 16);
             m_dataVersion++;
         }
-  
+
         private void CloudUpdate()
         {
             if ((!m_ready ||  m_busy || m_cloudDensity == 0 ||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World
             }
         }
 
-       
+
         /// <summary>
         /// Calculate the cloud cover over the region.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index ad561fd..051ff71 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 foreach (Scene s in m_EstateModule.Scenes)
                 {
-                    RegionInfo sreg = s.RegionInfo;  
+                    RegionInfo sreg = s.RegionInfo;
                     if (regions.Contains(sreg.RegionID))
                     {
                         string url = sreg.ExternalHostName + ":" + sreg.HttpPort;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 702b503..7879f83 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -49,18 +49,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
     public class EstateManagementCommands
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected EstateManagementModule m_module;
 
         public EstateManagementCommands(EstateManagementModule module)
         {
             m_module = module;
         }
-        
+
         public void Initialise()
-        {            
+        {
 //            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
-            
+
             m_module.Scene.AddCommand("Regions", m_module, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
                                "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " +
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             m_module.Scene.AddCommand("Regions", m_module, "set water height",
                                "set water height <height> [<x>] [<y>]",
-                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + 
+                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " +
                                "Specify -1 in <x> or <y> to wildcard that coordinate.",
                                consoleSetWaterHeight);
 
             m_module.Scene.AddCommand(
                 "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand);
         }
-        
+
         public void Close() {}
 
         #region CommandHandlers
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected void consoleSetWaterHeight(string module, string[] args)
         {
             string heightstring = args[3];
-           
+
             int x = (args.Length > 4 ? int.Parse(args[4]) : -1);
             int y = (args.Length > 5 ? int.Parse(args[5]) : -1);
 
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " +
                                 string.Format(" {0}", selectedheight));
                     m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight;
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
+        }
         protected void consoleSetTerrainHeights(string module, string[] args)
         {
             string num = args[3];
@@ -198,31 +198,31 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
-        
+        }
+
         protected void ShowEstatesCommand(string module, string[] cmd)
         {
-            StringBuilder report = new StringBuilder();  
+            StringBuilder report = new StringBuilder();
             RegionInfo ri = m_module.Scene.RegionInfo;
             EstateSettings es = ri.EstateSettings;
-            
-            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);            
+
+            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);
             report.AppendFormat(
                 "{0,-20} {1,-7} {2,-20}\n",
                 "Estate Name",
                 "ID",
                 "Owner");
-            
+
             report.AppendFormat(
-                "{0,-20} {1,-7} {2,-20}\n", 
+                "{0,-20} {1,-7} {2,-20}\n",
                 es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner));
-            
+
             MainConsole.Instance.Output(report.ToString());
         }
         #endregion
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index efd4ca6..3c45b68 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
-        
-        protected EstateManagementCommands m_commands;                
+
+        protected EstateManagementCommands m_commands;
 
         /// <summary>
         /// If false, region restart requests from the client are blocked even if they are otherwise legitimate.
@@ -77,12 +77,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private int m_delayCount = 0;
 
         #region Region Module interface
-        
+
         public string Name { get { return "EstateManagementModule"; } }
-        
-        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(IConfigSource source) 
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void Initialise(IConfigSource source)
         {
             AllowRegionRestartFromClient = true;
 
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (config != null)
                 AllowRegionRestartFromClient = config.GetBoolean("AllowRegionRestartFromClient", true);
         }
-        
+
         public void AddRegion(Scene scene)
         {
             Scene = scene;
@@ -108,19 +108,19 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
             m_regionChangeTimer.AutoReset = false;
         }
-        
-        public void RemoveRegion(Scene scene) {}            
-        
+
+        public void RemoveRegion(Scene scene) {}
+
         public void RegionLoaded(Scene scene)
         {
             // Sets up the sun module based no the saved Estate and Region Settings
             // DO NOT REMOVE or the sun will stop working
             scene.TriggerEstateSunUpdate();
-            
-            UserManager = scene.RequestModuleInterface<IUserManagement>();            
+
+            UserManager = scene.RequestModuleInterface<IUserManagement>();
         }
 
-        public void Close() 
+        public void Close()
         {
             m_commands.Close();
         }
@@ -486,7 +486,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if((byte)maxAgents <= Scene.RegionInfo.AgentCapacity)
                 Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
-                        else
+            else
                 Scene.RegionInfo.RegionSettings.AgentLimit = Scene.RegionInfo.AgentCapacity;
 
             Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
@@ -640,7 +640,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
 
                 m_log.InfoFormat(
-                    "User {0} requested restart of region {1} in {2} seconds", 
+                    "User {0} requested restart of region {1} in {2} seconds",
                     remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
             }
         }
@@ -648,9 +648,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void handleChangeEstateCovenantRequest(IClientAPI remoteClient, UUID estateCovenantID)
         {
 //            m_log.DebugFormat(
-//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}", 
+//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}",
 //                remoteClient.Name, estateCovenantID);
-            
+
             Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID;
             Scene.RegionInfo.RegionSettings.CovenantChangedDateTime = Util.UnixTimeSinceEpoch();
             Scene.RegionInfo.RegionSettings.Save();
@@ -694,7 +694,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             }
         }
- 
+
         private void execDeltaRequests(object o)
         {
             IClientAPI remote_client;
@@ -720,23 +720,23 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if(!Scene.IsRunning)
                     break;
 
-                if(req == null) 
+                if(req == null)
                 {
                     if(changed.Count > 0)
                     {
                         foreach(EstateSettings est in changed.Values)
                             Scene.EstateDataService.StoreEstateSettings(est);
-                            
+
                         TriggerEstateInfoChange();
                     }
-                        
+
                     EstateSettings es = Scene.RegionInfo.EstateSettings;
                     foreach(KeyValuePair<IClientAPI,UUID> kvp in sendAllowedOrBanList)
                     {
                         IClientAPI cli = kvp.Key;
                         UUID invoive = kvp.Value;
                         cli.SendEstateList(invoive, (int)Constants.EstateAccessCodex.AllowedAccess, es.EstateAccess, es.EstateID);
-                        cli.SendBannedUserList(invoive, es.EstateBans, es.EstateID);                       
+                        cli.SendBannedUserList(invoive, es.EstateBans, es.EstateID);
                     }
                     sendAllowedOrBanList.Clear();
 
@@ -777,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 bool doOtherEstates = ((estateAccessType & 3) != 0);
 
                 EstateSettings thisSettings = Scene.RegionInfo.EstateSettings;
-                int thisEstateID =(int)thisSettings.EstateID; 
+                int thisEstateID =(int)thisSettings.EstateID;
 
                 UUID agentID = remote_client.AgentId;
 
@@ -811,7 +811,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     }
                     estateIDs.Clear();
                 }
-                
+
                 // the commands
                 // first the ones allowed for estate managers on this region
                 if ((estateAccessType & 4) != 0) // User add
@@ -1020,7 +1020,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                         }
                     }
-                    
+
                     if (alreadyInList && listitem != null)
                     {
                         if (doOtherEstates) // All estates
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                 if(!isadmin && !estateSettings.IsEstateOwner(agentID)) // redundante check?
                                     continue;
                                 if(estateSettings.EstateManagersCount() >= (int)Constants.EstateAccessLimits.EstateManagers)
-                                    continue;                           
+                                    continue;
                                 estateSettings.AddEstateManager(user);
                                 changed[(int)estateSettings.EstateID] = estateSettings;
                             }
@@ -1158,7 +1158,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
             IDialogModule dm = Scene.RequestModuleInterface<IDialogModule>();
-            
+
             if (dm != null)
                 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
         }
@@ -1249,7 +1249,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             });
         }
-        
+
         private void AbortTerrainXferHandler(IClientAPI remoteClient, ulong XferID)
         {
             lock (this)
@@ -1332,7 +1332,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if (TerrainUploader == null)
                 {
                     m_log.DebugFormat(
-                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}", 
+                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}",
                         Scene.Name, remote_client.Name);
 
                     TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
@@ -1352,7 +1352,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             // Save terrain here
             ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>();
-            
+
             if (terr != null)
             {
 //                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index fb4d04f..f3c8aa8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected List<Scene> m_Scenes = new List<Scene>();
         protected bool m_InInfoUpdate = false;
         private string token = "7db8eh2gvgg45jj";
-                protected bool m_enabled = false;
+        protected bool m_enabled = false;
 
         public bool InInfoUpdate
         {
@@ -74,19 +74,19 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IConfig estateConfig = config.Configs["Estates"];
             if (estateConfig != null)
             {
-                                if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
-                                        m_enabled = true;
-                                else
-                                        return;
+                if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
+                    m_enabled = true;
+                else
+                    return;
 
                 port = (uint)estateConfig.GetInt("Port", 0);
                 // this will need to came from somewhere else
                 token = estateConfig.GetString("Token", token);
             }
-                        else
-                        {
-                                m_enabled = true;
-                        }
+            else
+            {
+                m_enabled = true;
+            }
 
             m_EstateConnector = new EstateConnector(this, token, port);
 
@@ -108,8 +108,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void AddRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             lock (m_Scenes)
                 m_Scenes.Add(scene);
@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void RegionLoaded(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             IEstateModule em = scene.RequestModuleInterface<IEstateModule>();
 
@@ -131,8 +131,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void RemoveRegion(Scene scene)
         {
-                        if (!m_enabled)
-                                return;
+            if (!m_enabled)
+                return;
 
             lock (m_Scenes)
                 m_Scenes.Remove(scene);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 9de88d9..e4c0373 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public const int LAND_SELECT_OBJECTS_GROUP = 4;
         public const int LAND_SELECT_OBJECTS_OTHER = 8;
 
-        
+
         public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
         // types 1 to 7 are exclusive
         public const byte LAND_TYPE_OWNED_BY_OTHER = 1; //Equals 00000001
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         #endregion
 
         private readonly Scene m_scene;
-        private readonly LandManagementModule m_landManagementModule;        
+        private readonly LandManagementModule m_landManagementModule;
 
         public LandChannel(Scene scene, LandManagementModule landManagementMod)
         {
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x_float, y_float);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x, y);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             return new List<ILandObject>();
         }
-        
+
         public void Clear(bool setupDefaultParcel)
         {
             if (m_landManagementModule != null)
@@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landManagementModule.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
             }
         }
-        
+
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
             if (m_landManagementModule != null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 22bc49e..63b8de0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -52,7 +52,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.Land
 {
     // used for caching
-    internal class ExtendedLandData 
+    internal class ExtendedLandData
     {
         public LandData LandData;
         public ulong RegionHandle;
@@ -151,9 +151,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd;
             m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate;
-            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;            
+            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;
             m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate;
-            
+
             m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel;
             m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement;
             m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy;
@@ -163,14 +163,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement;
             m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage;
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
-            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
+            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
-           
+
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
             }
-            
+
             RegisterCommands();
         }
 
@@ -183,8 +183,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
-            // TODO: Release event manager listeners here      
+        {
+            // TODO: Release event manager listeners here
         }
 
 //        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 //            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
 //            reason = "You are not allowed to enter this sim.";
 //            return nearestParcel != null;
-//        }     
+//        }
 
         void EventManagerOnNewClient(IClientAPI client)
         {
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
             }
         }
-        
+
         /// <summary>
         /// Create a default parcel that spans the entire region and is owned by the estate owner.
         /// </summary>
@@ -360,7 +360,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     return false;
                 }
             }
-     
+
             if(ban)
             {
                 if (!forcedPosition.Contains(avatar.UUID))
@@ -581,13 +581,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Adds a land object to the stored list and adds them to the landIDList to what they own
         /// </summary>
         /// <param name="new_land">
-        /// The land object being added.  
+        /// The land object being added.
         /// Will return null if this overlaps with an existing parcel that has not had its bitmap adjusted.
         /// </param>
         public ILandObject AddLandObject(ILandObject land)
         {
             ILandObject new_land = land.Copy();
-            
+
             // Only now can we add the prim counts to the land object - we rely on the global ID which is generated
             // as a random UUID inside LandData initialization
             if (m_primCountModule != null)
@@ -607,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
                 else
                 {
-                    // If other land objects still believe that they occupy any parts of the same space, 
+                    // If other land objects still believe that they occupy any parts of the same space,
                     // then do not allow the add to proceed.
                     for (int x = 0; x < landBitmap.GetLength(0); x++)
                     {
@@ -642,7 +642,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             if (landBitmap[x, y])
                             {
                                 //                            m_log.DebugFormat(
-                                //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
+                                //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}",
                                 //                                new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
 
                                 m_landIDList[x, y] = newLandLocalID;
@@ -690,10 +690,10 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             m_scene.EventManager.TriggerLandObjectRemoved(land.LandData.GlobalID);
         }
-        
+
         /// <summary>
         /// Clear the scene of all parcels
-        /// </summary>        
+        /// </summary>
         public void Clear(bool setupDefaultParcel)
         {
             Dictionary<int, ILandObject> landworkList;
@@ -1077,7 +1077,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if(maxindex < 0 || selectedLandObjects.Count < 2)
                 return;
-            
+
             ILandObject masterLandObject = selectedLandObjects[maxindex];
             selectedLandObjects.RemoveAt(maxindex);
 
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                     if (currentParcelBlock != null)
                     {
-                        // types 
+                        // types
                         if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
                         {
                             //Owner Flag
@@ -1165,7 +1165,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         }
                         else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
                         {
-                            //Public type 
+                            //Public type
                             tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
                         }
                         // LAND_TYPE_IS_BEING_AUCTIONED still unsuported
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.GroupID = UUID.Zero;
                     land.LandData.IsGroupOwned = false;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-                    
+
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
                     UpdateLandObject(land.LandData.LocalID, land.LandData);
@@ -1584,7 +1584,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
 
-            new_land.SetLandBitmapFromByteArray();            
+            new_land.SetLandBitmapFromByteArray();
             AddLandObject(new_land);
 //            new_land.SendLandUpdateToAvatarsOverMe();
         }
@@ -1599,7 +1599,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     m_landList.TryGetValue(localID, out selectedParcel);
                 }
 
-                if (selectedParcel == null) 
+                if (selectedParcel == null)
                     return;
 
                 selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient);
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
         {
             IClientAPI client;
-            if (!m_scene.TryGetClient(agentID, out client)) 
+            if (!m_scene.TryGetClient(agentID, out client))
             {
                 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID);
                 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
@@ -1765,7 +1765,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land != null)
             {
-                UpdateLandProperties(land,land_update, client);               
+                UpdateLandProperties(land,land_update, client);
                 m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(land_update, parcelID, client);
             }
             else
@@ -2103,7 +2103,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             targetAvatar.TeleportWithMomentum(pos, null);
             targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
             parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-            
+
             if ((flags & 1) != 0) // Ban TODO: Remove magic number
             {
                 LandAccessEntry entry = new LandAccessEntry();
@@ -2144,7 +2144,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (// Required: local user; foreign users cannot set home
                 m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
                 (// (a) gods and land managers can set home
-                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) ||
                  m_scene.Permissions.IsGod(remoteClient.AgentId) ||
                  // (b) land owners can set home
                  remoteClient.AgentId == land.LandData.OwnerID ||
@@ -2196,8 +2196,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                 "If no local land ID is given, then summary information about all the parcels is shown.\n"
                     + "If a local land ID is given then full information about that parcel is shown.",
                 HandleShowCommand);
-        }    
-        
+        }
+
         protected void HandleClearCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
@@ -2205,9 +2205,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             string response = MainConsole.Instance.CmdPrompt(
                 string.Format(
-                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name), 
+                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name),
                 "n");
-            
+
             if (response.ToLower() == "y")
             {
                 Clear(true);
@@ -2217,14 +2217,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.Name);
             }
-        }        
-        
+        }
+
         protected void HandleShowCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
                 return;
 
-            StringBuilder report = new StringBuilder(); 
+            StringBuilder report = new StringBuilder();
 
             if (args.Length <= 2)
             {
@@ -2240,7 +2240,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 ILandObject lo;
 
                 lock (m_landList)
-                { 
+                {
                     if (!m_landList.TryGetValue(landLocalId, out lo))
                     {
                         MainConsole.Instance.OutputFormat("No parcel found with local ID {0}", landLocalId);
@@ -2265,7 +2265,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
-            
+
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
@@ -2316,7 +2316,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("GroupID", ld.GroupID);
 
             cdl.AddRow("Status", ld.Status);
-            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);           
+            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);
 
             cdl.AddRow("Landing Type", (LandingType)ld.LandingType);
             cdl.AddRow("User Location", ld.UserLocation);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 4cbc8b8..fc2282d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             return free;
         }
 
-        protected LandData m_landData;        
+        protected LandData m_landData;
         public LandData LandData
         {
             get { return m_landData; }
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 else if(testpos.Y >= maxy)
                     return null;  // will never get there
             }
-            
+
             while(!LandBitmap[(int)testpos.X, (int)testpos.Y])
             {
                 testpos += direction;
@@ -278,14 +278,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
                 LandBitmap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
 
-            LandData = new LandData(); 
+            LandData = new LandData();
             LandData.OwnerID = owner_id;
             if (is_group_owned)
                 LandData.GroupID = owner_id;
             else
                 LandData.GroupID = UUID.Zero;
             LandData.IsGroupOwned = is_group_owned;
-            
+
             m_scene.EventManager.OnFrame += OnFrame;
         }
 
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         #region Member Functions
 
         #region General Functions
-        
+
         /// <summary>
         /// Checks to see if this land object contains a point
         /// </summary>
@@ -373,12 +373,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 if(simMax > m_scene.RegionInfo.ObjectCapacity)
                     simMax = m_scene.RegionInfo.ObjectCapacity;
-                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}", 
+                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
                  //    LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax, LandData.SimwidePrims);
                 return simMax;
             }
         }
-        
+
         #endregion
 
         #region Packet Request Handling
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     needOverlay = true;
 
                 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-                return true; 
+                return true;
             }
             return false;
         }
@@ -720,11 +720,11 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if(sp==null || !sp.isNPC)
                 return true;
-            
+
             INPC npccli = (INPC)sp.ControllingClient;
             if(npccli== null)
                 return true;
-            
+
             UUID owner = npccli.Owner;
 
             if(owner == UUID.Zero)
@@ -898,7 +898,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             // update use lists flags
             // rights already checked or we wont be here
             uint parcelflags = newData.Flags;
-            
+
             if((flags & (uint)AccessList.Access) != 0)
                     parcelflags |= (uint)ParcelFlags.UseAccessList;
             if((flags & (uint)AccessList.Ban) != 0)
@@ -1024,7 +1024,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 LandData.AABBMin = new Vector3(tx, ty, 0f);
             else
                 LandData.AABBMin = new Vector3(tx, ty, (float)m_scene.Heightmap[tx, ty]);
-               
+
             max_x++;
             tx = max_x * landUnit;
             if (tx > regionSizeX)
@@ -1042,7 +1042,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 LandData.AABBMax = new Vector3(tx, ty, 0f);
             else
                 LandData.AABBMax = new Vector3(tx, ty, (float)m_scene.Heightmap[tx - 1, ty - 1]);
-                
+
             LandData.Area = tempArea * landUnit * landUnit;
         }
 
@@ -1073,7 +1073,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             return GetSquareLandBitmap(0, 0, (int)m_scene.RegionInfo.RegionSizeX, (int) m_scene.RegionInfo.RegionSizeY, true);
         }
-        
+
         public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true)
         {
             // Empty bitmap for the whole region
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
         /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt</param>
         /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
-        /// <returns>New parcel bitmap</returns>       
+        /// <returns>New parcel bitmap</returns>
         public bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax)
         {
             // get the size of the incoming bitmaps
@@ -1409,7 +1409,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 // Importing land parcel data from an OAR where the source region is a different size to the dest region requires us
                 // to make a LandBitmap that's not derived from the current region's size. We use the LandData.Bitmap size in bytes
                 // to figure out what the OAR's region dimensions are. (Is there a better way to get the src region x and y from the OAR?)
-                // This method assumes we always will have square regions 
+                // This method assumes we always will have square regions
 
                 bitmapLen = LandData.Bitmap.Length;
                 xLen = (int)Math.Abs(Math.Sqrt(bitmapLen * 8));
@@ -1550,9 +1550,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 lock (primsOverMe)
                 {
 //                    m_log.DebugFormat(
-//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region", 
+//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region",
 //                        remote_client.Name, primsOverMe.Count);
-                    
+
                     try
                     {
                         foreach (SceneObjectGroup obj in primsOverMe)
@@ -1593,7 +1593,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public Dictionary<UUID, int> GetLandObjectOwners()
         {
             Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();
-            
+
             lock (primsOverMe)
             {
                 try
@@ -1669,7 +1669,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
 //            m_log.DebugFormat(
 //                "[LAND OBJECT]: Request to return objects in {0} from {1}", LandData.Name, remote_client.Name);
-            
+
             Dictionary<UUID,List<SceneObjectGroup>> returns = new Dictionary<UUID,List<SceneObjectGroup>>();
 
             lock (primsOverMe)
@@ -1752,7 +1752,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddPrimOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Adding scene object {0} {1} over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Add(obj);
         }
@@ -1760,13 +1760,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void RemovePrimFromOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Removing scene object {0} {1} from over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Remove(obj);
         }
 
         #endregion
-        
+
         /// <summary>
         /// Set the media url for this land parcel
         /// </summary>
@@ -1777,7 +1777,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
             SendLandUpdateToAvatarsOverMe();
         }
-        
+
         /// <summary>
         /// Set the music url for this land parcel
         /// </summary>
@@ -1824,7 +1824,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 LandData.ParcelAccessList.Remove(entry);
                 ScenePresence presence;
-                
+
                 if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent))
                 {
                     ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 771fdd2..857f919 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -69,11 +69,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// For now, a simple simwide taint to get this up. Later parcel based
         /// taint to allow recounting a parcel if only ownership has changed
         /// without recounting the whole sim.
-        /// 
+        ///
         /// We start out tainted so that the first get call resets the various prim counts.
         /// </value>
         private bool m_Tainted = true;
-        
+
         private Object m_TaintLock = new Object();
 
         public Type ReplaceableInterface
@@ -88,10 +88,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddRegion(Scene scene)
         {
             m_Scene = scene;
-            
+
             m_Scene.RegisterModuleInterface<IPrimCountModule>(this);
 
-            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;            
+            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;
             m_Scene.EventManager.OnObjectBeingRemovedFromScene +=
                     OnObjectBeingRemovedFromScene;
             m_Scene.EventManager.OnParcelPrimCountTainted +=
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
+        {
         }
 
         public void Close()
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     AddObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", 
+//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted",
 //                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
@@ -140,16 +140,16 @@ namespace OpenSim.Region.CoreModules.World.Land
                     RemoveObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted", 
-//                        obj.Name, m_Scene.RegionInfo.RegionName);                
+//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted",
+//                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
 
         private void OnParcelPrimCountTainted()
         {
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);            
-            
+//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);
+
             lock (m_TaintLock)
                 m_Tainted = true;
         }
@@ -174,33 +174,33 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // NOTE: Call under Taint Lock
         private void AddObject(SceneObjectGroup obj)
-        {                       
+        {
             if (obj.IsAttachment)
                 return;
             if (((obj.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0))
-                return;                       
+                return;
 
             Vector3 pos = obj.AbsolutePosition;
             ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
-            
+
             // If for some reason there is no land object (perhaps the object is out of bounds) then we can't count it
             if (landObject == null)
             {
 //                m_log.WarnFormat(
-//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}", 
+//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}",
 //                    obj.Name, pos.X, pos.Y, m_Scene.RegionInfo.RegionName);
-                
+
                 return;
             }
-            
+
             LandData landData = landObject.LandData;
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}", 
-//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);                        
-            
+//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}",
+//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}", 
+//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}",
 //                obj.Name, obj.OwnerID, landData.OwnerID);
 
             ParcelCounts parcelCounts;
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 if (obj.IsSelected)
                 {
-                    parcelCounts.Selected += partCount;                
+                    parcelCounts.Selected += partCount;
                 }
                 else
                 {
@@ -244,8 +244,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         // NOTE: Call under Taint Lock
         private void RemoveObject(SceneObjectGroup obj)
         {
-//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);            
-            
+//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);
+
             // Currently this is being done by tainting the count instead.
         }
 
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
 //            m_log.DebugFormat(
 //                "[PRIM COUNT MODULE]: GetPrimCounts for parcel {0} in {1}", parcelID, m_Scene.RegionInfo.RegionName);
-            
+
             PrimCounts primCounts;
 
             lock (m_PrimCounts)
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             return primCounts;
         }
 
-        
+
         /// <summary>
         /// Get the number of prims on the parcel that are owned by the parcel owner.
         /// </summary>
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public int GetOwnerCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -286,11 +286,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Owner;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -298,11 +298,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that have been set to the group that owns the parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public int GetGroupCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -312,11 +312,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Group;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -324,11 +324,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that are not owned by the parcel owner or set to the parcel group.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>                
+        /// <returns></returns>
         public int GetOthersCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -338,23 +338,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Others;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the number of selected prims.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         public int GetSelectedCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -364,24 +364,24 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Selected;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the total count of owner, group and others prims on the parcel.
-        /// FIXME: Need to do selected prims once this is reimplemented.   
+        /// FIXME: Need to do selected prims once this is reimplemented.
         /// </summary>
         /// <param name="parcelID"></param>
         /// <returns></returns>
         public int GetTotalCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -396,28 +396,28 @@ namespace OpenSim.Region.CoreModules.World.Land
                     count += counts.Selected;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
-            return count;            
+
+            return count;
         }
 
         /// <summary>
         /// Get the number of prims that are in the entire simulator for the owner of this parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>              
+        /// <returns></returns>
         public int GetSimulatorCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
                     Recount();
-                
+
                 UUID owner;
                 if (m_OwnerMap.TryGetValue(parcelID, out owner))
                 {
@@ -426,11 +426,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                         count = val;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -439,11 +439,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="parcelID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>          
+        /// <returns></returns>
         public int GetUserCount(UUID parcelID, UUID userID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -459,9 +459,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
 
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}", 
+//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}",
 //                userID, parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -469,13 +469,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void Recount()
         {
 //            m_log.DebugFormat("[PRIM COUNT MODULE]: Recounting prims on {0}", m_Scene.RegionInfo.RegionName);
-            
+
             m_OwnerMap.Clear();
             m_SimwideCounts.Clear();
             m_ParcelCounts.Clear();
 
             List<ILandObject> land = m_Scene.LandChannel.AllParcels();
-            
+
             foreach (ILandObject l in land)
             {
                 LandData landData = l.LandData;
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_OwnerMap[landData.GlobalID] = landData.OwnerID;
                 m_SimwideCounts[landData.OwnerID] = 0;
 //                m_log.DebugFormat(
-//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}", 
+//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}",
 //                    landData.Name, m_Scene.RegionInfo.RegionName);
                 m_ParcelCounts[landData.GlobalID] = new ParcelCounts();
             }
@@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         m_PrimCounts.Remove(k);
                 }
             }
-            
+
             m_Tainted = false;
         }
     }
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetOthersCount(m_ParcelID);
             }
         }
-        
+
         public int Selected
         {
             get
@@ -549,7 +549,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetSelectedCount(m_ParcelID);
             }
         }
-        
+
         public int Total
         {
             get
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
index 4ed67f3..d6a3ded 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             // TODO: Should add asserts to check that land object was added properly.
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
             }
 
             {
@@ -88,8 +88,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
 
@@ -115,8 +115,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -149,8 +149,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
             Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
 
-            ILandObject loAtCoord2 
+            ILandObject loAtCoord2
                 = lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
             Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
             Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
@@ -198,8 +198,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
             }
 
             {
@@ -239,21 +239,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
 
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));
             }
 
             {
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 949acb6..0d8ece7 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -43,21 +43,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
     public class PrimCountModuleTests : OpenSimTestCase
     {
         protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
-        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");        
-        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");        
+        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");
+        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");
         protected TestScene m_scene;
         protected PrimCountModule m_pcm;
-        
+
         /// <summary>
         /// A parcel that covers the entire sim except for a 1 unit wide strip on the eastern side.
         /// </summary>
         protected ILandObject m_lo;
-        
+
         /// <summary>
         /// A parcel that covers just the eastern strip of the sim.
         /// </summary>
-        protected ILandObject m_lo2;        
-            
+        protected ILandObject m_lo2;
+
         [SetUp]
         public override void SetUp()
         {
@@ -65,24 +65,24 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             m_pcm = new PrimCountModule();
             LandManagementModule lmm = new LandManagementModule();
-            m_scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);             
-                        
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
+
             int xParcelDivider = (int)Constants.RegionSize - 1;
-            
+
             ILandObject lo = new LandObject(m_userId, false, m_scene);
             lo.LandData.Name = "m_lo";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, xParcelDivider, (int)Constants.RegionSize));
-            m_lo = lmm.AddLandObject(lo);          
-            
+            m_lo = lmm.AddLandObject(lo);
+
             ILandObject lo2 = new LandObject(m_userId, false, m_scene);
             lo2.SetLandBitmap(
                 lo2.GetSquareLandBitmap(xParcelDivider, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
             lo2.LandData.Name = "m_lo2";
             m_lo2 = lmm.AddLandObject(lo2);
-        } 
-        
+        }
+
         /// <summary>
         /// Test that counts before we do anything are correct.
         /// </summary>
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestInitialCounts()
         {
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -98,9 +98,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(0));              
-        }            
-        
+            Assert.That(pc.Simulator, Is.EqualTo(0));
+        }
+
         /// <summary>
         /// Test count after a parcel owner owned object is added.
         /// </summary>
@@ -108,13 +108,13 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestAddOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;         
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));            
-            
+            Assert.That(pc.Simulator, Is.EqualTo(3));
+
             // Add a second object and retest
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
             Assert.That(pc.Owner, Is.EqualTo(5));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(5));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(5));              
+            Assert.That(pc.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned copied object is added.
         /// </summary>
@@ -145,14 +145,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestCopyOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
+//            log4net.Config.XmlConfigurator.Configure();
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity); 
-            
+            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity);
+
             Assert.That(pc.Owner, Is.EqualTo(6));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(6));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(6));              
-        }     
-        
+            Assert.That(pc.Simulator, Is.EqualTo(6));
+        }
+
         /// <summary>
         /// Test that parcel counts update correctly when an object is moved between parcels, where that movement
         /// is not done directly by the user/
@@ -171,18 +171,18 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestMoveOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                                          
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
-            // Move the first scene object to the eastern strip parcel           
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
+            // Move the first scene object to the eastern strip parcel
             sog.AbsolutePosition = new Vector3(254, 2, 2);
-            
-            IPrimCounts pclo1 = m_lo.PrimCounts;         
-            
+
+            IPrimCounts pclo1 = m_lo.PrimCounts;
+
             Assert.That(pclo1.Owner, Is.EqualTo(2));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(2));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));                
-            
-            IPrimCounts pclo2 = m_lo2.PrimCounts;         
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
+            IPrimCounts pclo2 = m_lo2.PrimCounts;
+
             Assert.That(pclo2.Owner, Is.EqualTo(3));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -201,11 +201,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(3));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5)); 
-            
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
+
             // Now move it back again
-            sog.AbsolutePosition = new Vector3(2, 2, 2);   
-            
+            sog.AbsolutePosition = new Vector3(2, 2, 2);
+
             Assert.That(pclo1.Owner, Is.EqualTo(5));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(5));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));              
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
             Assert.That(pclo2.Owner, Is.EqualTo(0));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -222,9 +222,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(0));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5));             
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -233,14 +233,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(1));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -248,37 +248,37 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        } 
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestAddGroupObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-            
+//            log4net.Config.XmlConfigurator.Configure();
+
             m_lo.DeedToGroup(m_groupId);
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             sog.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(3));
             Assert.That(pc.Others, Is.EqualTo(0));
             Assert.That(pc.Total, Is.EqualTo(3));
             Assert.That(pc.Selected, Is.EqualTo(0));
-            
+
             // Is this desired behaviour?  Not totally sure.
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            
-            Assert.That(pc.Simulator, Is.EqualTo(3));             
+
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -287,19 +287,19 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             m_lo.DeedToGroup(m_groupId);
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             SceneObjectGroup sogToKeep = SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
-            sogToKeep.GroupID = m_groupId;            
+            sogToKeep.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sogToKeep, false);
-            
+
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(1));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -308,20 +308,20 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }        
-        
-        [Test]        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
+        [Test]
         public void TestAddOthersObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(3));
@@ -329,22 +329,22 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            Assert.That(pc.Simulator, Is.EqualTo(3));                          
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         [Test]
         public void TestRemoveOthersObject()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_otherUserId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_otherUserId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(1));
@@ -352,9 +352,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(1));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }           
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         /// <summary>
         /// Test the count is correct after is has been tainted.
         /// </summary>
@@ -363,12 +363,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
-            m_scene.AddNewSceneObject(sog, false); 
-            
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+            m_scene.AddNewSceneObject(sog, false);
+
             m_pcm.TaintPrimCount();
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -376,7 +376,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));              
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 1f2b7c4..b927cfa 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             string[] configSections = new string[] { "Map", "Startup" };
 
-            drawPrimVolume 
+            drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
-            textureTerrain 
+            textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
-            generateMaptiles 
+            generateMaptiles
                 = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles);
 
             if (generateMaptiles)
@@ -126,15 +126,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     catch (Exception)
                     {
                         m_log.ErrorFormat(
-                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 
+                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                         //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                         mapbmp = null;
                     }
 
-                    if (mapbmp != null) 
+                    if (mapbmp != null)
                         m_log.DebugFormat(
-                            "[MAPTILE]: Static map image texture file {0} found for {1}", 
+                            "[MAPTILE]: Static map image texture file {0} found for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                 }
             }
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             List<uint> z_localIDs = new List<uint>();
             Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
 
-            try 
+            try
             {
                 lock (objs)
                 {
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 0ec2053..4b3ee18 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             ManagedImage managedImage;
             Image image;
-            
+
             try
             {
                 if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 m_log.ErrorFormat("{0} OpenJpeg was unable to encode this.   Asset Data is empty for {1}", LogHeader, id);
             }
             return null;
-            
+
         }
 
         // Compute the average color of a texture.
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 46b0470..1070ae6 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
     public class MoapModule : INonSharedRegionModule, IMoapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public string Name { get { return "MoapModule"; } }
         public Type ReplaceableInterface { get { return null; } }
 
@@ -64,33 +64,33 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// Is this module enabled?
         /// </summary>
         protected bool m_isEnabled = true;
-        
+
         /// <summary>
         /// The scene to which this module is attached
         /// </summary>
         protected Scene m_scene;
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by agent.  Lock m_omCapUsers to manipulate.
         /// </summary>
         protected Dictionary<UUID, string> m_omCapUrls = new Dictionary<UUID, string>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omuCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by agent.  Lock m_omuCapUsers to manipulate
         /// </summary>
         protected Dictionary<UUID, string> m_omuCapUrls = new Dictionary<UUID, string>();
-        
-        public void Initialise(IConfigSource configSource) 
+
+        public void Initialise(IConfigSource configSource)
         {
             IConfig config = configSource.Configs["MediaOnAPrim"];
 
@@ -100,63 +100,63 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 //                m_log.Debug("[MOAP]: Initialised module.")l
         }
 
-        public void AddRegion(Scene scene) 
-        { 
+        public void AddRegion(Scene scene)
+        {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene = scene;
             m_scene.RegisterModuleInterface<IMoapModule>(this);
         }
 
         public void RemoveRegion(Scene scene) {}
 
-        public void RegionLoaded(Scene scene) 
+        public void RegionLoaded(Scene scene)
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy;
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy;
         }
-        
+
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat(
 //                "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID);
-            
+
             string omCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omCapUsers)
             {
                 m_omCapUsers[omCapUrl] = agentID;
                 m_omCapUrls[agentID] = omCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMedia",
                     new RestStreamHandler(
                         "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString()));
             }
-            
+
             string omuCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omuCapUsers)
             {
                 m_omuCapUsers[omuCapUrl] = agentID;
                 m_omuCapUrls[agentID] = omuCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMediaNavigate",
@@ -164,7 +164,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString()));
             }
         }
-        
+
         public void OnDeregisterCaps(UUID agentID, Caps caps)
         {
             lock (m_omCapUsers)
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omCapUrls.Remove(agentID);
                 m_omCapUsers.Remove(path);
             }
-            
+
             lock (m_omuCapUsers)
             {
                 string path = m_omuCapUrls[agentID];
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omuCapUsers.Remove(path);
             }
         }
-        
+
         protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
         {
             if (original.Shape.Media != null)
@@ -197,19 +197,19 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                             dupeMedia.Add(null);
                     }
                 }
-                
+
                 copy.Shape.Media = dupeMedia;
             }
         }
-            
+
         public MediaEntry GetMediaEntry(SceneObjectPart part, int face)
         {
             MediaEntry me = null;
-            
+
             CheckFaceParam(part, face);
-            
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
                 me = null;
@@ -218,17 +218,17 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             {
                 lock (media)
                     me = media[face];
-                
+
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
                 if (me != null)
                     me = MediaEntry.FromOSD(me.GetOSD());
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: GetMediaEntry for {0} face {1} found {2}", part.Name, face, me);
-            
+
             return me;
         }
-        
+
         /// <summary>
         /// Set the media entry on the face of the given part.
         /// </summary>
@@ -238,28 +238,28 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me)
         {
 //            m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face);
-            
+
             CheckFaceParam(part, face);
-            
+
             if (null == part.Shape.Media)
             {
                 if (me == null)
                     return;
-                else                            
+                else
                     part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
             }
 
             lock (part.Shape.Media)
-                part.Shape.Media[face] = me;                      
-            
+                part.Shape.Media[face] = me;
+
             UpdateMediaUrl(part, UUID.Zero);
-            
+
             SetPartMediaFlags(part, face, me != null);
-            
+
             part.ScheduleFullUpdate();
             part.TriggerScriptChangedEvent(Changed.MEDIA);
         }
-        
+
         /// <summary>
         /// Clear the media entry from the face of the given part.
         /// </summary>
@@ -267,9 +267,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// <param name="face"></param>
         public void ClearMediaEntry(SceneObjectPart part, int face)
         {
-            SetMediaEntry(part, face, null);            
+            SetMediaEntry(part, face, null);
         }
-        
+
         /// <summary>
         /// Set the media flags on the texture face of the given part.
         /// </summary>
@@ -284,9 +284,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             Primitive.TextureEntry te = part.Shape.Textures;
             Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
             teFace.MediaFlags = flag;
-            part.Shape.Textures = te;            
+            part.Shape.Textures = te;
         }
-        
+
         /// <summary>
         /// Sets or gets per face media textures.
         /// </summary>
@@ -300,11 +300,11 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request);
-         
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaMessage omm = new ObjectMediaMessage();
             omm.Deserialize(osd);
-            
+
             if (omm.Request is ObjectMediaRequest)
                 return HandleObjectMediaRequest(omm.Request as ObjectMediaRequest);
             else if (omm.Request is ObjectMediaUpdate)
@@ -312,10 +312,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 
             throw new Exception(
                 string.Format(
-                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}", 
+                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}",
                     omm.Request.GetType()));
         }
-        
+
         /// <summary>
         /// Handle a fetch request for media textures
         /// </summary>
@@ -324,36 +324,36 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaRequest(ObjectMediaRequest omr)
         {
             UUID primId = omr.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             ObjectMediaResponse resp = new ObjectMediaResponse();
-            
+
             resp.PrimID = primId;
-            
+
             lock (part.Shape.Media)
                 resp.FaceMedia = part.Shape.Media.ToArray();
-            
+
             resp.Version = part.MediaUrl;
-           
+
             string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize());
-            
+
 //            m_log.DebugFormat("[MOAP]: Got HandleObjectMediaRequestGet raw response is [{0}]", rawResp);
-            
+
             return rawResp;
         }
-        
+
         /// <summary>
         /// Handle an update of media textures.
         /// </summary>
@@ -363,46 +363,46 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaUpdate(string path, ObjectMediaUpdate omu)
         {
             UUID primId = omu.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId);
-//                       
+//
 //            for (int i = 0; i < omu.FaceMedia.Length; i++)
 //            {
 //                MediaEntry me = omu.FaceMedia[i];
 //                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
 //                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
 //            }
-            
+
             if (omu.FaceMedia.Length > part.GetNumberOfSides())
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.", 
+                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.",
                     omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omCapUsers)
-                agentId = m_omCapUsers[path]; 
-            
+                agentId = m_omCapUsers[path];
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
 //                m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name);
                 part.Shape.Media = new PrimitiveBaseShape.MediaList(omu.FaceMedia);
-                
+
                 for (int i = 0; i < omu.FaceMedia.Length; i++)
                 {
                     if (omu.FaceMedia[i] != null)
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         // directly.
                         SetPartMediaFlags(part, i, true);
 //                        m_log.DebugFormat(
-//                            "[MOAP]: Media flags for face {0} is {1}", 
+//                            "[MOAP]: Media flags for face {0} is {1}",
 //                            i, part.Shape.Textures.FaceTextures[i].MediaFlags);
                     }
                 }
@@ -420,15 +420,15 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             else
             {
 //                m_log.DebugFormat("[MOAP]: Setting existing media list for {0}", part.Name);
-                
-                // We need to go through the media textures one at a time to make sure that we have permission 
+
+                // We need to go through the media textures one at a time to make sure that we have permission
                 // to change them
-                
+
                 // FIXME: Race condition here since some other texture entry manipulator may overwrite/get
                 // overwritten.  Unfortunately, PrimitiveBaseShape does not allow us to change texture entry
                 // directly.
                 Primitive.TextureEntry te = part.Shape.Textures;
-                
+
                 lock (media)
                 {
                     for (int i = 0; i < media.Count; i++)
@@ -436,38 +436,38 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         if (m_scene.Permissions.CanControlPrimMedia(agentId, part.UUID, i))
                         {
                             media[i] = omu.FaceMedia[i];
-                            
+
                             // When a face is cleared this is done by setting the MediaFlags in the TextureEntry via a normal
                             // texture update, so we don't need to worry about clearing MediaFlags here.
                             if (null == media[i])
                                 continue;
-                            
+
                             SetPartMediaFlags(part, i, true);
-    
+
     //                        m_log.DebugFormat(
-    //                            "[MOAP]: Media flags for face {0} is {1}", 
+    //                            "[MOAP]: Media flags for face {0} is {1}",
     //                            i, face.MediaFlags);
     //                        m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name);
                         }
                     }
                 }
-                
+
                 part.Shape.Textures = te;
-                        
+
 //                for (int i2 = 0; i2 < part.Shape.Textures.FaceTextures.Length; i2++)
 //                    m_log.DebugFormat("[MOAP]: FaceTexture[{0}] is {1}", i2, part.Shape.Textures.FaceTextures[i2]);
             }
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
             // Arguably, we could avoid sending a full update to the avatar that just changed the texture.
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return string.Empty;
         }
-        
+
         /// <summary>
         /// Received from the viewer if a user has changed the url of a media texture.
         /// </summary>
@@ -481,71 +481,71 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request);
-            
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage();
             omn.Deserialize(osd);
-            
+
             UUID primId = omn.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omuCapUsers)
                 agentId = m_omuCapUsers[path];
-            
+
             if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face))
                 return string.Empty;
-            
+
 //            m_log.DebugFormat(
-//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", 
+//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}",
 //                omn.Face, part.Name, part.UUID, omn.URL);
-            
+
             // If media has never been set for this prim, then just return.
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             MediaEntry me = null;
-                
+
             lock (part.Shape.Media)
                 me = part.Shape.Media[omn.Face];
-            
+
             // Do the same if media has not been set up for a specific face
             if (null == me)
                 return string.Empty;
-            
+
             if (me.EnableWhiteList)
             {
                 if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList))
                 {
 //                    m_log.DebugFormat(
-//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", 
+//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist",
 //                        omn.Face, part.Name, part.UUID, omn.URL);
-                    
+
                     return string.Empty;
                 }
             }
-            
+
             me.CurrentURL = omn.URL;
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return OSDParser.SerializeLLSDXmlString(new OSD());
         }
-        
+
         /// <summary>
         /// Check that the face number is valid for the given prim.
         /// </summary>
@@ -555,13 +555,13 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         {
             if (face < 0)
                 throw new ArgumentException("Face cannot be less than zero");
-                               
+
             int maxFaces = part.GetNumberOfSides() - 1;
             if (face > maxFaces)
                 throw new ArgumentException(
                     string.Format("Face argument was {0} but max is {1}", face, maxFaces));
         }
-        
+
         /// <summary>
         /// Update the media url of the given part
         /// </summary>
@@ -583,10 +583,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 int version = int.Parse(rawVersion);
                 part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId);
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID);
         }
-        
+
         /// <summary>
         /// Check the given url against the given whitelist.
         /// </summary>
@@ -599,22 +599,22 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 return false;
 
             Uri url = new Uri(rawUrl);
-            
+
             foreach (string origWlUrl in whitelist)
             {
                 string wlUrl = origWlUrl;
-                
+
                 // Deal with a line-ending wildcard
                 if (wlUrl.EndsWith("*"))
                     wlUrl = wlUrl.Remove(wlUrl.Length - 1);
-                
+
 //                m_log.DebugFormat("[MOAP]: Checking whitelist URL pattern {0}", origWlUrl);
-                
+
                 // Handle a line starting wildcard slightly differently since this can only match the domain, not the path
                 if (wlUrl.StartsWith("*"))
                 {
                     wlUrl = wlUrl.Substring(1);
-                    
+
                     if (url.Host.Contains(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -624,7 +624,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 else
                 {
                     string urlToMatch = url.Authority + url.AbsolutePath;
-    
+
                     if (urlToMatch.StartsWith(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -632,7 +632,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                     }
                 }
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index ee57aed..7080705 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
     {
         protected TestScene m_scene;
         protected MoapModule m_module;
-            
+
         [SetUp]
         public override void SetUp()
         {
@@ -55,45 +55,45 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
 
             m_module = new MoapModule();
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, m_module);            
-        }        
-        
+            SceneHelpers.SetupSceneModules(m_scene, m_module);
+        }
+
         [Test]
         public void TestClearMediaUrl()
         {
-            TestHelpers.InMethod();           
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry();            
-            
+            MediaEntry me = new MediaEntry();
+
             m_module.SetMediaEntry(part, 1, me);
             m_module.ClearMediaEntry(part, 1);
-            
+
             Assert.That(part.Shape.Media[1], Is.EqualTo(null));
-            
+
             // Although we've cleared one face, other faces may still be present.  So we need to check for an
             // update media url version
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000001/" + UUID.Zero));
-            
+
             // By changing media flag to false, the face texture once again becomes identical to the DefaultTexture.
             // Therefore, when libOMV reserializes it, it disappears and we are left with no face texture in this slot.
             // Not at all confusing, eh?
             Assert.That(part.Shape.Textures.FaceTextures[1], Is.Null);
         }
-        
+
         [Test]
         public void TestSetMediaUrl()
         {
             TestHelpers.InMethod();
-            
-            string homeUrl = "opensimulator.org";            
-            
+
+            string homeUrl = "opensimulator.org";
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };            
-            
+            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };
+
             m_module.SetMediaEntry(part, 1, me);
-            
+
             Assert.That(part.Shape.Media[1].HomeURL, Is.EqualTo(homeUrl));
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000000/" + UUID.Zero));
             Assert.That(part.Shape.Textures.FaceTextures[1].MediaFlags, Is.True);
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 42141e4..b7f01be 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -49,34 +49,34 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
 
         protected Scene m_scene = null;
         protected IDialogModule m_dialogModule;
-        
+
         public string Name { get { return "Object BuySell Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IBuySellModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-        
-        public void RegionLoaded(Scene scene) 
+
+        public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
-        
+
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnObjectSaleInfo += ObjectSaleInfo;
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e53ab95..79c4713 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -53,30 +53,30 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")]
     public class ObjectCommandsModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
         private ICommandConsole m_console;
 
         public string Name { get { return "Object Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -539,13 +539,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName))
                 return;
-            
+
             using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8))
             {
                 xtw.Formatting = Formatting.Indented;
                 SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true);
             }
-            
+
             m_console.OutputFormat("Object dumped to file {0}", fileName);
         }
 
@@ -625,7 +625,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("FlexiSoftness", s.FlexiSoftness);
                 cdl.AddRow("HollowShape", s.HollowShape);
                 cdl.AddRow(
-                    "LightColor", 
+                    "LightColor",
                     string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA));
                 cdl.AddRow("LightCutoff", s.LightCutoff);
                 cdl.AddRow("LightEntry", s.LightEntry);
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("Rotation (World)", sop.GetWorldRotation());
                 cdl.AddRow("Scale", s.Scale);
                 cdl.AddRow(
-                    "SculptData", 
+                    "SculptData",
                     string.Format("{0} bytes", s.SculptData != null ? s.SculptData.Length.ToString() : "n/a"));
                 cdl.AddRow("SculptEntry", s.SculptEntry);
                 cdl.AddRow("SculptTexture", s.SculptTexture);
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
                 // TODO, need to display more information about textures but in a compact format
                 // to stop output becoming huge.
-                for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+                for (int i = 0; i < sop.GetNumberOfSides(); i++)
                 {
                     Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i];
 
@@ -765,12 +765,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.OwnerID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with owner {0}", match);
-        
+
                     break;
-        
+
                 case "creator":
                     if (!UUID.TryParse(o, out match))
                         return;
@@ -782,12 +782,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.RootPart.CreatorID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with creator {0}", match);
-        
+
                     break;
-        
+
                 case "id":
                     UUID uuid;
                     uint localId;
@@ -808,13 +808,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
-        
+
                     break;
-        
+
                 case "name":
                     deletes = GetDeleteCandidatesByName(module, cmd);
                     break;
-        
+
                 case "outside":
                     deletes = new List<SceneObjectGroup>();
 
@@ -822,7 +822,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     {
                         SceneObjectPart rootPart = g.RootPart;
                         bool delete = false;
-        
+
                         if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
                         {
                             delete = true;
@@ -831,18 +831,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         {
                             ILandObject parcel
                                 = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
-        
+
                             if (parcel == null || parcel.LandData.Name == "NO LAND")
                                 delete = true;
                         }
-        
+
                         if (delete && !g.IsAttachment && !deletes.Contains(g))
                             deletes.Add(g);
                     });
-        
+
                     if (deletes.Count == 0)
                         m_console.OutputFormat("No objects were found outside region bounds");
-        
+
                     break;
 
                 case "pos":
@@ -864,7 +864,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         "Are you sure that you want to delete {0} objects from {1}",
                         deletes.Count, m_scene.RegionInfo.RegionName),
                     "y/N");
-    
+
                 if (response.ToLower() != "y")
                 {
                     MainConsole.Instance.OutputFormat(
@@ -951,7 +951,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
                 endVector = Vector3.Zero;
-                
+
                 return false;
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 06900f0..1a61771 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
     public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         protected Scene m_scene;
         protected bool m_Enabled;
 
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private uint PERM_MOVE = (uint)524288;
         private uint PERM_TRANS = (uint)8192;
         private uint PERM_LOCKED = (uint)540672;
-        
+
         /// <value>
         /// Different user set names that come in from the configuration file.
         /// </value>
@@ -110,17 +110,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private UserSet m_allowedScriptCreators = UserSet.All;
 
         /// <value>
-        /// The set of users that are allowed to edit (save) scripts.  This is only active if 
+        /// The set of users that are allowed to edit (save) scripts.  This is only active if
         /// permissions are not being bypassed.  This overrides normal permissions.-
         /// </value>
         private UserSet m_allowedScriptEditors = UserSet.All;
-        
+
         private Dictionary<string, bool> GrantLSL = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantCS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantVB = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantJS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantYP = new Dictionary<string, bool>();
-        
+
         private IFriendsModule m_friendsModule;
         private IFriendsModule FriendsModule
         {
@@ -169,20 +169,20 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_Enabled = true;
 
             m_allowGridGods = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
             m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_RegionOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",
-                new string[] { "Startup", "Permissions" }, true); 
+                new string[] { "Startup", "Permissions" }, true);
             m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
             m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
                 new string[] { "Startup", "Permissions" }, false);
 
             m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
-                new string[] { "Startup", "Permissions" }, false); 
+                new string[] { "Startup", "Permissions" }, false);
 
             m_allowedScriptCreators
                 = ParseUserSetConfigSetting(config, "allowed_script_creators", m_allowedScriptCreators);
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
 
             grant = Util.GetConfigVarFromSections<string>(config, "GrantCS",
-                new string[] { "Startup", "Permissions" }, string.Empty); 
+                new string[] { "Startup", "Permissions" }, string.Empty);
             if (grant.Length > 0)
             {
                 foreach (string uuidl in grant.Split(','))
@@ -273,46 +273,46 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnIsAdministrator += IsAdministrator;
             m_scene.Permissions.OnIsEstateManager += IsEstateManager;
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnDeleteObject += CanDeleteObject; 
-            m_scene.Permissions.OnEditObject += CanEditObject; 
-            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties; 
+            m_scene.Permissions.OnDeleteObject += CanDeleteObject;
+            m_scene.Permissions.OnEditObject += CanEditObject;
+            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties;
             m_scene.Permissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; 
-            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; 
-            m_scene.Permissions.OnMoveObject += CanMoveObject; 
+            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer;
+            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand;
+            m_scene.Permissions.OnMoveObject += CanMoveObject;
             m_scene.Permissions.OnObjectEntry += CanObjectEntry;
-            m_scene.Permissions.OnReturnObjects += CanReturnObjects; 
-            m_scene.Permissions.OnRezObject += CanRezObject; 
+            m_scene.Permissions.OnReturnObjects += CanReturnObjects;
+            m_scene.Permissions.OnRezObject += CanRezObject;
             m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
-            m_scene.Permissions.OnRunScript += CanRunScript; 
+            m_scene.Permissions.OnRunScript += CanRunScript;
             m_scene.Permissions.OnCompileScript += CanCompileScript;
             m_scene.Permissions.OnSellParcel += CanSellParcel;
             m_scene.Permissions.OnTakeObject += CanTakeObject;
             m_scene.Permissions.OnSellGroupObject += CanSellGroupObject;
             m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
             m_scene.Permissions.OnTerraformLand += CanTerraformLand;
-            m_scene.Permissions.OnLinkObject += CanLinkObject; 
-            m_scene.Permissions.OnDelinkObject += CanDelinkObject; 
-            m_scene.Permissions.OnBuyLand += CanBuyLand; 
-            
-            m_scene.Permissions.OnViewNotecard += CanViewNotecard; 
-            m_scene.Permissions.OnViewScript += CanViewScript; 
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; 
-            m_scene.Permissions.OnEditScript += CanEditScript; 
-            
+            m_scene.Permissions.OnLinkObject += CanLinkObject;
+            m_scene.Permissions.OnDelinkObject += CanDelinkObject;
+            m_scene.Permissions.OnBuyLand += CanBuyLand;
+
+            m_scene.Permissions.OnViewNotecard += CanViewNotecard;
+            m_scene.Permissions.OnViewScript += CanViewScript;
+            m_scene.Permissions.OnEditNotecard += CanEditNotecard;
+            m_scene.Permissions.OnEditScript += CanEditScript;
+
             m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory;
             m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;
-            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; 
-            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; 
+            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory;
+            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory;
             m_scene.Permissions.OnResetScript += CanResetScript;
-            
-            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; 
-            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; 
-            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; 
-            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; 
-            
-            m_scene.Permissions.OnTeleport += CanTeleport; 
-            
+
+            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory;
+            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory;
+            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory;
+            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory;
+
+            m_scene.Permissions.OnTeleport += CanTeleport;
+
             m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
             m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
 
@@ -329,8 +329,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.AddCommand("Debug", this, "debug permissions",
                     "debug permissions <true / false>",
                     "Turn on permissions debugging",
-                    HandleDebugPermissions);                    
-                    
+                    HandleDebugPermissions);
+
         }
 
         public void RegionLoaded(Scene scene)
@@ -441,7 +441,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             m_scene.EventManager.TriggerPermissionError(user, reason);
         }
-        
+
         protected void DebugPermissionInformation(string permissionCalled)
         {
             if (m_debugPermissions)
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return false;
         }
-         
+
         /// <summary>
         /// Parse a user set configuration setting
         /// </summary>
@@ -483,28 +483,28 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             UserSet userSet = defaultValue;
 
-            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName, 
-                new string[] {"Startup", "Permissions"}, defaultValue.ToString()); 
-            
+            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName,
+                new string[] {"Startup", "Permissions"}, defaultValue.ToString());
+
             // Temporary measure to allow 'gods' to be specified in config for consistency's sake.  In the long term
             // this should disappear.
             if ("gods" == rawSetting.ToLower())
                 rawSetting = UserSet.Administrators.ToString();
-            
+
             // Doing it this was so that we can do a case insensitive conversion
             try
             {
                 userSet = (UserSet)Enum.Parse(typeof(UserSet), rawSetting, true);
             }
-            catch 
+            catch
             {
                 m_log.ErrorFormat(
                     "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}",
                     rawSetting, settingName, userSet);
             }
-            
+
             m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet);
-            
+
             return userSet;
         }
 
@@ -520,7 +520,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
                 return true;
-            
+
             if (IsEstateManager(user) && m_RegionManagerIsGod)
                 return true;
 
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         }
 
         protected bool IsFriendWithPerms(UUID user, UUID objectOwner)
-        {            
+        {
             if (user == UUID.Zero)
                 return false;
 
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         protected bool IsEstateManager(UUID user)
         {
             if (user == UUID.Zero) return false;
-        
+
             return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
         }
 
@@ -777,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // so just return true immediately and short circuit the more
                 // expensive group checks
                 return true;
-                
+
                 //permission = true;
             }
             else if (group.IsAttachment)
@@ -786,15 +786,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
 
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}", 
+//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}",
 //                group.GroupID,
-//                m_scene.GetSceneObjectPart(objId).GroupMask, 
-//                IsGroupMember(group.GroupID, currentUser, 0), 
+//                m_scene.GetSceneObjectPart(objId).GroupMask,
+//                IsGroupMember(group.GroupID, currentUser, 0),
 //                currentUser);
-            
+
             // Group members should be able to edit group objects
-            if ((group.GroupID != UUID.Zero) 
-                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0) 
+            if ((group.GroupID != UUID.Zero)
+                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0)
                 && IsGroupMember(group.GroupID, currentUser, 0))
             {
                 // Return immediately, so that the administrator can shares group objects
@@ -807,7 +807,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // Return immediately, so that the administrator can share objects with friends
                 return true;
             }
-        
+
             // Users should be able to edit what is over their land.
             ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
             if ((parcel != null) && (parcel.LandData.OwnerID == currentUser))
@@ -904,7 +904,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return permission;
         }
-    
+
         protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
         {
             if (parcel.LandData.OwnerID == user)
@@ -919,7 +919,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             {
                 return true;
             }
-    
+
             if (allowEstateManager && IsEstateManager(user))
             {
                 return true;
@@ -946,7 +946,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-        
+
             return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
         }
 
@@ -1007,7 +1007,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 //They can't even edit the object
                 return false;
             }
-        
+
             SceneObjectPart part = scene.GetSceneObjectPart(objectID);
             if (part == null)
                 return false;
@@ -1025,7 +1025,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if ((part.GroupMask & PERM_COPY) == 0)
                     return false;
             }
-        
+
             //If they can rez, they can duplicate
             return CanRezObject(objectCount, owner, objectPosition, scene);
         }
@@ -1074,10 +1074,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-                            
+
             if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
                 return false;
-            
+
             // Ordinarily, if you can view it, you can edit it
             // There is no viewing a no mod script
             //
@@ -1135,10 +1135,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
-            
+
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } 
+                }
                 else
                 {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
@@ -1572,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if ((so.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
                     permission = false;
             }
-            
+
             return permission;
         }
 
@@ -1662,7 +1662,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (part == null)
                     return false;
-            
+
                 if (part.OwnerID != user)
                 {
                     if (part.GroupID == UUID.Zero)
@@ -1670,11 +1670,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
-            
+
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } 
-                else 
+                }
+                else
                 {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                         return false;
@@ -1684,12 +1684,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (ti == null)
                     return false;
-            
+
                 if (ti.OwnerID != user)
                 {
                     if (ti.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(ti.GroupID, user, 0))
                         return false;
                 }
@@ -1746,12 +1746,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                 if (part == null)
                     return false;
-            
+
                 if (part.OwnerID != user)
                 {
                     if (part.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
                 }
@@ -1768,7 +1768,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 {
                     if (ti.GroupID == UUID.Zero)
                         return false;
-        
+
                     if (!IsGroupMember(ti.GroupID, user, 0))
                         return false;
                 }
@@ -1863,7 +1863,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to create the given inventory type in their inventory.
         /// </summary>
@@ -1878,10 +1878,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if ((int)InventoryType.LSL == invType)
                 if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID))
                     return false;
-            
+
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to copy the given inventory type in their inventory.
         /// </summary>
@@ -1895,7 +1895,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
@@ -1909,7 +1909,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to delete the given inventory item from their own inventory.
         /// </summary>
@@ -1947,7 +1947,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericObjectPermission(agentID, prim, false);
         }
 
-        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene) 
+        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene)
         {
              //m_log.DebugFormat("check if {0} is allowed to compile {1}", ownerUUID, scriptType);
             switch (scriptType) {
@@ -1981,64 +1981,64 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
             return(false);
         }
-        
+
         private bool CanControlPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanControlPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
+//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}",
 //                agentID, primID, face, me.ControlPermissions);
-            
+
             return GenericObjectPermission(agentID, part.ParentGroup.UUID, true);
         }
-        
+
         private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanInteractWithPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
+//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}",
 //                agentID, primID, face, me.InteractPermissions);
-            
+
             return GenericPrimMediaPermission(part, agentID, me.InteractPermissions);
         }
-        
+
         private bool GenericPrimMediaPermission(SceneObjectPart part, UUID agentID, MediaPermission perms)
         {
 //            if (IsAdministrator(agentID))
 //                return true;
-            
+
             if ((perms & MediaPermission.Anyone) == MediaPermission.Anyone)
                 return true;
 
@@ -2047,13 +2047,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if (agentID == part.OwnerID)
                     return true;
             }
-            
+
             if ((perms & MediaPermission.Group) == MediaPermission.Group)
             {
                 if (IsGroupMember(part.GroupID, agentID, 0))
                     return true;
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index 411c4d6..49246a2 100644
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -54,24 +54,24 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         private ICommandConsole m_console;
 
         public string Name { get { return "Region Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -87,14 +87,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Regions", false, "show region",
                 "show region",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "A synonym for \"region get\"",
                 HandleShowRegion);
 
             m_console.Commands.AddCommand(
                 "Regions", false, "region get",
                 "region get",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "Some parameters can be set with the \"region set\" command.\n"
                 + "Others must be changed via a viewer (usually via the region/estate dialog box).",
                 HandleShowRegion);
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 MainConsole.Instance.OutputFormat("Usage: region set <param> <value>");
                 return;
-            }           
+            }
 
             string param = args[2];
             string rawValue = args[3];
@@ -225,7 +225,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 if (newValue > ri.AgentCapacity)
                 {
                     MainConsole.Instance.OutputFormat(
-                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit", 
+                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit",
                         newValue, m_scene.Name, ri.AgentCapacity);
                 }
                 else
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index e6a0205..8bac9e6 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -78,22 +78,22 @@ namespace OpenSim.Region.CoreModules.World.Region
                         scene.RegionInfo.RegionID.ToString()));
 
             m_Scene = scene;
-            
+
             scene.RegisterModuleInterface<IRestartModule>(this);
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart bluebox",
                     "region restart bluebox <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a dismissable bluebox notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart notice",
                     "region restart notice <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a transient notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart abort",
                     "region restart abort [<message>]",
@@ -183,7 +183,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 nextAlert = m_Alerts[1];
                 break;
             }
-            
+
             int currentAlert = m_Alerts[0];
 
             m_Alerts.RemoveAt(0);
@@ -242,7 +242,7 @@ namespace OpenSim.Region.CoreModules.World.Region
             else
             {
                 m_log.WarnFormat(
-                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval", 
+                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval",
                     intervalSeconds, m_Scene.Name);
             }
         }
@@ -286,7 +286,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 File.Delete(Path.Combine(m_MarkerPath,
                         m_Scene.RegionInfo.RegionID.ToString()));
         }
-        
+
         private void HandleRegionRestart(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene is Scene))
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0247d9..c9bc335 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SerialiserModule")]
     public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 //        private Commander m_commander = new Commander("export");
@@ -55,15 +55,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
 
         #region ISharedRegionModule Members
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["Serialiser"];
-            if (config != null) 
+            if (config != null)
             {
                 m_savedir = config.GetString("save_dir", m_savedir);
             }
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             SceneXmlLoader.SavePrimsToXml2(scene, stream, min, max);
         }
-        
+
         public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
         {
             SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a5bb1a7..c9e3141 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private const string ObjectRootPartStubXml = 
+        private const string ObjectRootPartStubXml =
 @"<SceneObjectGroup>
     <RootPart>
         <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -149,9 +149,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <llsd>
                     <map>
                         <key>MyNamespace</key>
-                        <map>                                
+                        <map>
                             <key>MyStore</key>
-                            <map>   
+                            <map>
                                 <key>the answer</key>
                                 <integer>42</integer>
                             </map>
@@ -162,12 +162,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         </SceneObjectPart>
     </RootPart>";
 
-        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
 @"
     <OtherParts />
 </SceneObjectGroup>";
 
-        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
 @"
   <OtherParts>
     <Part>
@@ -574,9 +574,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <llsd>
                         <map>
                             <key>MyNamespace</key>
-                            <map>                                
+                            <map>
                                 <key>MyStore</key>
-                                <map>   
+                                <map>
                                     <key>last words</key>
                                     <string>Rosebud</string>
                                 </map>
@@ -636,7 +636,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
                 OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
                 Assert.AreEqual(42, store["the answer"].AsInteger());
-            }                                    
+            }
 
             {
                 SceneObjectPart part = parts[1];
@@ -723,7 +723,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("RootPart");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -733,7 +733,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
@@ -833,7 +833,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -843,7 +843,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 45f3ccf..2b7db18 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -279,7 +279,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
             m_host.Sound = soundID;
             m_host.SoundGain = volume;
-            m_host.SoundFlags = iflags;      
+            m_host.SoundFlags = iflags;
             m_host.SoundRadius = radius;
 
             m_host.ScheduleFullUpdate();
@@ -309,14 +309,14 @@ namespace OpenSim.Region.CoreModules.World.Sound
             else
             {
                 byte bflags = 0;
-                
+
                 if (isMaster)
                     bflags |= (byte)SoundFlags.SYNC_MASTER;
                 // TODO check viewer seems to accept both
                 if (useMaster)
                     bflags |= (byte)SoundFlags.SYNC_SLAVE;
                 PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, bflags, radius);
-            } 
+            }
         }
 
         public void TriggerSoundLimited(UUID objectID, UUID sound,
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index d0318eb..e2b3487 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules
         // Number of virtual days to a virtual year
         private int    m_YearLengthDays           = 0;
 
-        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the 
+        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the
         // sun's orbit above the horizon
         private double m_HorizonShift = 0;
 
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules
                 // Determine the current "day" from current time, so we can use "today"
                 // to determine Seasonal Tilt and what'not
 
-                // Integer math rounded is on purpose to drop fractional day, determines number 
+                // Integer math rounded is on purpose to drop fractional day, determines number
                 // of virtual days since Epoch
                 PosTime = CurrentTime / SecondsPerSunCycle;
 
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules
             m_log.Debug("[SUN]: Positional data updated every " + m_UpdateInterval + " frames");
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules
                     client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
                 }
             }
-        }            
+        }
 
         public void SunUpdate()
         {
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules
 
                 while (sunFixedHour < 0)
                     sunFixedHour += 24;
-                
+
                 m_SunFixedHour = sunFixedHour;
                 m_SunFixed = fixedSun;
 
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules
 
                 case "current_time":
                     return GetCurrentTimeAsLindenSunHour();
-                
+
                 default:
                     throw new Exception("Unknown sun parameter.");
             }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 1e67f72..bcd9dcd 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -247,4 +247,4 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
     }
 }
 
-    
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 36c2bbf..d604dc7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -104,10 +104,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
             {
                 pallete = gradientmapLd.Height;
-    
+
                 bmp = new Bitmap(map.Width, map.Height);
                 colours = new Color[pallete];
-    
+
                 for (int i = 0; i < pallete; i++)
                 {
                     colours[i] = gradientmapLd.GetPixel(0, i);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index 59994e4..68d6ed2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -275,6 +275,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         public bool SupportsTileSave()
         {
             return false;
-        }       
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index 6324aca..f7be25f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainFloodEffect
     {
-        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength, 
+        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength,
             int startX, int endX, int startY, int endY);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index 3ba3657..855d131 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
     public interface ITerrainLoader
     {
         // Returns true if that extension can be used for terrain save-tile
-        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders) 
+        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders)
         bool SupportsTileSave();
 
         string FileExtension { get; }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 8937f63..9d3d4cb 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                     {
                         map[x, y] += delta;
                     }
- 
+
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index bbf9407..a88a022 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                             map[x, y] = 0.0;
                         else
                             map[x, y] = newz;
-                    } 
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index 1b704bb..5305cb4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     public class RaiseSphere : ITerrainPaintableEffect
     {
         #region ITerrainPaintableEffect Members
-        
+
 
         public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
             double strength, double duration, int startX, int endX, int startY, int endY)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index efc5324..ca30e9e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
             duration = 0.03; //MCP Should be read from ini file
- 
+
             if (duration > 1.0)
                 duration = 1.0;
             if (duration < 0)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 65dd0a6..0342962 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -42,10 +42,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
             int x, y;
             double[,] tweak = new double[map.Width,map.Height];
 
-            double area = strength; 
+            double area = strength;
             double step = strength / 4.0;
             duration = 0.03; //MCP Should be read from ini file
- 
+
 
             // compute delta map
             for (x = startX; x <= endX; x++)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index e21681d..65d4c4a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             if (terrainConfig != null)
             {
                 m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
-                m_sendTerrainUpdatesByViewDistance = 
+                m_sendTerrainUpdatesByViewDistance =
                     terrainConfig.GetBoolean(
                         "SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance);
             }
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     if(m_baked != null)
                         m_channel = m_baked.MakeCopy();
                     else
-                        m_channel = new TerrainChannel(m_InitialTerrain, 
+                        m_channel = new TerrainChannel(m_InitialTerrain,
                                                 (int)m_scene.RegionInfo.RegionSizeX,
                                                 (int)m_scene.RegionInfo.RegionSizeY,
                                                 (int)m_scene.RegionInfo.RegionSizeZ);
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
         }
 
-        public void LoadFromStream(string filename, Vector3 displacement, 
+        public void LoadFromStream(string filename, Vector3 displacement,
                                     float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream)
         {
             foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
@@ -724,7 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         /// <summary>
         /// Saves the current state of the region into the baked map buffer.
-        
+
         /// </summary>
         public void UpdateBakedMap()
         {
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
         }
 
-        
+
         /// <summary>
         /// This is used to check to see of any of the terrain is tainted and, if so, schedule
         /// updates for all the presences.
@@ -945,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             lock (m_perClientPatchUpdates)
                 m_perClientPatchUpdates.Remove(client);
         }
-        
+
         /// <summary>
         /// Scan over changes in the terrain and limit height changes. This enforces the
         ///     non-estate owner limits on rate of terrain editting.
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 }
             }
             return ret;
-        }   
+        }
 
         private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action,
                                             float north, float west, float south, float east, UUID agentId)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
index 0563ad0..6a832bc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
@@ -45,8 +45,8 @@ namespace OpenSim.Region.CoreModules.Terrain.Tests
             //UUID userId = TestHelpers.ParseTail(0x1);
 
             TerrainModule tm = new TerrainModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, tm);             
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, tm);
 
             // Fillheight of 30
             {
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 3f5d375..04b6f00 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VegetationModule")]
     public class VegetationModule : INonSharedRegionModule, IVegetationModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
+
         protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
         public PCode[] CreationCapabilities { get { return creationCapabilities; } }
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -83,10 +83,10 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
             treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
             treeShape.Scale = scale;
             treeShape.State = (byte)treeType;
-            
+
             return m_scene.AddNewPrim(uuid, groupID, position, rotation, treeShape);
         }
-        
+
         public SceneObjectGroup CreateEntity(
             UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
         {
@@ -95,22 +95,22 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
                 m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
                 return null;
             }
-            
+
             SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
             SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
-            
+
             // if grass or tree, make phantom
             //rootPart.TrimPermissions();
             rootPart.AddFlag(PrimFlags.Phantom);
             if (rootPart.Shape.PCode != (byte)PCode.Grass)
                 AdaptTree(ref shape);
-            
+
             m_scene.AddNewSceneObject(sceneObject, true);
             sceneObject.SetGroup(groupID, null);
-            
+
             return sceneObject;
         }
-        
+
         protected void AdaptTree(ref PrimitiveBaseShape tree)
         {
             // Tree size has to be adapted depending on its type
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
index 4719ba3..226b330 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float pctX = (float)x / 255f;
                     float pctY = (float)y / 255f;
 
-                    // Use bilinear interpolation between the four corners of start height and 
+                    // Use bilinear interpolation between the four corners of start height and
                     // height range to select the current values at this position
                     float startHeight = ImageUtils.Bilinear(
                         startHeights[0],
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float highFreq = Perlin.turbulence2(vec.X, vec.Y, 2f) * 2.25f;
                     float noise = (lowFreq + highFreq) * 2f;
 
-                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it 
+                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it
                     float layer = ((height + noise - startHeight) / heightRange) * 4f;
                     if (Single.IsNaN(layer))
                         layer = 0f;
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index cb37067..4934ebd 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -96,9 +96,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             m_Enabled = true;
 
-            m_drawPrimVolume 
+            m_drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, m_drawPrimVolume);
-            m_textureTerrain 
+            m_textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, m_textureTerrain);
             m_texturePrims
                 = Util.GetConfigVarFromSections<bool>(m_config, "TexturePrims", configSections, m_texturePrims);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                                        m_scene.RegionInfo.RegionSizeY * 0.5f - 0.5f);
 
             warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
-                        waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
+            waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
             waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
             renderer.Scene.addMaterial("WaterColor", waterColorMaterial);
             renderer.SetObjectMaterial("Water", "WaterColor");
@@ -292,7 +292,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             float regionsx = m_scene.RegionInfo.RegionSizeX;
             float regionsy = m_scene.RegionInfo.RegionSizeY;
-            
+
             // 'diff' is the difference in scale between the real region size and the size of terrain we're buiding
             float diff = regionsx / 256f;
 
@@ -377,7 +377,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             warp_Material material = new warp_Material(texture);
             material.setReflectivity(50);
             renderer.Scene.addMaterial("TerrainColor", material);
-                        renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
+            renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
             renderer.SetObjectMaterial("Terrain", "TerrainColor");
         }
 
@@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
                 if (!fetched)
                 {
-                    // Fetch the texture, decode and get the average color, 
+                    // Fetch the texture, decode and get the average color,
                     // then save it to a temporary metadata asset
                     AssetBase textureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
                     if (textureAsset != null)
@@ -616,7 +616,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 catch (Exception e)
                 {
                     m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception  ", id), e);
-                }                    
+                }
             }
 
             return ret;
@@ -678,10 +678,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     {
                         width = bitmap.Width;
                         height = bitmap.Height;
-    
+
                         BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, bitmap.PixelFormat);
                         pixelBytes = (bitmap.PixelFormat == PixelFormat.Format24bppRgb) ? 3 : 4;
-    
+
                         // Sum up the individual channels
                         unsafe
                         {
@@ -690,7 +690,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 65691fe..a2b44df 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
         private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
         private float m_varStrength = 5.0f; // Max Strength  Variance
         private float m_varDirection = 30.0f;// Max Direction Variance
-        private float m_rateChange = 1.0f; // 
+        private float m_rateChange = 1.0f; //
 
         private Vector2 m_curPredominateWind = new Vector2();
 
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public void Initialise()
         {
-            
+
         }
 
         #endregion
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             // Prevailing wind algorithm
             // Inspired by Kanker Greenacre
 
-            // TODO: 
+            // TODO:
             // * This should probably be based on in-world time.
             // * should probably move all these local variables to class members and constants
             double time = DateTime.Now.TimeOfDay.Seconds / 86400.0f;
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             offset = Math.Sin(theta) * Math.Sin(theta*4) + (Math.Sin(theta*13) / 3);
             double windSpeed = m_avgStrength + (m_varStrength * offset);
 
-            if (windSpeed < 0) 
+            if (windSpeed < 0)
                 windSpeed = -windSpeed;
 
             m_curPredominateWind.X = (float)Math.Cos(windDir);
@@ -157,9 +157,9 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public string Description
         {
-            get 
+            get
             {
-                return "Provides a predominate wind direction that can change within configured variances for direction and speed."; 
+                return "Provides a predominate wind direction that can change within configured variances for direction and speed.";
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 95cf57d..a1fff62 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules
             // Register event handlers for when Avatars enter the region, and frame ticks
             m_scene.EventManager.OnFrame += WindUpdate;
 
-            // Register the wind module 
+            // Register the wind module
             m_scene.RegisterModuleInterface<IWindModule>(this);
 
             // Generate initial wind values
@@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules
         #region IWindModule Methods
 
         /// <summary>
-        /// Retrieve the wind speed at the given region coordinate.  This 
+        /// Retrieve the wind speed at the given region coordinate.  This
         /// implimentation ignores Z.
         /// </summary>
         /// <param name="x">0...255</param>
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules
 
         public string WindActiveModelPluginName
         {
-            get 
+            get
             {
                 if (m_activeWindPlugin != null)
                 {
@@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules
                     {
                         client.SendWindData(m_dataVersion, windSpeeds);
                     });
-                
+
                 }
                 finally
                 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules
         }
 
         /// <summary>
-        /// Calculate new wind 
+        /// Calculate new wind
         /// returns false if no change
         /// </summary>
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index fb63c6a..5876df3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         //                remoteClient.SendAlertMessage("Hyperlink could not be established.");
 
                     //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
- 
+
                     MapBlockData data;
                     if (regionInfos != null && regionInfos.Count > 0)
                     {
@@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     // send extra user messages for V3
                     // because the UI is very confusing
                     // while we don't fix the hard-coded urls
-                    if (flags == 2) 
+                    if (flags == 2)
                     {
                         if (regionInfos == null || regionInfos.Count == 0)
                             remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index c249e9d..5dcf326 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private static readonly UUID STOP_UUID = UUID.Random();
 
         private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
-        
+
         private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false);
         private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
 
@@ -729,7 +729,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         break;
 
                     // agent gone?
-                    
+
                     m_scene.TryGetScenePresence(st.agentID, out av);
                     if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit)
                         continue;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         {
                             m_cachedRegionMapItemsResponses.TryGetValue(st.regionhandle, out responseMap);
                             dorequest = false;
-                        }                           
+                        }
                         else
                             m_cachedRegionMapItemsResponses.Add(st.regionhandle, null, expireResponsesTime); //  a bit more time for the access
                     }
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if(m_mapBlockRequests[agentID].Count < 150 )
                     m_mapBlockRequests[agentID].Enqueue(req);
                 else
-                { 
+                {
                     spamBlocked[agentID] = now + SPAMBLOCKTIMEms;
                     m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0);
                 }
@@ -1193,7 +1193,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 maxY * (int)Constants.RegionSize);
 
             // only send a negative answer for a single region request
-            // corresponding to a click on the map. Current viewers 
+            // corresponding to a click on the map. Current viewers
             // keep displaying "loading.." without this
             if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY)
             {
@@ -1539,7 +1539,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         responsemap["10"] = responsearr;
                     else
                     responsemap["7"] = responsearr;
-                }              
+                }
             }
 
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)