116 files changed, 1323 insertions, 1323 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 4529944..5a9eeb5 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
         public bool child;
 
         /// <summary>
-        /// Number given to the client when they log-in that they provide 
+        /// Number given to the client when they log-in that they provide
         /// as credentials to the UDP server
         /// </summary>
         public uint circuitcode;
@@ -328,7 +328,7 @@ namespace OpenSim.Framework
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
             //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
-            
+
             try
             {
                 // Unpack various appearance elements
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
             {
                 m_log.ErrorFormat("[AGENTCIRCUITDATA] failed to unpack appearance; {0}",e.Message);
             }
-            
+
             ServiceURLs = new Dictionary<string, object>();
             // Try parse the new way, OSDMap
             if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)
diff --git a/OpenSim/Framework/AnimationSet.cs b/OpenSim/Framework/AnimationSet.cs
index 6c5b15c..87c4a78 100644
--- a/OpenSim/Framework/AnimationSet.cs
+++ b/OpenSim/Framework/AnimationSet.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
             it.GroupPermissions = 0;
             it.EveryOnePermissions = 0;
         }
-        
+
         public int AnimationCount { get; private set; }
         private Dictionary<string, KeyValuePair<string, UUID>> m_animations = new Dictionary<string, KeyValuePair<string, UUID>>();
 
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 87fd04a..88edf2f 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return 
+                return
                     IsTextualAsset && (
                     Type != (sbyte)AssetType.Notecard
                     && Type != (sbyte)AssetType.CallingCard
@@ -137,7 +137,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return 
+                return
                     (Type == (sbyte)AssetType.Animation ||
                      Type == (sbyte)AssetType.Gesture ||
                      Type == (sbyte)AssetType.Simstate ||
@@ -282,7 +282,7 @@ namespace OpenSim.Framework
 
                 return m_id;
             }
-            
+
             set
             {
                 UUID uuid = UUID.Zero;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
index d269e5d..b6ea077 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.AssetLoader.Filesystem")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index d602c1f..3dfbb91 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -31,10 +31,10 @@ namespace OpenSim.Framework
 {
     /// <summary>
     /// This class was created to refactor OutPacket out of AssetCache
-    /// There is a conflict between 
+    /// There is a conflict between
     /// OpenSim.Framework.Communications.Cache.AssetRequest and OpenSim.Framework.AssetRequest
-    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring 
-    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache 
+    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring
+    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache
     /// requiring OpenSim.Framework
     /// </summary>
     public class AssetRequestToClient
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 07c739d..77a7621 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework
         // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
-//        public readonly static int TEXTURE_COUNT = 21 
+//        public readonly static int TEXTURE_COUNT = 21
         // 21 bad, make it be updated as libovm gets update
         // also keeping in sync with it
         public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
@@ -121,7 +121,7 @@ namespace OpenSim.Framework
             get { return m_avatarHeight; }
             set { m_avatarHeight = value; }
         }
-        
+
         public virtual WearableCacheItem[] WearableCacheItems
         {
             get { return m_cacheitems; }
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
                     m_wearables[i] = new AvatarWearable();
                     AvatarWearable wearable = appearance.Wearables[i];
                     for (int j = 0; j < wearable.Count; j++)
-                            m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID);                       
+                            m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID);
                  }
             }
             else
@@ -291,18 +291,18 @@ namespace OpenSim.Framework
         public virtual void ResetAppearance()
         {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance");
-            
+
             m_serial = 0;
 
             SetDefaultTexture();
-            
+
             //for (int i = 0; i < BAKE_INDICES.Length; i++)
             // {
             //     int idx = BAKE_INDICES[i];
             //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
             // }
         }
-        
+
         protected virtual void SetDefaultParams()
         {
             m_visualparams = new byte[] { 33,61,85,23,58,127,63,85,63,42,0,85,63,36,85,95,153,63,34,0,63,109,88,132,63,136,81,85,103,136,127,0,150,150,150,127,0,0,0,0,0,127,0,0,255,127,114,127,99,63,127,140,127,127,0,0,0,191,0,104,0,0,0,0,0,0,0,0,0,145,216,133,0,127,0,127,170,0,0,127,127,109,85,127,127,63,85,42,150,150,150,150,150,150,150,25,150,150,150,0,127,0,0,144,85,127,132,127,85,0,127,127,127,127,127,127,59,127,85,127,127,106,47,79,127,127,204,2,141,66,0,0,127,127,0,0,0,0,127,0,159,0,0,178,127,36,85,131,127,127,127,153,95,0,140,75,27,127,127,0,150,150,198,0,0,63,30,127,165,209,198,127,127,153,204,51,51,255,255,255,204,0,255,150,150,150,150,150,150,150,150,150,150,0,150,150,150,150,150,0,127,127,150,150,150,150,150,150,150,150,0,0,150,51,132,150,150,150 };
@@ -319,14 +319,14 @@ namespace OpenSim.Framework
         public virtual void ResetBakedTextures()
         {
             SetDefaultTexture();
-            
+
             //for (int i = 0; i < BAKE_INDICES.Length; i++)
             // {
             //     int idx = BAKE_INDICES[i];
             //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
             // }
         }
-        
+
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
             }
 
             m_texture = textureEntry;
-            
+
             return changed;
         }
 
@@ -531,14 +531,14 @@ namespace OpenSim.Framework
         {
             lock (m_attachments)
             {
-                                List<AvatarAttachment> alist = new List<AvatarAttachment>();
+                List<AvatarAttachment> alist = new List<AvatarAttachment>();
                 foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                 {
                     foreach (AvatarAttachment attach in kvp.Value)
                         alist.Add(new AvatarAttachment(attach));
                 }
-                                return alist;
-                        }
+                return alist;
+            }
         }
 
         internal void AppendAttachment(AvatarAttachment attach)
@@ -551,7 +551,7 @@ namespace OpenSim.Framework
             {
                 if (!m_attachments.ContainsKey(attach.AttachPoint))
                     m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
-    
+
                 foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint])
                 {
                     if (prev.ItemID == attach.ItemID)
@@ -608,7 +608,7 @@ namespace OpenSim.Framework
                         m_attachments.Remove(attachpoint);
                         return true;
                     }
-                    
+
                     return false;
                 }
 
@@ -622,13 +622,13 @@ namespace OpenSim.Framework
                 if (existingAttachment != null)
                 {
 //                    m_log.DebugFormat(
-//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}", 
+//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}",
 //                        existingAttachment.ItemID, existingAttachment.AssetID, existingAttachment.AttachPoint);
 
                     if (existingAttachment.AssetID != UUID.Zero && existingAttachment.AttachPoint == (attachpoint & 0x7F))
                     {
                         m_log.DebugFormat(
-                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}", 
+                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}",
                             item, attachpoint);
 
                         return false;
@@ -640,7 +640,7 @@ namespace OpenSim.Framework
                         DetachAttachment(existingAttachment.ItemID);
                     }
                 }
-                
+
                 // check if this is an append or a replace, 0x80 marks it as an append
                 if ((attachpoint & 0x80) > 0)
                 {
@@ -701,16 +701,16 @@ namespace OpenSim.Framework
                     if (index >= 0)
                     {
 //                        m_log.DebugFormat(
-//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}", 
+//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}",
 //                            m_attachments[kvp.Key][index].ItemID, index, m_attachments[kvp.Key][index].AttachPoint);
 
                         // Remove it from the list of attachments at that attach point
                         m_attachments[kvp.Key].RemoveAt(index);
-    
+
                         // And remove the list if there are no more attachments here
                         if (m_attachments[kvp.Key].Count == 0)
                             m_attachments.Remove(kvp.Key);
-    
+
                         return true;
                     }
                 }
@@ -867,7 +867,7 @@ namespace OpenSim.Framework
                     {
                         AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);
                         AppendAttachment(att);
-                        
+
 //                        m_log.DebugFormat(
 //                            "[AVATAR APPEARANCE]: Unpacked attachment itemID {0}, assetID {1}, point {2}",
 //                            att.ItemID, att.AssetID, att.AttachPoint);
@@ -1644,14 +1644,14 @@ namespace OpenSim.Framework
             SHAPE_EYELID_INNER_CORNER_UP = 214,
             SKIRT_SKIRT_RED = 215,
             SKIRT_SKIRT_GREEN = 216,
-            SKIRT_SKIRT_BLUE = 217, 
+            SKIRT_SKIRT_BLUE = 217,
 
             /// <summary>
             /// Avatar Physics section.  These are 0 type visual params which get transmitted.
             /// </summary>
 
             /// <summary>
-            /// Breast Part 1 
+            /// Breast Part 1
             /// </summary>
             BREAST_PHYSICS_MASS = 218,
             BREAST_PHYSICS_GRAVITY = 219,
@@ -1697,7 +1697,7 @@ namespace OpenSim.Framework
             BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
             BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250,
 
-            // Ubit: 07/96/2013 new parameters 
+            // Ubit: 07/96/2013 new parameters
             _APPEARANCEMESSAGE_VERSION = 251,    //ID 11000
 
             SHAPE_HOVER = 252,    //ID 11001
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 7bc46ed..0e8f960 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework
 
 //        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
 //        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
- 
+
         protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
         protected List<UUID> m_ids = new List<UUID>();
 
@@ -234,10 +234,10 @@ namespace OpenSim.Framework
                 {
                     defaultWearables[i] = new AvatarWearable();
                 }
-                
+
                 // Body
                 defaultWearables[BODY].Add(DEFAULT_BODY_ITEM, DEFAULT_BODY_ASSET);
-                
+
                 // Hair
                 defaultWearables[HAIR].Add(DEFAULT_HAIR_ITEM, DEFAULT_HAIR_ASSET);
 
@@ -252,7 +252,7 @@ namespace OpenSim.Framework
 
                 // Pants
                 defaultWearables[PANTS].Add(DEFAULT_PANTS_ITEM, DEFAULT_PANTS_ASSET);
-                
+
 //                // Alpha
 //                defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);
 
diff --git a/OpenSim/Framework/BasicDOSProtector.cs b/OpenSim/Framework/BasicDOSProtector.cs
index 89bfa94..f1ff18f 100644
--- a/OpenSim/Framework/BasicDOSProtector.cs
+++ b/OpenSim/Framework/BasicDOSProtector.cs
@@ -31,7 +31,7 @@ using log4net;
 
 namespace OpenSim.Framework
 {
-   
+
     public class BasicDOSProtector
     {
         public enum ThrottleAction
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         private readonly BasicDosProtectorOptions _options;
         private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
         private readonly Dictionary<string, int> _tempBlocked;  // blocked list
-        private readonly Dictionary<string, int> _sessions; 
+        private readonly Dictionary<string, int> _sessions;
         private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly System.Threading.ReaderWriterLockSlim _blockLockSlim = new System.Threading.ReaderWriterLockSlim();
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
                 else
                     throw new System.Security.SecurityException("Throttled");
             }
-           
+
             _blockLockSlim.ExitReadLock();
 
             lock (_generalRequestTimes)
@@ -169,10 +169,10 @@ namespace OpenSim.Framework
                         _blockLockSlim.ExitWriteLock();
 
                     }
-                    
+
 
                 }
-                else 
+                else
                     ProcessConcurrency(key, endpoint);
             }
             if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
             _sessionLockSlim.EnterWriteLock();
             if (_sessions.ContainsKey(key))
                 _sessions[key] = _sessions[key] + 1;
-            else 
+            else
                 _sessions.Add(key,1);
             _sessionLockSlim.ExitWriteLock();
         }
@@ -209,7 +209,7 @@ namespace OpenSim.Framework
             }
             else
                 _sessions.Add(key, 1);
-           
+
             _sessionLockSlim.ExitWriteLock();
         }
 
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index f6861e4..2461049 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Framework
 
                 if (m_pqueue.Count > 0)
                     return m_pqueue.Dequeue();
-                
+
                 if (m_queue.Count > 0)
                     return m_queue.Dequeue();
                 return default(T);
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 80f5ff4..7ccc320 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -356,10 +356,10 @@ namespace OpenSim.Framework
                     Expire(true);
                     return null;
                 }
-    
+
                 item.hits++;
                 item.lastUsed = DateTime.UtcNow;
-    
+
                 Expire(true);
             }
 
diff --git a/OpenSim/Framework/CapsUtil.cs b/OpenSim/Framework/CapsUtil.cs
index 4baf505..020f6e2 100644
--- a/OpenSim/Framework/CapsUtil.cs
+++ b/OpenSim/Framework/CapsUtil.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         {
             return "CAPS/" + capsObjectPath + "0000/";
         }
-        
+
         /// <summary>
         /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
         /// </summary>
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 61c870e..0e5eaf2 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -332,7 +332,7 @@ namespace OpenSim.Framework
         public Vector3 UpAxis;
 
         /// <summary>
-        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the 
+        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the
         /// scene presence to become root (triggered when the viewer sends a CompleteAgentMovement UDP packet after
         /// establishing the connection triggered by it's receipt of a TeleportFinish EQ message).
         /// </summary>
@@ -434,7 +434,7 @@ namespace OpenSim.Framework
             args["active_group_name"] = OSD.FromString(ActiveGroupName);
             if(ActiveGroupTitle != null)
                 args["active_group_title"] = OSD.FromString(ActiveGroupTitle);
-           
+
             if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0)
             {
                 OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
@@ -623,7 +623,7 @@ namespace OpenSim.Framework
 
             if (args.ContainsKey("active_group_name") && args["active_group_name"] != null)
                 ActiveGroupName = args["active_group_name"].AsString();
-            
+
             if(args.ContainsKey("active_group_title") && args["active_group_title"] != null)
                 ActiveGroupTitle = args["active_group_title"].AsString();
 
@@ -843,7 +843,7 @@ namespace OpenSim.Framework
 
     public class CompleteAgentData : AgentData
     {
-        public override OSDMap Pack(EntityTransferContext ctx) 
+        public override OSDMap Pack(EntityTransferContext ctx)
         {
             return base.Pack(ctx);
         }
diff --git a/OpenSim/Framework/CircularBuffer.cs b/OpenSim/Framework/CircularBuffer.cs
index e919337..e101938 100644
--- a/OpenSim/Framework/CircularBuffer.cs
+++ b/OpenSim/Framework/CircularBuffer.cs
@@ -1,21 +1,21 @@
 /*
-Copyright (c) 2012, Alex Regueiro 
+Copyright (c) 2012, Alex Regueiro
 All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 following conditions are met:
 
 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer 
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-*/ 
+*/
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index 92af331..f996cb0 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -36,14 +36,14 @@ namespace OpenSim.Framework
     /// Cenome memory based cache to store key/value pairs (elements) limited time and/or limited size.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the dictionary. 
+    /// The type of values in the dictionary.
     /// </typeparam>
     /// <remarks>
     /// <para>
-    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed 
+    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed
     /// maximal allowed size or maximal amount of allowed element count, then elements in oldest generation are deleted. Last access time
     /// is also tracked in generation level - thus it is possible that some elements are staying in cache far beyond their expiration time.
     /// If elements in older generations are accessed through <see cref="TryGetValue"/> method, they are moved to newest generation.
@@ -176,7 +176,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -201,7 +201,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="maximalSize">
         /// Maximal cache size.
@@ -336,7 +336,7 @@ namespace OpenSim.Framework
         /// </summary>
         private void CheckExpired()
         {
-            // Do this only one in every m_operationsBetweenTimeChecks 
+            // Do this only one in every m_operationsBetweenTimeChecks
             // Fetching time is using several millisecons - it is better not to do all time.
             m_operationsBetweenTimeChecks--;
             if (m_operationsBetweenTimeChecks <= 0)
@@ -394,7 +394,7 @@ namespace OpenSim.Framework
                 new IEnumerator<KeyValuePair<TKey, TValue>>[2];
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> class. 
+            /// Initializes a new instance of the <see cref="Enumerator"/> class.
             /// </summary>
             /// <param name="cache">
             /// The cache.
@@ -456,7 +456,7 @@ namespace OpenSim.Framework
             /// <see langword="true"/>if the enumerator was successfully advanced to the next element; <see langword="false"/> if the enumerator has passed the end of the collection.
             /// </returns>
             /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             /// <filterpriority>2</filterpriority>
             public bool MoveNext()
@@ -479,7 +479,7 @@ namespace OpenSim.Framework
             /// Sets the enumerator to its initial position, which is before the first element in the collection.
             /// </summary>
             /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             /// <filterpriority>2</filterpriority>
             public void Reset()
@@ -548,7 +548,7 @@ namespace OpenSim.Framework
             private DateTime m_expirationTime1;
 
             /// <summary>
-            /// Index to first free element. 
+            /// Index to first free element.
             /// </summary>
             private int m_firstFreeElement;
 
@@ -681,8 +681,8 @@ namespace OpenSim.Framework
                 /// Next element in chain.
                 /// </summary>
                 /// <remarks>
-                /// When element have value (something is stored to it), this is index of 
-                /// next element with same bucket index. When element is free, this 
+                /// When element have value (something is stored to it), this is index of
+                /// next element with same bucket index. When element is free, this
                 /// is index of next element in free element's list.
                 /// </remarks>
                 public int Next;
@@ -696,7 +696,7 @@ namespace OpenSim.Framework
                 public long Size;
 
                 /// <summary>
-                /// Element's value. 
+                /// Element's value.
                 /// </summary>
                 /// <remarks>
                 /// It is possible that this value is <see langword="null"/> even when element
@@ -812,7 +812,7 @@ namespace OpenSim.Framework
                 /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
                 /// </returns>
                 /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                 /// </exception>
                 public bool MoveNext()
                 {
@@ -841,7 +841,7 @@ namespace OpenSim.Framework
                 /// Sets the enumerator to its initial position, which is before the first element in the collection.
                 /// </summary>
                 /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                 /// </exception>
                 /// <filterpriority>2</filterpriority>
                 public void Reset()
@@ -931,7 +931,7 @@ namespace OpenSim.Framework
             /// The key to locate in the <see cref="IGeneration"/>.
             /// </param>
             /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
             /// otherwise <see langword="false"/>.
             /// </returns>
             public bool Contains(int bucketIndex, TKey key)
@@ -1014,7 +1014,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <remarks>
             /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
             /// then it's value is replaced with new one and size information is updated. If element didn't
             /// exists in generation before, then generation must have empty space for a new element and
             /// size must fit generation's limits, before element is added to generation.
@@ -1070,7 +1070,7 @@ namespace OpenSim.Framework
                     if (Size - m_elements[ elementIndex ].Size + size > m_cache.m_generationMaxSize)
                     {
                         // Generation is full
-                        // Remove existing element, because generation is going to be recycled to 
+                        // Remove existing element, because generation is going to be recycled to
                         // old generation and element is stored to new generation
                         RemoveElement(bucketIndex, elementIndex, previousIndex);
                         return false;
@@ -1110,12 +1110,12 @@ namespace OpenSim.Framework
             /// <remarks>
             /// <para>
             /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
             /// </para>
             /// </remarks>
             public bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size)
             {
-                // Find entry index, 
+                // Find entry index,
                 int previousIndex;
                 int elementIndex = FindElementIndex(bucketIndex, key, m_newGeneration, out previousIndex);
                 if (elementIndex == -1)
@@ -1166,7 +1166,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// There are two kind generations: "new generation" and "old generation(s)". All new elements
-        /// are added to "new generation". 
+        /// are added to "new generation".
         /// </para>
         /// </remarks>
         protected interface IGeneration : IEnumerable<KeyValuePair<TKey, TValue>>
@@ -1211,7 +1211,7 @@ namespace OpenSim.Framework
             /// The key to locate in the <see cref="IGeneration"/>.
             /// </param>
             /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
             /// otherwise <see langword="false"/>.
             /// </returns>
             bool Contains(int bucketIndex, TKey key);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <remarks>
             /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
             /// then it's value is replaced with new one and size information is updated. If element didn't
             /// exists in generation before, then generation must have empty space for a new element and
             /// size must fit generation's limits, before element is added to generation.
@@ -1288,7 +1288,7 @@ namespace OpenSim.Framework
             /// <remarks>
             /// <para>
             /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
             /// </para>
             /// </remarks>
             bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size);
@@ -1303,8 +1303,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -1324,13 +1324,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
         /// </para>
         /// <para>
@@ -1375,17 +1375,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsCountLimited
@@ -1397,13 +1397,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1420,12 +1420,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -1441,13 +1441,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -1463,13 +1463,13 @@ namespace OpenSim.Framework
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         public int MaxCount
@@ -1496,7 +1496,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -1522,8 +1522,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1556,11 +1556,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1581,8 +1581,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -1735,7 +1735,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -1748,7 +1748,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -1759,17 +1759,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -1809,15 +1809,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index 2bafbe9..b33f4f7 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -36,10 +36,10 @@ namespace OpenSim.Framework
     /// Synchronized Cenome cache wrapper.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
     /// </typeparam>
     /// <remarks>
     /// <para>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
         private readonly object m_syncRoot;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
         /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
         /// </summary>
         /// <param name="cache">
@@ -73,13 +73,13 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
         /// </summary>
         /// <param name="cache">
         /// The <see cref="ICnmCache{TKey,TValue}"/> to synchronize.
         /// </param>
         /// <returns>
-        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
         /// </returns>
         /// <exception cref="ArgumentNullException">
         /// <paramref name="cache"/>is null.
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
             }
 
             /// <summary>
-            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class. 
+            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class.
             /// </summary>
             ~SynchronizedEnumerator()
             {
@@ -184,7 +184,7 @@ namespace OpenSim.Framework
             /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
             /// </returns>
             /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             public bool MoveNext()
             {
@@ -195,7 +195,7 @@ namespace OpenSim.Framework
             /// Sets the enumerator to its initial position, which is before the first element in the collection.
             /// </summary>
             /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
             /// </exception>
             public void Reset()
             {
@@ -214,8 +214,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -241,13 +241,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
         /// </para>
         /// <para>
@@ -291,17 +291,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsCountLimited
@@ -319,13 +319,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -348,12 +348,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -369,13 +369,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -397,13 +397,13 @@ namespace OpenSim.Framework
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         public int MaxCount
@@ -433,7 +433,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -463,8 +463,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -501,11 +501,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -532,8 +532,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -647,7 +647,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -660,7 +660,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -671,17 +671,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -703,15 +703,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 6b7cdf8..52360b4 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -52,27 +52,27 @@ namespace OpenSim.Framework.Console
             /// The module from which this command comes
             /// </value>
             public string module;
-            
+
             /// <value>
             /// Whether the module is shared
             /// </value>
             public bool shared;
-            
+
             /// <value>
             /// Very short BNF description
             /// </value>
             public string help_text;
-            
+
             /// <value>
             /// Longer one line help text
             /// </value>
             public string long_help;
-            
+
             /// <value>
             /// Full descriptive help for this command
             /// </value>
             public string descriptive_help;
-            
+
             /// <value>
             /// The method to invoke for this command
             /// </value>
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Console
         {
             List<string> help = new List<string>();
             List<string> helpParts = new List<string>(cmd);
-            
+
             // Remove initial help keyword
             helpParts.RemoveAt(0);
 
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Console
 
             return help;
         }
-        
+
         /// <summary>
         /// See if we can find the requested command in order to display longer help
         /// </summary>
@@ -171,23 +171,23 @@ namespace OpenSim.Framework.Console
                 help.Insert(0, ItemHelpText);
                 return help;
             }
-            
+
             Dictionary<string, object> dict = tree;
             while (helpParts.Count > 0)
             {
                 string helpPart = helpParts[0];
-                
+
                 if (!dict.ContainsKey(helpPart))
                     break;
-                
+
                 //m_log.Debug("Found {0}", helpParts[0]);
-                
+
                 if (dict[helpPart] is Dictionary<string, Object>)
-                    dict = (Dictionary<string, object>)dict[helpPart]; 
-                
+                    dict = (Dictionary<string, object>)dict[helpPart];
+
                 helpParts.RemoveAt(0);
             }
-        
+
             // There was a command for the given help string
             if (dict.ContainsKey(String.Empty))
             {
@@ -200,14 +200,14 @@ namespace OpenSim.Framework.Console
                 // If we do have some descriptive help then insert a spacing line before for readability.
                 if (descriptiveHelp != string.Empty)
                     help.Add(string.Empty);
-                
+
                 help.Add(commandInfo.descriptive_help);
             }
             else
             {
                 help.Add(string.Format("No help is available for {0}", originalHelpRequest));
             }
-            
+
             return help;
         }
 
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Console
 //            }
 //            return result;
 //        }
-        
+
         /// <summary>
         /// Add a command to those which can be invoked from the console.
         /// </summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Console
             string[] parts = Parser.Parse(command);
 
             Dictionary<string, Object> current = tree;
-            
+
             foreach (string part in parts)
             {
                 if (current.ContainsKey(part))
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.Console
 
                 return;
             }
-            
+
             info = new CommandInfo();
             info.module = module;
             info.shared = shared;
@@ -471,7 +471,7 @@ namespace OpenSim.Framework.Console
 
             return null;
         }
-                
+
         public bool HasCommand(string command)
         {
             string[] result;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 2d8e723..64cddea 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Console
         {
             System.Console.WriteLine(text);
         }
-        
+
         public virtual void OutputFormat(string format, params object[] components)
         {
             Output(string.Format(format, components));
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Console
 
             return ret;
         }
-                
+
         public string CmdPrompt(string p, List<char> excludedCharacters)
         {
             bool itisdone = false;
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p);
-                
+
                 foreach (char c in excludedCharacters)
                 {
                     if (ret.Contains(c.ToString()))
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Console
             {
                 itisdone = true;
                 ret = CmdPrompt(p, def);
-                
+
                 if (ret == String.Empty)
                 {
                     ret = def;
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 44f6dc1..bfa05a2 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Console
     //    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public const int LocalIdNotFound = 0;
-    
+
         /// <summary>
         /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
         /// rather than in each help summary.
@@ -57,10 +57,10 @@ namespace OpenSim.Framework.Console
     show object pos ,20,20 to ,40,40
     delete object pos ,,30 to ,,~
     show object pos ,,-~ to ,,30";
-    
+
         public const string MinRawConsoleVectorValue = "-~";
         public const string MaxRawConsoleVectorValue = "~";
-    
+
         public const string VectorSeparator = ",";
         public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
 
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Console
 
             return true;
         }
-    
+
         /// <summary>
         /// Try to parse a console UUID from the console.
         /// </summary>
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Console
 
                 return false;
             }
-    
+
             return true;
         }
 
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Console
 
             return false;
         }
-    
+
         /// <summary>
         /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Console
         {
             return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
         }
-    
+
         /// <summary>
         /// Convert a vector input from the console to an OpenMetaverse.Vector3
         /// </summary>
@@ -354,10 +354,10 @@ namespace OpenSim.Framework.Console
             string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc)
         {
             List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
-    
+
             if (components.Count < 1 || components.Count > dimensions)
                 return null;
-    
+
             if (components.Count < dimensions)
             {
                 if (blankComponentFunc == null)
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Console
                         else
                             return c;
                     });
-    
+
             return string.Join(VectorSeparator, cookedComponents.ToArray());
         }
     }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 28293c0..73f0323 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Console
         private const string LOGLEVEL_NONE = "(none)";
 
         // Used to extract categories for colourization.
-        private Regex m_categoryRegex 
+        private Regex m_categoryRegex
             = new Regex(
                 @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)", RegexOptions.Singleline | RegexOptions.Compiled);
 
@@ -167,15 +167,15 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorLeft = 0;
             }
-            else 
+            else
             {
                 int bufferWidth = System.Console.BufferWidth;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferWidth > 0 && left >= bufferWidth)
                     System.Console.CursorLeft = bufferWidth - 1;
             }
-            
+
             if (top < 0)
             {
                 top = 0;
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
             else
             {
                 int bufferHeight = System.Console.BufferHeight;
-                
+
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     top = bufferHeight - 1;
@@ -216,14 +216,14 @@ namespace OpenSim.Framework.Console
             {
                 System.Console.CursorTop = 0;
             }
-            else 
+            else
             {
                 int bufferHeight = System.Console.BufferHeight;
                 // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                 if (bufferHeight > 0 && top >= bufferHeight)
                     System.Console.CursorTop = bufferHeight - 1;
             }
-            
+
             if (left < 0)
             {
                 left = 0;
@@ -339,7 +339,7 @@ namespace OpenSim.Framework.Console
             string outText = text;
 
             if (level != LOGLEVEL_NONE)
-            {               
+            {
                 MatchCollection matches = m_categoryRegex.Matches(text);
 
                 if (matches.Count == 1)
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Console
                 WriteColorText(ConsoleColor.Yellow, outText);
             else
                 System.Console.Write(outText);
-        
+
             System.Console.WriteLine();
         }
 
@@ -551,7 +551,7 @@ namespace OpenSim.Framework.Console
                         }
 
                         string commandLine = m_commandLine.ToString();
-                        
+
                         if (isCommand)
                         {
                             string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Console
                         // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
                         if (m_echo && commandLine != "")
                             AddToHistory(commandLine);
-                        
+
                         return commandLine;
                     default:
                         break;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index 1a142df..e1ff720 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Console
 {
     /// <summary>
     /// This is a Fake console that's used when setting up the Scene in Unit Tests
-    /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
+    /// Don't use this except for Unit Testing or you're in for a world of hurt when the
     /// sim gets to ReadLine
     /// </summary>
     public class MockConsole : ICommandConsole
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console
 
         public string ReadLine(string p, bool isCommand, bool e) { return ""; }
 
-        public object ConsoleScene { 
+        public object ConsoleScene {
             get { return null; }
             set {}
         }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 9049b4b..f59c902 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -46,93 +46,93 @@ namespace OpenSim.Framework.Console
     //
     public class RemoteConsole : CommandConsole
     {
-                // Connection specific data, indexed by a session ID
-                // we create when a client connects.
-                protected class ConsoleConnection
-                {
-                        // Last activity from the client
-                        public int last;
-
-                        // Last line of scrollback posted to this client
-                        public long lastLineSeen;
-
-                        // True if this is a new connection, e.g. has never
-                        // displayed a prompt to the user.
-                        public bool newConnection = true;
-                }
-
-                // A line in the scrollback buffer. 
-                protected class ScrollbackEntry
-                {
-                        // The line number of this entry
-                        public long lineNumber;
-
-                        // The text to send to the client
-                        public string text;
-
-                        // The level this should be logged as. Omitted for
-                        // prompts and input echo.
-                        public string level;
-
-                        // True if the text above is a prompt, e.g. the
-                        // client should turn on the cursor / accept input
-                        public bool isPrompt;
-
-                        // True if the requested input is a command. A
-                        // client may offer help or validate input if
-                        // this is set. If false, input should be sent
-                        // as typed.
-                        public bool isCommand;
-
-                        // True if this text represents a line of text that
-                        // was input in response to a prompt. A client should
-                        // turn off the cursor and refrain from sending commands
-                        // until a new prompt is received.
-                        public bool isInput;
-                }
-
-                // Data that is relevant to all connections
-
-                // The scrollback buffer
+        // Connection specific data, indexed by a session ID
+        // we create when a client connects.
+        protected class ConsoleConnection
+        {
+            // Last activity from the client
+            public int last;
+
+            // Last line of scrollback posted to this client
+            public long lastLineSeen;
+
+            // True if this is a new connection, e.g. has never
+            // displayed a prompt to the user.
+            public bool newConnection = true;
+        }
+
+        // A line in the scrollback buffer.
+        protected class ScrollbackEntry
+        {
+            // The line number of this entry
+            public long lineNumber;
+
+            // The text to send to the client
+            public string text;
+
+            // The level this should be logged as. Omitted for
+            // prompts and input echo.
+            public string level;
+
+            // True if the text above is a prompt, e.g. the
+            // client should turn on the cursor / accept input
+            public bool isPrompt;
+
+            // True if the requested input is a command. A
+            // client may offer help or validate input if
+            // this is set. If false, input should be sent
+            // as typed.
+            public bool isCommand;
+
+            // True if this text represents a line of text that
+            // was input in response to a prompt. A client should
+            // turn off the cursor and refrain from sending commands
+            // until a new prompt is received.
+            public bool isInput;
+        }
+
+        // Data that is relevant to all connections
+
+        // The scrollback buffer
         protected List<ScrollbackEntry> m_Scrollback = new List<ScrollbackEntry>();
 
-                // Monotonously incrementing line number. This may eventually
-                // wrap. No provision is made for that case because 64 bits
-                // is a long, long time.
+        // Monotonously incrementing line number. This may eventually
+        // wrap. No provision is made for that case because 64 bits
+        // is a long, long time.
         protected long m_lineNumber = 0;
 
-                // These two variables allow us to send the correct
-                // information about the prompt status to the client,
-                // irrespective of what may have run off the top of the
-                // scrollback buffer;
-                protected bool m_expectingInput = false;
-                protected bool m_expectingCommand = true;
-                protected string m_lastPromptUsed;
-                
-                // This is the list of things received from clients.
-                // Note: Race conditions can happen. If a client sends
-                // something while nothing is expected, it will be
-                // intepreted as input to the next prompt. For
-                // commands this is largely correct. For other prompts,
-                // YMMV.
-                // TODO: Find a better way to fix this
+        // These two variables allow us to send the correct
+        // information about the prompt status to the client,
+        // irrespective of what may have run off the top of the
+        // scrollback buffer;
+        protected bool m_expectingInput = false;
+        protected bool m_expectingCommand = true;
+        protected string m_lastPromptUsed;
+
+        // This is the list of things received from clients.
+        // Note: Race conditions can happen. If a client sends
+        // something while nothing is expected, it will be
+        // intepreted as input to the next prompt. For
+        // commands this is largely correct. For other prompts,
+        // YMMV.
+        // TODO: Find a better way to fix this
         protected List<string> m_InputData = new List<string>();
 
-                // Event to allow ReadLine to wait synchronously even though
-                // everthing else is asynchronous here.
+        // Event to allow ReadLine to wait synchronously even though
+        // everthing else is asynchronous here.
         protected ManualResetEvent m_DataEvent = new ManualResetEvent(false);
 
-                // The list of sessions we maintain. Unlike other console types,
-                // multiple users on the same console are explicitly allowed.
+        // The list of sessions we maintain. Unlike other console types,
+        // multiple users on the same console are explicitly allowed.
         protected Dictionary<UUID, ConsoleConnection> m_Connections =
                 new Dictionary<UUID, ConsoleConnection>();
 
-                // Timer to control expiration of sessions that have been
-                // disconnected.
-                protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
+        // Timer to control expiration of sessions that have been
+        // disconnected.
+        protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
 
-                // The less interesting stuff that makes the actual server
-                // work.
+        // The less interesting stuff that makes the actual server
+        // work.
         protected IHttpServer m_Server = null;
         protected IConfigSource m_Config = null;
 
@@ -143,130 +143,130 @@ namespace OpenSim.Framework.Console
 
         public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
         {
-                        // There is something wrong with this architecture.
-                        // A prompt is sent on every single input, so why have this?
-                        // TODO: Investigate and fix.
-                        m_lastPromptUsed = defaultPrompt;
-
-                        // Start expiration of sesssions.
-                        m_expireTimer.Elapsed += DoExpire;
-                        m_expireTimer.Start();
+            // There is something wrong with this architecture.
+            // A prompt is sent on every single input, so why have this?
+            // TODO: Investigate and fix.
+            m_lastPromptUsed = defaultPrompt;
+
+            // Start expiration of sesssions.
+            m_expireTimer.Elapsed += DoExpire;
+            m_expireTimer.Start();
         }
 
         public void ReadConfig(IConfigSource config)
         {
             m_Config = config;
 
-                        // We're pulling this from the 'Network' section for legacy
-                        // compatibility. However, this is so essentially insecure
-                        // that TLS and client certs should be used instead of
-                        // a username / password.
+            // We're pulling this from the 'Network' section for legacy
+            // compatibility. However, this is so essentially insecure
+            // that TLS and client certs should be used instead of
+            // a username / password.
             IConfig netConfig = m_Config.Configs["Network"];
 
             if (netConfig == null)
                 return;
 
-                        // Get the username and password.
+            // Get the username and password.
             m_UserName = netConfig.GetString("ConsoleUser", String.Empty);
             m_Password = netConfig.GetString("ConsolePass", String.Empty);
 
-                        // Woefully underdocumented, this is what makes javascript
-                        // console clients work. Set to "*" for anywhere or (better)
-                        // to specific addresses.
+            // Woefully underdocumented, this is what makes javascript
+            // console clients work. Set to "*" for anywhere or (better)
+            // to specific addresses.
             m_AllowedOrigin = netConfig.GetString("ConsoleAllowedOrigin", String.Empty);
         }
 
         public void SetServer(IHttpServer server)
         {
-                        // This is called by the framework to give us the server
-                        // instance (means: port) to work with.
+            // This is called by the framework to give us the server
+            // instance (means: port) to work with.
             m_Server = server;
 
-                        // Add our handlers
+            // Add our handlers
             m_Server.AddHTTPHandler("/StartSession/", HandleHttpStartSession);
             m_Server.AddHTTPHandler("/CloseSession/", HandleHttpCloseSession);
             m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
         }
 
         public override void Output(string text, string level)
-                {
-                        Output(text, level, false, false, false);
-                }
+        {
+            Output(text, level, false, false, false);
+        }
 
         protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
         {
-                        // Increment the line number. It was 0 and they start at 1
-                        // so we need to pre-increment.
-                        m_lineNumber++;
-
-                        // Create and populate the new entry.
-                        ScrollbackEntry newEntry = new ScrollbackEntry();
-
-                        newEntry.lineNumber = m_lineNumber;
-                        newEntry.text = text;
-                        newEntry.level = level;
-                        newEntry.isPrompt = isPrompt;
-                        newEntry.isCommand = isCommand;
-                        newEntry.isInput = isInput;
-
-                        // Add a line to the scrollback. In some cases, that may not
-                        // actually be a line of text.
+            // Increment the line number. It was 0 and they start at 1
+            // so we need to pre-increment.
+            m_lineNumber++;
+
+            // Create and populate the new entry.
+            ScrollbackEntry newEntry = new ScrollbackEntry();
+
+            newEntry.lineNumber = m_lineNumber;
+            newEntry.text = text;
+            newEntry.level = level;
+            newEntry.isPrompt = isPrompt;
+            newEntry.isCommand = isCommand;
+            newEntry.isInput = isInput;
+
+            // Add a line to the scrollback. In some cases, that may not
+            // actually be a line of text.
             lock (m_Scrollback)
             {
-                                // Prune the scrollback to the length se send as connect
-                                // burst to give the user some context.
+                // Prune the scrollback to the length se send as connect
+                // burst to give the user some context.
                 while (m_Scrollback.Count >= 1000)
                     m_Scrollback.RemoveAt(0);
 
                 m_Scrollback.Add(newEntry);
             }
 
-                        // Let the rest of the system know we have output something.
+            // Let the rest of the system know we have output something.
             FireOnOutput(text.Trim());
 
-                        // Also display it for debugging.
+            // Also display it for debugging.
             System.Console.WriteLine(text.Trim());
         }
 
         public override void Output(string text)
         {
-                        // Output plain (non-logging style) text.
+            // Output plain (non-logging style) text.
             Output(text, String.Empty, false, false, false);
         }
 
         public override string ReadLine(string p, bool isCommand, bool e)
         {
-                        // Output the prompt an prepare to wait. This
-                        // is called on a dedicated console thread and
-                        // needs to be synchronous. Old architecture but
-                        // not worth upgrading.
-                        if (isCommand)
-                        {
-                                m_expectingInput = true;
-                                m_expectingCommand = true;
+            // Output the prompt an prepare to wait. This
+            // is called on a dedicated console thread and
+            // needs to be synchronous. Old architecture but
+            // not worth upgrading.
+            if (isCommand)
+            {
+                m_expectingInput = true;
+                m_expectingCommand = true;
                 Output(p, String.Empty, true, true, false);
-                                m_lastPromptUsed = p;
-                        }
-                        else
-                        {
-                                m_expectingInput = true;
+                m_lastPromptUsed = p;
+            }
+            else
+            {
+                m_expectingInput = true;
                 Output(p, String.Empty, true, false, false);
-                        }
+            }
 
 
-                        // Here is where we wait for the user to input something.
+            // Here is where we wait for the user to input something.
             m_DataEvent.WaitOne();
 
             string cmdinput;
 
-                        // Check for empty input. Read input if not empty.
+            // Check for empty input. Read input if not empty.
             lock (m_InputData)
             {
                 if (m_InputData.Count == 0)
                 {
                     m_DataEvent.Reset();
-                                        m_expectingInput = false;
-                                        m_expectingCommand = false;
+                    m_expectingInput = false;
+                    m_expectingCommand = false;
 
                     return "";
                 }
@@ -278,19 +278,19 @@ namespace OpenSim.Framework.Console
 
             }
 
-                        m_expectingInput = false;
-                        m_expectingCommand = false;
+            m_expectingInput = false;
+            m_expectingCommand = false;
 
-                        // Echo to all the other users what we have done. This
-                        // will also go to ourselves.
-                        Output (cmdinput, String.Empty, false, false, true);
+            // Echo to all the other users what we have done. This
+            // will also go to ourselves.
+            Output (cmdinput, String.Empty, false, false, true);
 
-                        // If this is a command, we need to resolve and execute it.
+            // If this is a command, we need to resolve and execute it.
             if (isCommand)
             {
-                                // This call will actually execute the command and create
-                                // any output associated with it. The core just gets an
-                                // empty string so it will call again immediately.
+                // This call will actually execute the command and create
+                // any output associated with it. The core just gets an
+                // empty string so it will call again immediately.
                 string[] cmd = Commands.Resolve(Parser.Parse(cmdinput));
 
                 if (cmd.Length != 0)
@@ -306,11 +306,11 @@ namespace OpenSim.Framework.Console
                 }
             }
 
-                        // Return the raw input string if not a command.
+            // Return the raw input string if not a command.
             return cmdinput;
         }
 
-                // Very simplistic static access control header.
+        // Very simplistic static access control header.
         protected Hashtable CheckOrigin(Hashtable result)
         {
             if (!string.IsNullOrEmpty(m_AllowedOrigin))
@@ -338,21 +338,21 @@ namespace OpenSim.Framework.Console
 
         protected void DoExpire(Object sender, ElapsedEventArgs e)
         {
-                        // Iterate the list of console connections and find those we
-                        // haven't heard from for longer then the longpoll interval.
-                        // Remove them.
+            // Iterate the list of console connections and find those we
+            // haven't heard from for longer then the longpoll interval.
+            // Remove them.
             List<UUID> expired = new List<UUID>();
 
             lock (m_Connections)
             {
-                                // Mark the expired ones
+                // Mark the expired ones
                 foreach (KeyValuePair<UUID, ConsoleConnection> kvp in m_Connections)
                 {
                     if (System.Environment.TickCount - kvp.Value.last > 500000)
                         expired.Add(kvp.Key);
                 }
 
-                                // Delete them
+                // Delete them
                 foreach (UUID id in expired)
                 {
                     m_Connections.Remove(id);
@@ -361,10 +361,10 @@ namespace OpenSim.Framework.Console
             }
         }
 
-                // Start a new session.
+        // Start a new session.
         protected Hashtable HandleHttpStartSession(Hashtable request)
         {
-                        // The login is in the form of a http form post
+            // The login is in the form of a http form post
             Hashtable post = DecodePostString(request["body"].ToString());
             Hashtable reply = new Hashtable();
 
@@ -372,7 +372,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 401;
             reply["content_type"] = "text/plain";
 
-                        // Check user name and password
+            // Check user name and password
             if (m_UserName == String.Empty)
                 return reply;
 
@@ -385,28 +385,28 @@ namespace OpenSim.Framework.Console
                 return reply;
             }
 
-                        // Set up the new console connection record
+            // Set up the new console connection record
             ConsoleConnection c = new ConsoleConnection();
             c.last = System.Environment.TickCount;
             c.lastLineSeen = 0;
 
-                        // Assign session ID
+            // Assign session ID
             UUID sessionID = UUID.Random();
 
-                        // Add connection to list.
+            // Add connection to list.
             lock (m_Connections)
             {
                 m_Connections[sessionID] = c;
             }
 
-                        // This call is a CAP. The URL is the authentication.
+            // This call is a CAP. The URL is the authentication.
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(
                 uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
-                        // Our reply is an XML document.
-                        // TODO: Change this to Linq.Xml
+            // Our reply is an XML document.
+            // TODO: Change this to Linq.Xml
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -429,7 +429,7 @@ namespace OpenSim.Framework.Console
 
             rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
 
-                        // Set up the response and check origin
+            // Set up the response and check origin
             reply["str_response_string"] = xmldoc.InnerXml;
             reply["int_response_code"] = 200;
             reply["content_type"] = "text/xml";
@@ -438,7 +438,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Client closes session. Clean up.
+        // Client closes session. Clean up.
         protected Hashtable HandleHttpCloseSession(Hashtable request)
         {
             Hashtable post = DecodePostString(request["body"].ToString());
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Command received from the client.
+        // Command received from the client.
         protected Hashtable HandleHttpSessionCommand(Hashtable request)
         {
             Hashtable post = DecodePostString(request["body"].ToString());
@@ -497,7 +497,7 @@ namespace OpenSim.Framework.Console
             reply["int_response_code"] = 404;
             reply["content_type"] = "text/plain";
 
-                        // Check the ID
+            // Check the ID
             if (post["ID"] == null)
                 return reply;
 
@@ -505,25 +505,25 @@ namespace OpenSim.Framework.Console
             if (!UUID.TryParse(post["ID"].ToString(), out id))
                 return reply;
 
-                        // Find the connection for that ID.
+            // Find the connection for that ID.
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(id))
                     return reply;
             }
 
-                        // Empty post. Just error out.
+            // Empty post. Just error out.
             if (post["COMMAND"] == null)
                 return reply;
 
-                        // Place the input data in the buffer.
+            // Place the input data in the buffer.
             lock (m_InputData)
             {
                 m_DataEvent.Set();
                 m_InputData.Add(post["COMMAND"].ToString());
             }
 
-                        // Create the XML reply document.
+            // Create the XML reply document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -547,7 +547,7 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-                // Decode a HTTP form post to a Hashtable
+        // Decode a HTTP form post to a Hashtable
         protected Hashtable DecodePostString(string data)
         {
             Hashtable result = new Hashtable();
@@ -565,14 +565,14 @@ namespace OpenSim.Framework.Console
 
                 if (elems.Length > 1)
                     value = System.Web.HttpUtility.UrlDecode(elems[1]);
-                
+
                 result[name] = value;
             }
 
             return result;
         }
 
-                // Close the CAP receiver for the responses for a given client.
+        // Close the CAP receiver for the responses for a given client.
         public void CloseConnection(UUID id)
         {
             try
@@ -586,8 +586,8 @@ namespace OpenSim.Framework.Console
             }
         }
 
-                // Check if there is anything to send. Return true if this client has
-                // lines pending.
+        // Check if there is anything to send. Return true if this client has
+        // lines pending.
         protected bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
@@ -604,10 +604,10 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-                // Send all pending output to the client.
+        // Send all pending output to the client.
         protected Hashtable GetEvents(UUID RequestID, UUID sessionID)
         {
-                        // Find the connection that goes with this client.
+            // Find the connection that goes with this client.
             ConsoleConnection c = null;
 
             lock (m_Connections)
@@ -617,14 +617,14 @@ namespace OpenSim.Framework.Console
                 c = m_Connections[sessionID];
             }
 
-                        // If we have nothing to send, send the no events response.
+            // If we have nothing to send, send the no events response.
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_lineNumber)
                 return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
-                        // Create the response document.
+            // Create the response document.
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                     "", "");
@@ -648,29 +648,29 @@ namespace OpenSim.Framework.Console
 
                 for (long i = sendStart ; i < m_lineNumber ; i++)
                 {
-                                        ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
+                    ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
 
                     XmlElement res = xmldoc.CreateElement("", "Line", "");
                     res.SetAttribute("Number", e.lineNumber.ToString());
                     res.SetAttribute("Level", e.level);
-                                        // Don't include these for the scrollback, we'll send the
-                                        // real state later.
-                                        if (!c.newConnection)
-                                        {
-                                                res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
-                                                res.SetAttribute("Command", e.isCommand ? "true" : "false");
-                                                res.SetAttribute("Input", e.isInput ? "true" : "false");
-                                        }
-                                        else if (i == m_lineNumber - 1) // Last line for a new connection
-                                        {
-                                                res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
-                                                res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
-                                                res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
-                                        }
-                                        else
-                                        {
-                                                res.SetAttribute("Input", e.isInput ? "true" : "false");
-                                        }
+                    // Don't include these for the scrollback, we'll send the
+                    // real state later.
+                    if (!c.newConnection)
+                    {
+                        res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
+                        res.SetAttribute("Command", e.isCommand ? "true" : "false");
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+                    else if (i == m_lineNumber - 1) // Last line for a new connection
+                    {
+                        res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
+                        res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
+                        res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
+                    }
+                    else
+                    {
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
 
                     res.AppendChild(xmldoc.CreateTextNode(e.text));
 
@@ -679,7 +679,7 @@ namespace OpenSim.Framework.Console
             }
 
             c.lastLineSeen = m_lineNumber;
-                        c.newConnection = false;
+            c.newConnection = false;
 
             xmldoc.AppendChild(rootElement);
 
@@ -693,8 +693,8 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-                // This is really just a no-op. It generates what is sent
-                // to the client if the poll times out without any events.
+        // This is really just a no-op. It generates what is sent
+        // to the client if the poll times out without any events.
         protected Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 4995a92..1915fa5 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -63,9 +63,9 @@ namespace OpenSim.Framework
         {
             get { return m_map; }
             set { m_map = value; }
-        }        
-        
-        public XmlSchema GetSchema() { return null; } 
+        }
+
+        public XmlSchema GetSchema() { return null; }
 
         public static DAMap FromXml(string rawXml)
         {
@@ -73,19 +73,19 @@ namespace OpenSim.Framework
             map.ReadXml(rawXml);
             return map;
         }
-       
+
         public void ReadXml(XmlReader reader)
-        { 
-            ReadXml(reader.ReadInnerXml());            
+        {
+            ReadXml(reader.ReadInnerXml());
         }
 
         public void ReadXml(string rawXml)
-        {            
+        {
             // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
-            
+
             lock (this)
             {
-                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);         
+                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
                 SanitiseMap(this);
             }
         }
@@ -104,7 +104,7 @@ namespace OpenSim.Framework
         public void CopyFrom(DAMap other)
         {
             // Deep copy
-            
+
             string data = null;
             lock (other)
             {
@@ -113,7 +113,7 @@ namespace OpenSim.Framework
                     data = OSDParser.SerializeLLSDXmlString(other.m_map);
                 }
             }
-            
+
             lock (this)
             {
                 if (data == null)
@@ -185,9 +185,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Get the number of stores.
         /// </summary>
-        public int CountStores 
+        public int CountStores
         {
-            get 
+            get
             {
                 int count = 0;
 
@@ -263,8 +263,8 @@ namespace OpenSim.Framework
                 throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH);
         }
 
-        public bool ContainsStore(string ns, string storeName) 
-        {    
+        public bool ContainsStore(string ns, string storeName)
+        {
             OSD namespaceOsd;
 
             lock (this)
@@ -276,7 +276,7 @@ namespace OpenSim.Framework
             }
 
             return false;
-        }     
+        }
 
         public bool TryGetStore(string ns, string storeName, out OSDMap store)
         {
@@ -297,17 +297,17 @@ namespace OpenSim.Framework
 
             store = null;
             return false;
-        }    
+        }
 
         public void Clear()
         {
             lock (this)
                 m_map.Clear();
-        }  
+        }
 
         public bool RemoveStore(string ns, string storeName)
         {
-            OSD namespaceOsd; 
+            OSD namespaceOsd;
 
             lock (this)
             {
@@ -323,6 +323,6 @@ namespace OpenSim.Framework
             }
 
             return false;
-        }     
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/DOMap.cs b/OpenSim/Framework/DOMap.cs
index f5b650b..033cbf9 100644
--- a/OpenSim/Framework/DOMap.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
     public class DOMap
     {
         private IDictionary<string, object> m_map;
-        
+
         public void Add(string ns, string objName, object dynObj)
         {
             DAMap.ValidateNamespace(ns);
diff --git a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
index 4ff8cba..55ec13e 100644
--- a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
+++ b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -90,10 +90,10 @@ namespace OpenSim.Framework
                 Dictionary1[key1] = value;
                 Dictionary2[key2] = value;
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
         }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -117,10 +117,10 @@ namespace OpenSim.Framework
                 Dictionary1.Remove(key1);
                 success = Dictionary2.Remove(key2);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return success;
@@ -136,7 +136,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -159,10 +159,10 @@ namespace OpenSim.Framework
                     }
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return found;
@@ -178,7 +178,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -201,10 +201,10 @@ namespace OpenSim.Framework
                     }
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
 
             return found;
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterWriteLock();
@@ -229,10 +229,10 @@ namespace OpenSim.Framework
                 Dictionary1.Clear();
                 Dictionary2.Clear();
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
             }
         }
 
@@ -256,24 +256,24 @@ namespace OpenSim.Framework
             bool success;
             bool gotLock = false;
 
-            try 
-            { 
+            try
+            {
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
                     gotLock = true;
                 }
 
-                success = Dictionary1.TryGetValue(key, out value); 
+                success = Dictionary1.TryGetValue(key, out value);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return success;
@@ -284,24 +284,24 @@ namespace OpenSim.Framework
             bool success;
             bool gotLock = false;
 
-            try 
-            { 
+            try
+            {
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
                     gotLock = true;
                 }
 
-                success = Dictionary2.TryGetValue(key, out value); 
+                success = Dictionary2.TryGetValue(key, out value);
             }
-            finally 
-            {   
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return success;
@@ -316,7 +316,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -326,10 +326,10 @@ namespace OpenSim.Framework
                 foreach (TValue value in Dictionary1.Values)
                     action(value);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -352,10 +352,10 @@ namespace OpenSim.Framework
                 foreach (KeyValuePair<TKey1, TValue> entry in Dictionary1)
                     action(entry);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -378,10 +378,10 @@ namespace OpenSim.Framework
                 foreach (KeyValuePair<TKey2, TValue> entry in Dictionary2)
                     action(entry);
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
         }
 
@@ -394,7 +394,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -407,10 +407,10 @@ namespace OpenSim.Framework
                         return value;
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return default(TValue);
@@ -426,7 +426,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterReadLock();
@@ -439,10 +439,10 @@ namespace OpenSim.Framework
                         list.Add(value);
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
             }
 
             return list;
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
                 // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
                 // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
                 // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
+                try {}
                 finally
                 {
                     rwLock.EnterUpgradeableReadLock();
@@ -482,7 +482,7 @@ namespace OpenSim.Framework
 
                 try
                 {
-                    try {}            
+                    try {}
                     finally
                     {
                         rwLock.EnterUpgradeableReadLock();
@@ -495,16 +495,16 @@ namespace OpenSim.Framework
                     for (int i = 0; i < list2.Count; i++)
                         Dictionary2.Remove(list2[i]);
                 }
-                finally 
-                { 
+                finally
+                {
                     if (gotWriteLock)
-                        rwLock.ExitWriteLock(); 
+                        rwLock.ExitWriteLock();
                 }
             }
-            finally 
-            { 
+            finally
+            {
                 if (gotUpgradeableLock)
-                    rwLock.ExitUpgradeableReadLock(); 
+                    rwLock.ExitUpgradeableReadLock();
             }
 
             return list.Count;
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index ebed794..12a92bb 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                return m_estateID; 
+                return m_estateID;
             }
             set
             {
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 844230b..7134cbf 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -430,7 +430,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID, 32) && 
+            if (!IsBanned(ban.BannedUserID, 32) &&
                 (l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans
                 l_EstateBans.Add(ban);
         }
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 6954c64..1605005 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
             binaryBucket = im.binaryBucket;
             RegionID = im.RegionID;
             ParentEstateID = im.ParentEstateID;
- 
+
             if (addTimestamp)
                 timestamp = (uint)Util.UnixTimeSinceEpoch();
         }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1541b3a..1267993 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
     public delegate void ObjectAttach(
         IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
 
-    public delegate void ModifyTerrain(UUID user, 
+    public delegate void ModifyTerrain(UUID user,
         float height, float seconds, byte size, byte action, float north, float west, float south, float east,
         UUID agentId);
 
@@ -473,46 +473,46 @@ namespace OpenSim.Framework
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
-    
+
     public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
-    
+
     public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
-    
+
     public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
-    
+
     public delegate void FindAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
+
     public delegate void TrackAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
+
     public delegate void FreezeUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
+
     public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
+
     public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string Summary, UUID reporter);
-    
+
     public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY);
-    
+
     public delegate void GodlikeMessage(IClientAPI client, UUID requester, byte[] Method, byte[] Parameter);
-    
+
     public delegate void SaveStateHandler(IClientAPI client,UUID agentID);
-    
+
     public delegate void GroupAccountSummaryRequest(IClientAPI client,UUID agentID, UUID groupID);
-    
+
     public delegate void GroupAccountDetailsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void GroupAccountTransactionsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void ParcelBuyPass(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
+
     public delegate void ParcelGodMark(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
+
     public delegate void GroupActiveProposalsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
+
     public delegate void GroupVoteHistoryRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
-    
+
+
     public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
-    
+
     public delegate void SendPostcard(IClientAPI client);
     public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags);
 
@@ -763,7 +763,7 @@ namespace OpenSim.Framework
         /// Only set for root agents.
         /// </remarks>
         bool IsLoggingOut { get; set; }
-        
+
         bool SendLogoutPacketWhenClosing { set; }
 
         // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
@@ -1034,7 +1034,7 @@ namespace OpenSim.Framework
         event MuteListRequest OnMuteListRequest;
 
         event PlacesQuery OnPlacesQuery;
-        
+
         event FindAgentUpdate OnFindAgent;
         event TrackAgentUpdate OnTrackAgent;
         event NewUserReport OnUserReport;
@@ -1079,12 +1079,12 @@ namespace OpenSim.Framework
         void Close(bool sendStop, bool force);
 
         void Kick(string message);
-        
+
         /// <summary>
         /// Start processing for this client.
         /// </summary>
         void Start();
-        
+
         void Stop();
 
         //     void ActivateGesture(UUID assetId, UUID gestureId);
@@ -1155,7 +1155,7 @@ namespace OpenSim.Framework
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
 
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
-        
+
         /// <summary>
         /// Return circuit information for this client.
         /// </summary>
@@ -1223,10 +1223,10 @@ namespace OpenSim.Framework
         /// <summary>
         /// Used by the server to inform the client of new inventory items and folders.
         /// </summary>
-        /// 
+        ///
         /// If the node is a folder then the contents will be transferred
         /// (including all descendent folders) as well as the folder itself.
-        /// 
+        ///
         /// <param name="node"></param>
         void SendBulkUpdateInventory(InventoryNodeBase node);
 
@@ -1289,7 +1289,7 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-        
+
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
 
@@ -1357,7 +1357,7 @@ namespace OpenSim.Framework
         void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
 
         /// <summary>
-        /// Send the next packet for a series of packets making up a single texture, 
+        /// Send the next packet for a series of packets making up a single texture,
         /// as established by SendImageFirstPart()
         /// </summary>
         /// <param name="partNumber"></param>
@@ -1481,7 +1481,7 @@ namespace OpenSim.Framework
         void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
 
         void SendUserInfoReply(bool imViaEmail, bool visible, string email);
-        
+
         void SendUseCachedMuteList();
 
         void SendMuteListUpdate(string filename);
@@ -1495,13 +1495,13 @@ namespace OpenSim.Framework
         void SendRebakeAvatarTextures(UUID textureID);
 
         void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
-        
+
         void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt);
-        
+
         void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier);
-        
+
         void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
-        
+
         void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
         void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
 
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index 27b9c56..69b5b42 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
     /// Represent generic cache to store key/value pairs (elements) limited by time, size and count of elements.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
     /// </typeparam>
     /// <remarks>
     /// <para>
@@ -51,8 +51,8 @@ namespace OpenSim.Framework
     /// <item>
     /// <term>Time</term>
     /// <description>
-    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are 
-    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache. 
+    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are
+    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache.
     /// <see cref="IsTimeLimited"/> returns <see langword="true"/>, if cache is limited by time.
     /// </description>
     /// </item>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
     /// <term>Count</term>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxCount"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
+    /// used element(s) from the cache, until element fits to cache.
     /// <see cref="IsCountLimited"/> returns <see langword="true"/>, if cache is limiting element count.
     /// </description>
     /// </item>
@@ -69,8 +69,8 @@ namespace OpenSim.Framework
     /// <description>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxSize"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
-    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements. 
+    /// used element(s) from the cache, until element fits to cache.
+    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements.
     /// Normally size is bytes used by element in the cache. But it can be any other suitable unit of measure.
     /// </description>
     /// </description>
@@ -84,8 +84,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxCount"/>
@@ -102,13 +102,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/> 
-        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/>
+        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="MaxSize"/> or <see cref="MaxCount"/>.
         /// </para>
         /// <para>
@@ -135,12 +135,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -153,17 +153,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="Count"/>
-        /// <seealso cref="MaxCount"/> 
+        /// <seealso cref="MaxCount"/>
         /// <seealso cref="IsSizeLimited"/>
         /// <seealso cref="IsTimeLimited"/>
         bool IsCountLimited { get; }
@@ -172,13 +172,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -192,13 +192,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="Set"/>
-        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ExpirationTime"/>
@@ -206,18 +206,18 @@ namespace OpenSim.Framework
         /// <seealso cref="IsCountLimited"/>
         /// <seealso cref="IsSizeLimited"/>
         bool IsTimeLimited { get; }
-        
+
         /// <summary>
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         int MaxCount { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -251,8 +251,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -272,11 +272,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -294,8 +294,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
         void RemoveRange(IEnumerable<TKey> keys);
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -391,17 +391,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="IsSizeLimited"/>
@@ -417,15 +417,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 63cc7eb..44a24b9 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <returns></returns>
         List<ILandObject> AllParcels();
-             
+
         /// <summary>
         /// Get the parcel at the specified point
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="localID"></param>
         /// <returns></returns>
         ILandObject GetLandObject(int localID);
-        
+
         /// <summary>
         /// Clear the land channel of all parcels.
         /// </summary>
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If true, set up a default parcel covering the whole region owned by the estate owner.
         /// </param>
         void Clear(bool setupDefaultParcel);
-        
+
         bool IsForcefulBansAllowed();
         void UpdateLandObject(int localID, LandData data);
         void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index af072fe..f3b850d 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -43,33 +43,33 @@ namespace OpenSim.Framework
         LandData LandData { get; set; }
         bool[,] LandBitmap { get; set; }
         UUID RegionUUID { get; }
-        
+
         /// <summary>
         /// Prim counts for this land object.
         /// </summary>
         IPrimCounts PrimCounts { get; set; }
-        
+
         /// <summary>
-        /// The start point for the land object.  This is the northern-most point as one scans land working from 
+        /// The start point for the land object.  This is the northern-most point as one scans land working from
         /// west to east.
         /// </summary>
         Vector2 StartPoint { get; }
-        
+
         /// <summary>
-        /// The end point for the land object.  This is the southern-most point as one scans land working from 
+        /// The end point for the land object.  This is the southern-most point as one scans land working from
         /// west to east.
-        /// </summary>        
+        /// </summary>
         Vector2 EndPoint { get; }
 
-        // a estimation of a parcel center. 
+        // a estimation of a parcel center.
         Vector2 CenterPoint { get; }
-        
+
         // get positions
         Vector2? GetNearestPoint(Vector3 pos);
         Vector2? GetNearestPointAlongDirection(Vector3 pos, Vector3 pdirection);
 
         bool ContainsPoint(int x, int y);
-        
+
         ILandObject Copy();
 
         void SendLandUpdateToAvatarsOverMe();
@@ -97,16 +97,16 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>The bitmap created.</returns>
         bool[,] BasicFullRegionLandBitmap();
-        
+
         /// <summary>
         /// Create a square land bitmap.
         /// </summary>
         /// <remarks>
         /// Land co-ordinates are zero indexed.  The inputs are treated as points.  So if you want to create a bitmap
-        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to 
+        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to
         /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 255.
-        /// 
-        /// At the moment, the smallest parcel of land is 4m x 4m, so if the 
+        ///
+        /// At the moment, the smallest parcel of land is 4m x 4m, so if the
         /// region is 256 x 256m (the SL size), the bitmap returned will start at (0,0) and end at (63,63).
         /// The value of the set_value needs to be true to define an active parcel of the given size.
         /// </remarks>
@@ -117,7 +117,7 @@ namespace OpenSim.Framework
         /// <param name="set_value"></param>
         /// <returns>The bitmap created.</returns>
         bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true);
-        
+
         bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
 
         /// <summary>
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
         /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
         /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt;</param>
         /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
-        /// <returns>New parcel bitmap</returns>       
+        /// <returns>New parcel bitmap</returns>
         bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax);
 
         byte[] ConvertLandBitmapToBytes();
@@ -177,7 +177,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="url"></param>
         void SetMediaUrl(string url);
-        
+
         /// <summary>
         /// Set the music url for this land parcel
         /// </summary>
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
index 3e12348..3b62ad3 100644
--- a/OpenSim/Framework/IPrimCounts.cs
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -35,12 +35,12 @@ namespace OpenSim.Framework
         /// Parcel owner owned prims
         /// </summary>
         int Owner { get; }
-        
+
         /// <summary>
         /// Parcel group owned prims
         /// </summary>
         int Group { get; }
-        
+
         /// <summary>
         /// Prims owned by others (not parcel owner or parcel group).
         /// </summary>
@@ -48,19 +48,19 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Selected prims
-        /// </summary>        
-        int Selected { get; }        
-        
+        /// </summary>
+        int Selected { get; }
+
         /// <summary>
         /// Total prims on the parcel.
         /// </summary>
         int Total { get; }
-        
+
         /// <summary>
         /// Prims on the simulator that are owned by the parcel owner, even if they are in other parcels.
         /// </summary>
         int Simulator { get; }
-        
+
         /// <summary>
         /// Prims per individual users.
         /// </summary>
diff --git a/OpenSim/Framework/IRegistryCore.cs b/OpenSim/Framework/IRegistryCore.cs
index a94b65d..cf3ecc0 100644
--- a/OpenSim/Framework/IRegistryCore.cs
+++ b/OpenSim/Framework/IRegistryCore.cs
@@ -31,7 +31,7 @@ using System.Text;
 
 namespace OpenSim.Framework
 {
-    public interface IRegistryCore 
+    public interface IRegistryCore
     {
         T Get<T>();
         void RegisterInterface<T>(T iface);
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index e1b6d1e..37a064f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         Crashed = 2,
         Starting = 3,
     };
-            
+
     /// <value>
     /// Indicate what action to take on an object derez request
     /// </value>
@@ -118,7 +118,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="mod"></param>
         void RegisterModuleInterface<M>(M mod);
-        
+
         void StackModuleInterface<M>(M mod);
 
         /// <summary>
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index c8424e3..5534e24 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -81,6 +81,6 @@ namespace OpenSim.Framework
         /// Direction in which the scene presence is looking.
         /// </summary>
         /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
-        Vector3 Lookat { get; }        
+        Vector3 Lookat { get; }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 139776b..d14f3be 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
         /// XPath like expression
         ///
         /// FIXME: Delimitors which occur in names themselves are not currently escapable.
-        /// 
+        ///
         /// <param name="path">
         /// The path to the required folder.
         /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index f9fd752..c359a0c 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,17 +34,17 @@ namespace OpenSim.Framework
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
     /// </summary>
     public class InventoryItemBase : InventoryNodeBase, ICloneable
-    {        
+    {
         /// <value>
         /// The inventory type of the item.  This is slightly different from the asset type in some situations.
         /// </value>
-        public int InvType 
-        { 
+        public int InvType
+        {
             get
             {
                 return m_invType;
             }
-            
+
             set
             {
                 m_invType = value;
@@ -55,13 +55,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The folder this item is contained in
         /// </value>
-        public UUID Folder 
-        { 
+        public UUID Folder
+        {
             get
             {
                 return m_folder;
             }
-            
+
             set
             {
                 m_folder = value;
@@ -72,17 +72,17 @@ namespace OpenSim.Framework
         /// <value>
         /// The creator of this item
         /// </value>
-        public string CreatorId 
-        { 
+        public string CreatorId
+        {
             get
             {
-                return m_creatorId; 
+                return m_creatorId;
             }
-            
+
             set
             {
                 m_creatorId = value;
-                
+
                 if ((m_creatorId == null) || !UUID.TryParse(m_creatorId, out m_creatorIdAsUuid))
                     m_creatorIdAsUuid = UUID.Zero;
             }
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
         /// <value>
         /// The CreatorId expressed as a UUID.
         /// </value>
-        public UUID CreatorIdAsUuid 
+        public UUID CreatorIdAsUuid
         {
             get
             {
@@ -161,13 +161,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The description of the inventory item (must be less than 64 characters)
         /// </value>
-        public string Description 
-        { 
+        public string Description
+        {
             get
             {
                 return m_description;
             }
-            
+
             set
             {
                 m_description = value;
@@ -178,13 +178,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint NextPermissions 
-        { 
+        public uint NextPermissions
+        {
             get
             {
                 return m_nextPermissions;
             }
-            
+
             set
             {
                 m_nextPermissions = value;
@@ -195,13 +195,13 @@ namespace OpenSim.Framework
         /// <value>
         /// A mask containing permissions for the current owner (cannot be enforced)
         /// </value>
-        public uint CurrentPermissions 
-        { 
+        public uint CurrentPermissions
+        {
             get
             {
                 return m_currentPermissions;
             }
-            
+
             set
             {
                 m_currentPermissions = value;
@@ -212,13 +212,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint BasePermissions 
-        { 
+        public uint BasePermissions
+        {
             get
             {
                 return m_basePermissions;
             }
-            
+
             set
             {
                 m_basePermissions = value;
@@ -229,13 +229,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint EveryOnePermissions 
-        { 
+        public uint EveryOnePermissions
+        {
             get
             {
                 return m_everyonePermissions;
             }
-            
+
             set
             {
                 m_everyonePermissions = value;
@@ -246,13 +246,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint GroupPermissions 
-        { 
+        public uint GroupPermissions
+        {
             get
             {
                 return m_groupPermissions;
             }
-            
+
             set
             {
                 m_groupPermissions = value;
@@ -263,13 +263,13 @@ namespace OpenSim.Framework
         /// <value>
         /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
         /// </value>
-        public int AssetType 
-        { 
+        public int AssetType
+        {
             get
             {
                 return m_assetType;
             }
-            
+
             set
             {
                 m_assetType = value;
@@ -280,13 +280,13 @@ namespace OpenSim.Framework
         /// <value>
         /// The UUID of the associated asset on the asset server
         /// </value>
-        public UUID AssetID 
-        { 
+        public UUID AssetID
+        {
             get
             {
                 return m_assetID;
             }
-            
+
             set
             {
                 m_assetID = value;
@@ -297,13 +297,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public UUID GroupID 
-        { 
+        public UUID GroupID
+        {
             get
             {
                 return m_groupID;
             }
-            
+
             set
             {
                 m_groupID = value;
@@ -314,13 +314,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public bool GroupOwned 
-        { 
+        public bool GroupOwned
+        {
             get
             {
                 return m_groupOwned;
             }
-                
+
             set
             {
                 m_groupOwned = value;
@@ -331,13 +331,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public int SalePrice 
-        { 
+        public int SalePrice
+        {
             get
             {
                 return m_salePrice;
             }
-            
+
             set
             {
                 m_salePrice = value;
@@ -348,13 +348,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public byte SaleType 
-        { 
+        public byte SaleType
+        {
             get
             {
                 return m_saleType;
             }
-            
+
             set
             {
                 m_saleType = value;
@@ -365,13 +365,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public uint Flags 
-        { 
+        public uint Flags
+        {
             get
             {
                 return m_flags;
             }
-            
+
             set
             {
                 m_flags = value;
@@ -382,13 +382,13 @@ namespace OpenSim.Framework
         /// <value>
         ///
         /// </value>
-        public int CreationDate 
-        { 
+        public int CreationDate
+        {
             get
             {
                 return m_creationDate;
             }
-            
+
             set
             {
                 m_creationDate = value;
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 31c3fd1..9ef36b7 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -41,19 +41,19 @@ namespace OpenSim.Framework
         {
             get { return m_name; }
             set { m_name = value; }
-        } 
+        }
         private string m_name = string.Empty;
-        
+
         /// <summary>
         /// A UUID containing the ID for the inventory node itself
         /// </summary>
-        public UUID ID 
+        public UUID ID
         {
             get { return m_id; }
             set { m_id = value; }
         }
         private UUID m_id;
-        
+
         /// <summary>
         /// The agent who's inventory this is contained by
         /// </summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index cfefe3e..13d2977 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Determines if people are able to teleport where they please on the parcel or if they 
+        /// Determines if people are able to teleport where they please on the parcel or if they
         /// get constrainted to a specific point on teleport within the parcel
         /// </summary>
         public byte LandingType
@@ -667,7 +667,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the location 
+        /// When teleporting is restricted to a certain point, this is the location
         /// that the user will be redirected to
         /// </summary>
         public Vector3 UserLocation
@@ -683,7 +683,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the rotation 
+        /// When teleporting is restricted to a certain point, this is the rotation
         /// that the user will be positioned
         /// </summary>
         public Vector3 UserLookAt
@@ -699,7 +699,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 
+        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
         /// the parcel and isn't set to the same 'group' as the parcel.
         /// </summary>
         public int OtherCleanTime
diff --git a/OpenSim/Framework/Lazy.cs b/OpenSim/Framework/Lazy.cs
index 91de4bd..ea07d0e 100644
--- a/OpenSim/Framework/Lazy.cs
+++ b/OpenSim/Framework/Lazy.cs
@@ -14,10 +14,10 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs
index 7ccbba7..21b8178 100644
--- a/OpenSim/Framework/LocklessQueue.cs
+++ b/OpenSim/Framework/LocklessQueue.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        item = oldHeadNext.Item;                       
+                        item = oldHeadNext.Item;
                         haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
                         if (haveAdvancedHead)
                         {
diff --git a/OpenSim/Framework/MapAndArray.cs b/OpenSim/Framework/MapAndArray.cs
index c98d3cc..32d6978 100644
--- a/OpenSim/Framework/MapAndArray.cs
+++ b/OpenSim/Framework/MapAndArray.cs
@@ -45,9 +45,9 @@ namespace OpenSim.Framework
 
         /// <summary>Number of values currently stored in the collection</summary>
         public int Count { get { return m_array.Length; } }
-        /// <summary>NOTE: This collection is thread safe. You do not need to 
-        /// acquire a lock to add, remove, or enumerate entries. This 
-        /// synchronization object should only be locked for larger 
+        /// <summary>NOTE: This collection is thread safe. You do not need to
+        /// acquire a lock to add, remove, or enumerate entries. This
+        /// synchronization object should only be locked for larger
         /// transactions</summary>
         public object SyncRoot { get { return m_syncRoot; } }
 
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Adds a key/value pair to the collection. This will throw an 
+        /// Adds a key/value pair to the collection. This will throw an
         /// exception if the key is already present in the collection
         /// </summary>
         /// <param name="key">Key to add or update</param>
@@ -166,7 +166,7 @@ namespace OpenSim.Framework
         /// Gets a reference to the immutable array of values stored in this
         /// collection. This array is thread safe for iteration
         /// </summary>
-        /// <returns>A thread safe reference ton an array of all of the stored 
+        /// <returns>A thread safe reference ton an array of all of the stored
         /// values</returns>
         public TValue[] GetArray()
         {
@@ -175,7 +175,7 @@ namespace OpenSim.Framework
 
         private void CreateArray()
         {
-            // Rebuild the array from the dictionary. This method must be 
+            // Rebuild the array from the dictionary. This method must be
             // called from inside a lock
             TValue[] array = new TValue[m_dict.Count];
             int i = 0;
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index c8693ae..348a240 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
             map["Extra2"] = OSD.FromInteger(Extra2);
             return map;
         }
-        
+
         public void FromOSD(OSDMap map)
         {
             x = (uint) map["X"].AsInteger();
diff --git a/OpenSim/Framework/MetricsCollector.cs b/OpenSim/Framework/MetricsCollector.cs
index c8f4a33..391f57e 100644
--- a/OpenSim/Framework/MetricsCollector.cs
+++ b/OpenSim/Framework/MetricsCollector.cs
@@ -42,23 +42,23 @@ namespace OpenSim.Framework
         }
     }
 
-    
+
     struct MetricsBucket<T>
     {
         public T value;
         public int count;
     }
 
-    
+
     /// <summary>
     /// Collects metrics in a sliding window.
     /// </summary>
     /// <remarks>
     /// MetricsCollector provides the current Sum of the metrics that it collects. It can easily be extended
     /// to provide the Average, too. It uses a sliding window to keep these values current.
-    /// 
+    ///
     /// This class is not thread-safe.
-    /// 
+    ///
     /// Subclass MetricsCollector to have it use a concrete value type. Override the abstract methods.
     /// </remarks>
     public abstract class MetricsCollector<T>
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 8c2bec6..e513abd 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Monitoring
 
             return sb.ToString();
         }
-        
+
         public virtual string XReport(string uptime, string version)
         {
             return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
diff --git a/OpenSim/Framework/Monitoring/Checks/Check.cs b/OpenSim/Framework/Monitoring/Checks/Check.cs
index 594386a..9a1bd45 100644
--- a/OpenSim/Framework/Monitoring/Checks/Check.cs
+++ b/OpenSim/Framework/Monitoring/Checks/Check.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
             string category,
             string container,
             Func<Check, bool> checkFunc,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
         {
             if (ChecksManager.SubCommands.Contains(category))
                 throw new Exception(
@@ -108,9 +108,9 @@ namespace OpenSim.Framework.Monitoring
         public virtual string ToConsoleString()
         {
             return string.Format(
-                "{0}.{1}.{2} - {3}", 
-                Category, 
-                Container, 
+                "{0}.{1}.{2} - {3}",
+                Category,
+                Container,
                 ShortName,
                 Description);
         }
diff --git a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
index 40df562..e326e8b 100644
--- a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Monitoring
         /// </summary>
         /// <returns></returns>
         string Report();
-         
+
         /// <summary>
         /// Report back collected statistical information in json
         /// </summary>
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index df6b806..0a39e4b 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Monitoring
         /// <summary>
         /// Is this engine running?
         /// </summary>
-        public bool IsRunning { get; private set; } 
+        public bool IsRunning { get; private set; }
 
         /// <summary>
         /// The current job that the engine is running.
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Monitoring
         /// Controls whether we need to warn in the log about exceeding the max queue size.
         /// </summary>
         /// <remarks>
-        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in 
+        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in
         /// order to avoid spamming the log with lots of warnings.
         /// </remarks>
         private bool m_warnOverMaxQueue = true;
@@ -120,7 +120,7 @@ namespace OpenSim.Framework.Monitoring
         }
 
         public void Stop()
-        {   
+        {
             lock (JobLock)
             {
                 try
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Monitoring
         /// Make a job.
         /// </summary>
         /// <remarks>
-        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to 
+        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to
         /// reduce memory churn.  Normally one would directly call QueueJob() with parameters anyway.
         /// </remarks>
         /// <returns></returns>
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Monitoring
                 CommonId = commonId;
                 Action = action;
             }
-                        
+
             /// <summary>
             /// Make a job.  It needs to be separately queued.
             /// </summary>
diff --git a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
index 756e4ed..2ff2014 100644
--- a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Monitoring")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index be4a8b4..3391240 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = workerThreads;
                 });
 
             MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = iocpThreads;
                 });
 
@@ -193,10 +193,10 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat(
-                "HTTPRequestsMade", 
-                "Number of outbound HTTP requests made", 
-                "requests", 
-                ContainerNetwork, 
+                "HTTPRequestsMade",
+                "Number of outbound HTTP requests made",
+                "requests",
+                ContainerNetwork,
                 s => s.Value = WebUtil.RequestNumber,
                 MeasuresOfInterest.AverageChangeOverTime);
 
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Monitoring
                                 });
         }
 
-        // Notes on performance counters: 
+        // Notes on performance counters:
         //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 08c2409..88a0297 100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -90,17 +90,17 @@ namespace OpenSim.Framework.Monitoring
 //        /// haven't yet been implemented...
 //        /// </summary>
 //        public long AssetsInCache { get { return assetsInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
 //        public long TexturesInCache { get { return texturesInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
 //        /// </value>
 //        public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
@@ -127,7 +127,7 @@ namespace OpenSim.Framework.Monitoring
         public float PendingUploads { get { return pendingUploads; } }
         public float ActiveScripts { get { return activeScripts; } }
         public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
-        
+
 //        /// <summary>
 //        /// This is the time it took for the last asset request made in response to a cache miss.
 //        /// </summary>
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Monitoring
 //            assetsInCache++;
 //            //assetCacheMemoryUsage += asset.Data.Length;
 //        }
-//        
+//
 //        public void RemoveAsset(UUID uuid)
 //        {
 //            assetsInCache--;
@@ -204,7 +204,7 @@ namespace OpenSim.Framework.Monitoring
 //            texturesInCache = 0;
 //            textureCacheMemoryUsage = 0;
 //        }
-//        
+//
 //        public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
 //        {
 //            assetRequestTimeAfterCacheMiss = ts;
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Monitoring
             StringBuilder sb = new StringBuilder(Environment.NewLine);
 //            sb.Append("ASSET STATISTICS");
 //            sb.Append(Environment.NewLine);
-                        
+
             /*
             sb.Append(
                 string.Format(
@@ -342,7 +342,7 @@ Asset service request failures: {3}" + Environment.NewLine,
             List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives");
 
             sb.AppendFormat(
-                "Client logouts due to no data receive timeout: {0}\n\n", 
+                "Client logouts due to no data receive timeout: {0}\n\n",
                 stats != null ? stats.Sum(s => s.Value).ToString() : "unknown");
 
 //            sb.Append(Environment.NewLine);
@@ -443,10 +443,10 @@ Asset service request failures: {3}" + Environment.NewLine,
             foreach (ProcessThread currentThread in
                 Process.GetCurrentProcess().Threads)
             {
-                // A known issue with the current process .Threads property is 
-                // that it can return null threads, thus don't count those as 
+                // A known issue with the current process .Threads property is
+                // that it can return null threads, thus don't count those as
                 // running threads and prevent the program function from failing
-                if (currentThread != null && 
+                if (currentThread != null &&
                     currentThread.ThreadState == ThreadState.Running)
                 {
                     numberThreadsRunning++;
@@ -505,7 +505,7 @@ Asset service request failures: {3}" + Environment.NewLine,
                 "{0:0.##}", numberThreadsRunning));
             args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}",
                 memUsage));
-            
+
             return args;
         }
     }
@@ -531,12 +531,12 @@ Asset service request failures: {3}" + Environment.NewLine,
         {
             return m_statsProvider.GetStats();
         }
-        
+
         public string XReport(string uptime, string version)
         {
             return "";
         }
-        
+
         public OSDMap OReport(string uptime, string version)
         {
             OSDMap ret = new OSDMap();
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 916fa53..2402acd 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -121,17 +121,17 @@ namespace OpenSim.Framework.Monitoring
             string container,
             StatType type,
             Action<Stat> pullAction,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
                 : this(
-                    shortName, 
-                    name, 
-                    description, 
-                    unitName, 
-                    category, 
-                    container, 
-                    type, 
-                    MeasuresOfInterest.None, 
-                    pullAction, 
+                    shortName,
+                    name,
+                    description,
+                    unitName,
+                    category,
+                    container,
+                    type,
+                    MeasuresOfInterest.None,
+                    pullAction,
                     verbosity)
         {
         }
@@ -227,11 +227,11 @@ namespace OpenSim.Framework.Monitoring
         {
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat(
-                "{0}.{1}.{2} : {3}{4}", 
-                Category, 
-                Container, 
-                ShortName, 
-                Value, 
+                "{0}.{1}.{2} : {3}{4}",
+                Category,
+                Container,
+                ShortName,
+                Value,
                 string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
@@ -290,7 +290,7 @@ namespace OpenSim.Framework.Monitoring
                 lock (m_samples)
                 {
                     //                    m_log.DebugFormat(
-                    //                        "[STAT]: Samples for {0} are {1}", 
+                    //                        "[STAT]: Samples for {0} are {1}",
                     //                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
 
                     foreach (double s in m_samples)
@@ -326,9 +326,9 @@ namespace OpenSim.Framework.Monitoring
             if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
             {
                 sb.AppendFormat(
-                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
-                    lastChangeOverTime, 
-                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s",
+                    lastChangeOverTime,
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName),
                     averageChangeOverTime,
                     string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
             }
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index 15a37aa..b719af9 100644
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -99,13 +99,13 @@ namespace OpenSim.Framework.Monitoring
             }
 
             string path = cmd[2];
-            
+
             using (StreamWriter sw = new StreamWriter(path, true))
             {
                 foreach (string line in GetReport())
                     sw.WriteLine(line);
-            }   
-            
+            }
+
             MainConsole.Instance.OutputFormat("Stats saved to file {0}", path);
         }
 
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 30926d8..55c3276 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Framework.Monitoring
                     {
                         if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
                             continue;
-                        
+
                         OSDMap statMap = new OSDMap();
 
                         SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
@@ -398,7 +398,7 @@ namespace OpenSim.Framework.Monitoring
             {
                 if (!TryGetStatParents(stat, out category, out container))
                     return false;
-                
+
                 if(container != null)
                 {
                     container.Remove(stat.ShortName);
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index ff439f5..9cc61ee 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Monitoring
                 FirstTick = Environment.TickCount & Int32.MaxValue;
                 LastTick = FirstTick;
 
-                Stat 
+                Stat
                     = new Stat(
                         name,
                         string.Format("Last update of thread {0}", name),
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index a7a03a0..43130f9 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -36,16 +36,16 @@ namespace OpenSim.Framework.Monitoring
     /// Manages various work items in the simulator.
     /// </summary>
     /// <remarks>
-    /// Currently, here work can be started 
+    /// Currently, here work can be started
     ///  * As a long-running and monitored thread.
     ///  * In a thread that will never timeout but where the job is expected to eventually complete.
     ///  * In a threadpool thread that will timeout if it takes a very long time to complete (> 10 mins).
     ///  * As a job which will be run in a single-threaded job engine.  Such jobs must not incorporate delays (sleeps,
     /// network waits, etc.).
-    /// 
+    ///
     /// This is an evolving approach to better manage the work that OpenSimulator is asked to do from a very diverse
     /// range of sources (client actions, incoming network, outgoing network calls, etc.).
-    /// 
+    ///
     /// Util.FireAndForget is still available to insert jobs in the threadpool, though this is equivalent to
     /// WorkManager.RunInThreadPool().
     /// </remarks>
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Monitoring
             thread.Priority = priority;
             thread.IsBackground = isBackground;
             thread.Name = name;
-            
+
             Watchdog.ThreadWatchdogInfo twi
                 = new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
             { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Monitoring
         /// <param name="name">Name of the thread</param>
         public static void RunInThread(WaitCallback callback, object obj, string name, bool log = false)
         {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 Culture.SetCurrentCulture();
                 callback(obj);
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Monitoring
         }
 
         /// <summary>
-        /// Run the callback via a threadpool thread. 
+        /// Run the callback via a threadpool thread.
         /// </summary>
         /// <remarks>
         /// Such jobs may run after some delay but must always complete.
@@ -188,17 +188,17 @@ namespace OpenSim.Framework.Monitoring
         /// <remarks>
         /// This differs from direct scheduling (e.g. Util.FireAndForget) in that a job can be run in the job
         /// engine if it is running, where all jobs are currently performed in sequence on a single thread.  This is
-        /// to prevent observed overload and server freeze problems when there are hundreds of connections which all attempt to 
+        /// to prevent observed overload and server freeze problems when there are hundreds of connections which all attempt to
         /// perform work at once (e.g. in conference situations).  With lower numbers of connections, the small
-        /// delay in performing jobs in sequence rather than concurrently has not been notiecable in testing, though a future more 
+        /// delay in performing jobs in sequence rather than concurrently has not been notiecable in testing, though a future more
         /// sophisticated implementation could perform jobs concurrently when the server is under low load.
-        /// 
+        ///
         /// However, be advised that some callers of this function rely on all jobs being performed in sequence if any
         /// jobs are performed in sequence (i.e. if jobengine is active or not).  Therefore, expanding the jobengine
         /// beyond a single thread will require considerable thought.
-        /// 
+        ///
         /// Also, any jobs submitted must be guaranteed to complete within a reasonable timeframe (e.g. they cannot
-        /// incorporate a network delay with a long timeout).  At the moment, work that could suffer such issues 
+        /// incorporate a network delay with a long timeout).  At the moment, work that could suffer such issues
         /// should still be run directly with RunInThread(), Util.FireAndForget(), etc.  This is another area where
         /// the job engine could be improved and so CPU utilization improved by better management of concurrency within
         /// OpenSimulator.
@@ -212,10 +212,10 @@ namespace OpenSim.Framework.Monitoring
         /// <param name="log">If set to true then extra logging is performed.</param>
         public static void RunJob(
             string jobType, WaitCallback callback, object obj, string name,
-            bool canRunInThisThread = false, bool mustNotTimeout = false, 
+            bool canRunInThisThread = false, bool mustNotTimeout = false,
             bool log = false)
         {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 Culture.SetCurrentCulture();
                 callback(obj);
@@ -273,16 +273,16 @@ namespace OpenSim.Framework.Monitoring
                     MainConsole.Instance.Output("Usage: debug jobengine log <level>");
                     return;
                 }
-                
+
                 //                int logLevel;
                 int logLevel = int.Parse(args[3]);
                 //                if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
-                //                {                 
+                //                {
                 JobEngine.LogLevel = logLevel;
                 MainConsole.Instance.OutputFormat("Set debug log level to {0}", JobEngine.LogLevel);
                 //                }
             }
-            else 
+            else
             {
                 MainConsole.Instance.OutputFormat("Unrecognized job engine subcommand {0}", subCommand);
             }
diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs
index 2e94b0d..93c9446 100644
--- a/OpenSim/Framework/NetworkUtil.cs
+++ b/OpenSim/Framework/NetworkUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
     /// Handles NAT translation in a 'manner of speaking'
     /// Allows you to return multiple different external
     /// hostnames depending on the requestors network
-    /// 
+    ///
     /// This enables standard port forwarding techniques
     /// to work correctly with OpenSim.
     /// </summary>
@@ -145,7 +145,7 @@ namespace OpenSim.Framework
                 byte[] subnetBytes = subnet.Value.GetAddressBytes();
                 byte[] localBytes = subnet.Key.GetAddressBytes();
                 byte[] destBytes = destination.GetAddressBytes();
-                
+
                 if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
                     return null;
 
diff --git a/OpenSim/Framework/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index baa3647..ee4707f 100644
--- a/OpenSim/Framework/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Framework
         private List<IPEndPoint> m_blacklistExceptionEndPoints;
 
         public OutboundUrlFilter(
-            string name, 
-            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints, 
+            string name,
+            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints,
             List<IPNetwork> blacklistExceptionNetworks, List<IPEndPoint> blacklistExceptionEndPoints)
         {
             Name = name;
@@ -79,7 +79,7 @@ namespace OpenSim.Framework
             if (networkConfig != null)
             {
                 configBlacklist = networkConfig.GetString("OutboundDisallowForUserScripts", configBlacklist);
-                configBlacklistExceptions 
+                configBlacklistExceptions
                     = networkConfig.GetString("OutboundDisallowForUserScriptsExcept", configBlacklistExceptions);
             }
 
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
             string fullConfigEntry, string filterName, out List<IPNetwork> networks, out List<IPEndPoint> endPoints)
         {
             // Parse blacklist
-            string[] configBlacklistEntries 
+            string[] configBlacklistEntries
                 = fullConfigEntry.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
 
             configBlacklistEntries = configBlacklistEntries.Select(e => e.Trim()).ToArray();
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
                     if (!Uri.TryCreate("http://" + configEntry, UriKind.Absolute, out configEntryUri))
                     {
                         m_log.ErrorFormat(
-                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}", 
+                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}",
                             configEntry, filterName);
 
                         continue;
@@ -184,14 +184,14 @@ namespace OpenSim.Framework
             foreach (IPEndPoint ep in endPoints)
             {
 //                m_log.DebugFormat(
-//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]", 
+//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]",
 //                    addr, port, ep);
 
                 if (addr.Equals(ep.Address) && port == ep.Port)
                 {
 //                    m_log.DebugFormat(
 //                        "[OUTBOUND URL FILTER]: Found [{0}:{1}] in endpoint [{2}]", addr, port, ep);
-                                        
+
                     return true;
                 }
             }
@@ -228,7 +228,7 @@ namespace OpenSim.Framework
 //                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Found [{0}] in blacklist for {1}", url, Name);
 
                         // Check blacklist exceptions
-                        allowed 
+                        allowed
                             = OutboundUrlFilter.IsInNetwork(
                                 addr, url.Port, m_blacklistExceptionNetworks, m_blacklistExceptionEndPoints, Name);
 
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 0117096..0c94fcb 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -44,17 +44,17 @@ namespace OpenSim.Framework
     /// <summary>
     /// Manager for registries and plugins
     /// </summary>
-        public class PluginManager : SetupService
-        {
-                public AddinRegistry PluginRegistry;
+    public class PluginManager : SetupService
+    {
+        public AddinRegistry PluginRegistry;
 
-                public PluginManager(AddinRegistry registry): base (registry)
+        public PluginManager(AddinRegistry registry): base (registry)
         {
-                        PluginRegistry = registry;
+            PluginRegistry = registry;
 
-                }
+        }
 
-                /// <summary>
+        /// <summary>
         /// Installs the plugin.
         /// </summary>
         /// <returns>
@@ -97,14 +97,14 @@ namespace OpenSim.Framework
                 Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id);
                 PluginRegistry.DisableAddin(addin.Id);
                 addin.Enabled = false;
-                
+
                 MainConsole.Instance.Output("Installation Success");
                 ListInstalledAddins(out res);
                 result = res;
                 return true;
-            } 
+            }
             else
-            {                
+            {
                 MainConsole.Instance.Output("Installation Failed");
                 result = res;
                 return false;
@@ -159,11 +159,11 @@ namespace OpenSim.Framework
         {
             Dictionary<string, object> res = new Dictionary<string, object>();
 
-                        Addin[] addins = GetSortedAddinList("RobustPlugin");
-                        if(addins.Count() < 1)
-                        {
-                                MainConsole.Instance.Output("Error!");
-                        }
+            Addin[] addins = GetSortedAddinList("RobustPlugin");
+            if(addins.Count() < 1)
+            {
+                MainConsole.Instance.Output("Error!");
+            }
             int count = 0;
             foreach (Addin addin in addins)
             {
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
                 r["enabled"] = rep.Enabled == true ? true : false;
                 r["name"] = rep.Name;
                 r["url"] = rep.Url;
-                
+
                 res.Add(count.ToString(), r);
                 count++;
             }
@@ -493,7 +493,7 @@ namespace OpenSim.Framework
         }
 
 
-                
+
         #region Util
         private void Testing()
         {
@@ -537,15 +537,15 @@ namespace OpenSim.Framework
 
             ArrayList xlist = new ArrayList();
             ArrayList list = new ArrayList();
-                        try 
-                        {
-                list.AddRange(PluginRegistry.GetAddins());
-                        }
-                        catch (Exception)
-                        {
-                                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
-                                return x;
-                        }
+            try
+            {
+                list.AddRange(PluginRegistry.GetAddins());
+            }
+            catch (Exception)
+            {
+                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
+                return x;
+            }
 
             foreach (Addin addin in list)
             {
@@ -559,5 +559,5 @@ namespace OpenSim.Framework
             return addins;
         }
         #endregion Util
-        }
+    }
 }
diff --git a/OpenSim/Framework/PrimeNumberHelper.cs b/OpenSim/Framework/PrimeNumberHelper.cs
index 477c274..5a1b3b2 100644
--- a/OpenSim/Framework/PrimeNumberHelper.cs
+++ b/OpenSim/Framework/PrimeNumberHelper.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
     public static class PrimeNumberHelper
     {
         /// <summary>
-        /// Precalculated prime numbers. 
+        /// Precalculated prime numbers.
         /// </summary>
         private static readonly int[] Primes = new int[]
                                                    {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6a12a45..29985d2 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -238,8 +238,8 @@ namespace OpenSim.Framework
                 SculptTexture = prim.Sculpt.SculptTexture;
                 SculptType = (byte)prim.Sculpt.Type;
             }
-            else 
-            {  
+            else
+            {
                 SculptType = (byte)OpenMetaverse.SculptType.None;
             }
         }
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index fec01da..5b9185e 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -57,11 +57,11 @@ namespace OpenSim.Framework
         private Dictionary<uint, LookupItem> m_lookupTable;
 
         // internal state used to ensure the deqeues are spread across the priority
-        // queues "fairly". queuecounts is the amount to pull from each queue in 
+        // queues "fairly". queuecounts is the amount to pull from each queue in
         // each pass. weighted towards the higher priority queues
         private uint m_nextQueue = 0;
         private uint m_countFromQueue = 0;
-        // first queues are imediate, so no counts 
+        // first queues are imediate, so no counts
 //        private uint[] m_queueCounts = { 0, 0,          8,  4,  4, 2,  2,   2,  2,  1,  1, 1 };
         private uint[] m_queueCounts = {0,   0,   8,      8,  5,  4, 3,  2,   1,  1,  1,  1};
         // this is                     ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
                 int count = 0;
                 for (int i = 0; i < m_heaps.Length; ++i)
                     count += m_heaps[i].Count;
-                
+
                 return count;
             }
         }
@@ -170,26 +170,26 @@ namespace OpenSim.Framework
                     return true;
                 }
             }
-            
+
             // To get the fair queing, we cycle through each of the
-            // queues when finding an element to dequeue. 
+            // queues when finding an element to dequeue.
             // We pull (NumberOfQueues - QueueIndex) items from each queue in order
             // to give lower numbered queues a higher priority and higher percentage
-            // of the bandwidth. 
-            
+            // of the bandwidth.
+
             // Check for more items to be pulled from the current queue
             if (m_heaps[m_nextQueue].Count > 0 && m_countFromQueue > 0)
             {
                 m_countFromQueue--;
-                
+
                 MinHeapItem item = m_heaps[m_nextQueue].RemoveMin();
                 m_lookupTable.Remove(item.Value.Entity.LocalId);
                 timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                 value = item.Value;
-                
+
                 return true;
             }
-            
+
             // Find the next non-immediate queue with updates in it
             for (uint i = NumberOfImmediateQueues; i < NumberOfQueues; ++i)
             {
@@ -198,7 +198,7 @@ namespace OpenSim.Framework
                     m_nextQueue = NumberOfImmediateQueues;
 
                 m_countFromQueue = m_queueCounts[m_nextQueue];
-                
+
                 if (m_heaps[m_nextQueue].Count > 0)
                 {
                     m_countFromQueue--;
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Reapply the prioritization function to each of the updates currently
-        /// stored in the priority queues. 
+        /// stored in the priority queues.
         /// </summary
         public void Reprioritize(UpdatePriorityHandler handler)
         {
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8f754a5..99e97e8 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Framework
         }
 
         public string MaptileStaticFile { get; private set; }
-        
+
         /// <summary>
         /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
         /// </summary>
@@ -389,17 +389,17 @@ namespace OpenSim.Framework
         /// <summary>
         /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
         /// </summary>
-        
+
         public string ServerURI
         {
-            get { 
+            get {
                 if ( m_serverURI != string.Empty ) {
                     return m_serverURI;
                 } else {
                     return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                 }
-            }            
-            set { 
+            }
+            set {
                 if ( value.EndsWith("/") ) {
                     m_serverURI = value;
                 } else {
@@ -749,10 +749,10 @@ namespace OpenSim.Framework
 
             m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
             allKeys.Remove("PhysicalPrimMax");
-            
+
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
             allKeys.Remove("ClampPrimSize");
-            
+
             m_objectCapacity = config.GetInt("MaxPrims", 15000);
             allKeys.Remove("MaxPrims");
 
@@ -766,12 +766,12 @@ namespace OpenSim.Framework
             string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString());
             if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID))
             {
-                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 
+                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
             }
 
             MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
             allKeys.Remove("MaptileStaticFile");
-            
+
             #endregion
 
             AgentCapacity = config.GetInt("MaxAgents", 100);
@@ -919,10 +919,10 @@ namespace OpenSim.Framework
 
             if (m_physPrimMin > 0)
                 config.Set("PhysicalPrimMax", m_physPrimMin);
-            
+
             if (m_physPrimMax > 0)
                 config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
+
             config.Set("ClampPrimSize", m_clampPrimSize.ToString());
 
             if (m_objectCapacity > 0)
@@ -1038,7 +1038,7 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Free form string describing the type of region", String.Empty, true);
-            
+
             configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                                 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
         }
@@ -1090,7 +1090,7 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Max objects this sim will hold", "15000", true);
-            
+
             configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Max avatars this sim will hold", "100", true);
 
@@ -1307,8 +1307,8 @@ namespace OpenSim.Framework
             kvp["http_port"] = HttpPort.ToString();
             kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
             kvp["internal_port"] = InternalEndPoint.Port.ToString();
-                        // TODO: Remove in next major version
-                        kvp["alternate_ports"] = "False";
+            // TODO: Remove in next major version
+            kvp["alternate_ports"] = "False";
             kvp["server_uri"] = ServerURI;
 
             return kvp;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index dec01ea..c2947a2 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework
             string[] parts = str.Split(',');
             if (parts.Length != 3)
                 throw new ArgumentException("Invalid string: " + str);
-            
+
             SpawnPoint sp = new SpawnPoint();
             sp.Yaw = float.Parse(parts[0]);
             sp.Pitch = float.Parse(parts[1]);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
         public delegate void SaveDelegate(RegionSettings rs);
 
         public event SaveDelegate OnSave;
-        
+
         /// <value>
         /// These appear to be terrain textures that are shipped with the client.
         /// </value>
@@ -454,24 +454,24 @@ namespace OpenSim.Framework
             get { return m_LoadedCreationDateTime; }
             set { m_LoadedCreationDateTime = value; }
         }
-        
+
         public String LoadedCreationDate
         {
-            get 
-            { 
+            get
+            {
                 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                 DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongDateString(); 
+                return stamp.ToLongDateString();
             }
         }
 
         public String LoadedCreationTime
         {
-            get 
-            { 
+            get
+            {
                 TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                 DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongTimeString(); 
+                return stamp.ToLongTimeString();
             }
         }
 
diff --git a/OpenSim/Framework/RestClient.cs b/OpenSim/Framework/RestClient.cs
index 26237de..0166d9d 100644
--- a/OpenSim/Framework/RestClient.cs
+++ b/OpenSim/Framework/RestClient.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework
         public void Dispose()
         {
             Dispose(true);
-            GC.SuppressFinalize(this); 
+            GC.SuppressFinalize(this);
         }
 
         protected virtual void Dispose(bool disposing)
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index e66d5be..9458625 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework
             Material = -2
         }
 
-        
+
         #region SL / file extension / content-type conversions
 
         /// <summary>
@@ -175,10 +175,10 @@ namespace OpenSim.Framework
             new TypeMapping(AssetType.Folder, FolderType.CurrentOutfit, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
             new TypeMapping(AssetType.Folder, FolderType.Outfit, "application/vnd.ll.outfitfolder", "outfitfolder"),
             new TypeMapping(AssetType.Folder, FolderType.MyOutfits, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            
+
             // This next mappping is an asset to inventory item mapping.
             // Note: LL stores folders as assets of type Folder = 8, and it has a corresponding InventoryType = 8
-            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server 
+            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server
             new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
 
             // OpenSim specific
@@ -198,7 +198,7 @@ namespace OpenSim.Framework
             inventory2Content = new Dictionary<sbyte, string>();
             content2Asset = new Dictionary<string, sbyte>();
             content2Inventory = new Dictionary<string, sbyte>();
-            
+
             foreach (TypeMapping mapping in MAPPINGS)
             {
                 sbyte assetType = mapping.AssetTypeCode;
@@ -226,7 +226,7 @@ namespace OpenSim.Framework
                 }
             }
         }
-        
+
         public static string SLAssetTypeToContentType(int assetType)
         {
             string contentType;
@@ -406,7 +406,7 @@ namespace OpenSim.Framework
                 if(data[0] == "inv_item")
                 {
                     skipInventoryItem(reader);
-                } 
+                }
                 else if (line.IndexOf('{') >= 0)
                 {
                     throw new NotANotecardFormatException(reader.LineNumber);
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
                 {
                     int length = Int32.Parse(data[2]);
                     notecardString = reader.getBlock(length);
-                } 
+                }
                 else if (line.IndexOf('{') >= 0)
                 {
                     throw new NotANotecardFormatException(reader.LineNumber);
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index ab3c285..9081411 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -72,12 +72,12 @@ namespace OpenSim.Framework.Serialization
         /// Path for region settings.
         /// </value>
         public const string SETTINGS_PATH = "settings/";
-        
+
         /// <value>
         /// Path for region settings.
         /// </value>
         public const string LANDDATA_PATH = "landdata/";
-        
+
         /// <value>
         /// Path for user profiles
         /// </value>
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 55640ac..1523fa9 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -106,13 +106,13 @@ namespace OpenSim.Framework.Serialization.External
                     {
                         errors = true;
                         parseExceptionAction(nodeToFill, nodeName, e);
-                        
+
                         if (xtr.EOF)
                         {
                             m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to unexpected end of XML");
                             break;
                         }
-                        
+
                         if (++numErrors == 10)
                         {
                             m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to too many parsing errors");
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Serialization.External
                         break;
 
                     case XmlNodeType.XmlDeclaration:
-                        // For various reasons, not all serializations have xml declarations (or consistent ones) 
+                        // For various reasons, not all serializations have xml declarations (or consistent ones)
                         // and as it's embedded inside a byte stream we don't need it anyway, so ignore.
                         break;
 
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs
index fa7160f..a1e9d55 100644
--- a/OpenSim/Framework/Serialization/External/OspResolver.cs
+++ b/OpenSim/Framework/Serialization/External/OspResolver.cs
@@ -35,13 +35,13 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Framework.Serialization
 {
     /// <summary>
-    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for 
+    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for
     /// identifying user profiles or supplying a simple name if no profile is available.
     /// </summary>
     public class OspResolver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public const string OSPA_PREFIX = "ospa:";
         public const string OSPA_NAME_KEY = "n";
         public const string OSPA_NAME_VALUE_SEPARATOR = " ";
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Serialization
 
             return null;
         }
-        
+
         /// <summary>
         /// Make an OSPA given a user name
         /// </summary>
@@ -89,17 +89,17 @@ namespace OpenSim.Framework.Serialization
 
 //            m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
 //            System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
-            
+
             return ospa;
         }
-        
+
         /// <summary>
         /// Resolve an osp string into the most suitable internal OpenSim identifier.
         /// </summary>
-        /// 
+        ///
         /// In some cases this will be a UUID if a suitable profile exists on the system.  In other cases, this may
         /// just return the same identifier after creating a temporary profile.
-        /// 
+        ///
         /// <param name="ospa"></param>
         /// <param name="commsManager"></param>
         /// <returns>
@@ -111,14 +111,14 @@ namespace OpenSim.Framework.Serialization
             if (!ospa.StartsWith(OSPA_PREFIX))
             {
 //                m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa);
-                return UUID.Zero;            
+                return UUID.Zero;
             }
 
 //            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
-            
+
             string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
-            
+
             foreach (string tuple in ospaTuples)
             {
                 int tupleSeparatorIndex = tuple.IndexOf(OSPA_PAIR_SEPARATOR);
@@ -128,17 +128,17 @@ namespace OpenSim.Framework.Serialization
                     m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa);
                     continue;
                 }
-                
+
                 string key = tuple.Remove(tupleSeparatorIndex).Trim();
                 string value = tuple.Substring(tupleSeparatorIndex + 1).Trim();
-                
+
                 if (OSPA_NAME_KEY == key)
                     return ResolveOspaName(value, userService);
             }
-            
+
             return UUID.Zero;
         }
-        
+
         /// <summary>
         /// Hash a profile name into a UUID
         /// </summary>
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Serialization
         {
             return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0);
         }
-        
+
         /// <summary>
         /// Resolve an OSPI name by querying existing persistent user profiles.  If there is no persistent user profile
         /// then a temporary user profile is inserted in the cache.
@@ -164,13 +164,13 @@ namespace OpenSim.Framework.Serialization
                 return UUID.Zero;
 
             int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
-            
+
             if (nameSeparatorIndex < 0)
             {
                 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
                 return UUID.Zero;
             }
-            
+
             string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
             string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart();
 
@@ -178,14 +178,14 @@ namespace OpenSim.Framework.Serialization
             if (account != null)
             {
 //                m_log.DebugFormat(
-//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", 
+//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}",
 //                    account.PrincipalID, firstName, lastName);
-                
+
                 return account.PrincipalID;
             }
 //            else
 //            {
-//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);            
+//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);
 //            }
 
             // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
@@ -194,11 +194,11 @@ namespace OpenSim.Framework.Serialization
             tempUserProfile.FirstName = firstName;
             tempUserProfile.SurName = lastName;
             tempUserProfile.ID = HashName(tempUserProfile.Name);
-            
+
             m_log.DebugFormat(
                 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
-            
+
             return tempUserProfile.ID;
             */
 
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 19468c3..617c451 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Serialization.External
         {
             return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
         }
-        
+
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -60,14 +60,14 @@ namespace OpenSim.Framework.Serialization.External
         public static RegionSettings Deserialize(string serializedSettings)
         {
             RegionSettings settings = new RegionSettings();
-            
+
             StringReader sr = new StringReader(serializedSettings);
             XmlTextReader xtr = new XmlTextReader(sr);
-            
+
             xtr.ReadStartElement("RegionSettings");
-         
+
             xtr.ReadStartElement("General");
-           
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -113,10 +113,10 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-            
+
             xtr.ReadEndElement();
             xtr.ReadStartElement("GroundTextures");
-            
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -159,10 +159,10 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-           
+
             xtr.ReadEndElement();
             xtr.ReadStartElement("Terrain");
-            
+
             while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
             {
                 switch (xtr.Name)
@@ -212,19 +212,19 @@ namespace OpenSim.Framework.Serialization.External
 
             xtr.Close();
             sr.Close();
-            
+
             return settings;
         }
-        
+
         public static string Serialize(RegionSettings settings)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
             xtw.Formatting = Formatting.Indented;
             xtw.WriteStartDocument();
-            
+
             xtw.WriteStartElement("RegionSettings");
-            
+
             xtw.WriteStartElement("General");
             xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
             xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("ElevationHighSE", settings.Elevation2SE.ToString());
             xtw.WriteElementString("ElevationHighNE", settings.Elevation2NE.ToString());
             xtw.WriteEndElement();
-            
+
             xtw.WriteStartElement("Terrain");
             xtw.WriteElementString("WaterHeight", settings.WaterHeight.ToString());
             xtw.WriteElementString("TerrainRaiseLimit", settings.TerrainRaiseLimit.ToString());
@@ -275,12 +275,12 @@ namespace OpenSim.Framework.Serialization.External
                     xtw.WriteElementString("SpawnPoint", sp.ToString());
             }
             xtw.WriteEndElement();
-            
+
             xtw.WriteEndElement();
-            
+
             xtw.Close();
             sw.Close();
-            
+
             return sw.ToString();
         }
     }
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 994cede..9b02553 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -36,9 +36,9 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
-    
+
 namespace OpenSim.Framework.Serialization.External
-{        
+{
     /// <summary>
     /// Serialize and deserialize user inventory items as an external format.
     /// </summary>
@@ -49,14 +49,14 @@ namespace OpenSim.Framework.Serialization.External
         private static Dictionary<string, Action<InventoryItemBase, XmlReader>> m_InventoryItemXmlProcessors
             = new Dictionary<string, Action<InventoryItemBase, XmlReader>>();
 
-        #region InventoryItemBase Processor initialization 
+        #region InventoryItemBase Processor initialization
         static UserInventoryItemSerializer()
         {
             m_InventoryItemXmlProcessors.Add("Name", ProcessName);
             m_InventoryItemXmlProcessors.Add("ID", ProcessID);
             m_InventoryItemXmlProcessors.Add("InvType", ProcessInvType);
             m_InventoryItemXmlProcessors.Add("CreatorUUID", ProcessCreatorUUID);
-            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID); 
+            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID);
             m_InventoryItemXmlProcessors.Add("CreatorData", ProcessCreatorData);
             m_InventoryItemXmlProcessors.Add("CreationDate", ProcessCreationDate);
             m_InventoryItemXmlProcessors.Add("Owner", ProcessOwner);
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Serialization.External
             m_InventoryItemXmlProcessors.Add("GroupID", ProcessGroupID);
             m_InventoryItemXmlProcessors.Add("GroupOwned", ProcessGroupOwned);
         }
-        #endregion 
+        #endregion
 
         #region InventoryItemBase Processors
         private static void ProcessName(InventoryItemBase item, XmlReader reader)
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Serialization.External
         {
             return Deserialize(Encoding.ASCII.GetString(serialization, 0, serialization.Length));
         }
-        
+
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -212,8 +212,8 @@ namespace OpenSim.Framework.Serialization.External
 
             //m_log.DebugFormat("[XXX]: parsed InventoryItemBase {0} - {1}", obj.Name, obj.UUID);
             return item;
-        }      
-        
+        }
+
         public static string Serialize(InventoryItemBase inventoryItem, Dictionary<string, object> options, IUserAccountService userAccountService)
         {
             StringWriter sw = new StringWriter();
@@ -294,11 +294,11 @@ namespace OpenSim.Framework.Serialization.External
             }
 
             writer.WriteEndElement();
-            
+
             writer.Close();
             sw.Close();
-            
+
             return sw.ToString();
-        }        
+        }
     }
 }
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index c685a15..34eaa99 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -42,31 +42,31 @@ namespace OpenSim.Framework.Serialization.External
     {
         public const int MAJOR_VERSION = 0;
         public const int MINOR_VERSION = 1;
-        
+
         public static string Serialize(UUID userID, string firstName, string lastName)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
             xtw.Formatting = Formatting.Indented;
             xtw.WriteStartDocument();
-            
+
             xtw.WriteStartElement("user_profile");
             xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
             xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
-                       
+
             xtw.WriteElementString("name", firstName + " " + lastName);
             xtw.WriteElementString("id", userID.ToString());
             xtw.WriteElementString("about", "");
-  
+
             // Not sure if we're storing this yet, need to take a look
 //            xtw.WriteElementString("Url", profile.Url);
             // or, indeed, interests
 
             xtw.WriteEndElement();
-            
+
             xtw.Close();
             sw.Close();
-            
+
             return sw.ToString();
         }
     }
diff --git a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
index f2060ab..7dfb87b 100644
--- a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Serialization")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 2a3bc48..a5c3d0a 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Serialization
             lock (m_bw)
             {
                 m_bw.Write(finalZeroPadding);
-    
+
                 m_bw.Flush();
                 m_bw.Close();
             }
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Serialization
         {
 //            m_log.DebugFormat(
 //                "[TAR ARCHIVE WRITER]: Data for {0} is {1} bytes", filePath, (null == data ? "null" : data.Length.ToString()));
-                  
+
             byte[] header = new byte[512];
 
             // file path field (100)
@@ -208,18 +208,18 @@ namespace OpenSim.Framework.Serialization
             {
                 // Write out header
                 m_bw.Write(header);
-    
+
                 // Write out data
                 // An IOException occurs if we try to write out an empty array in Mono 2.6
                 if (data.Length > 0)
                     m_bw.Write(data);
-    
+
                 if (data.Length % 512 != 0)
                 {
                     int paddingRequired = 512 - (data.Length % 512);
-    
+
                     //m_log.DebugFormat("[TAR ARCHIVE WRITER]: Padding data with {0} bytes", paddingRequired);
-    
+
                     byte[] padding = new byte[paddingRequired];
                     m_bw.Write(padding);
                 }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 1d4deac..f761813 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -68,9 +68,9 @@ namespace OpenSim.Framework.Servers
 
         private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
         private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
-        
+
         /// <summary>
-        /// Random uuid for private data 
+        /// Random uuid for private data
         /// </summary>
         protected string m_osSecret = String.Empty;
 
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Servers
             // Random uuid for private data
             m_osSecret = UUID.Random().ToString();
         }
-        
+
         /// <summary>
         /// Must be overriden by child classes for their own server specific startup behaviour.
         /// </summary>
@@ -104,10 +104,10 @@ namespace OpenSim.Framework.Servers
                 m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS;
                 m_periodicDiagnosticsTimer.Enabled = true;
             }
-        }       
+        }
 
         protected override void ShutdownSpecific()
-        {            
+        {
             m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
 
             RemovePIDFile();
@@ -117,12 +117,12 @@ namespace OpenSim.Framework.Servers
             if (!SuppressExit)
                 Environment.Exit(0);
         }
-        
+
         /// <summary>
         /// Provides a list of help topics that are available.  Overriding classes should append their topics to the
         /// information returned when the base method is called.
         /// </summary>
-        /// 
+        ///
         /// <returns>
         /// A list of strings that represent different help topics on which more information is available
         /// </returns>
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Servers
         public virtual void Startup()
         {
             m_log.Info("[STARTUP]: Beginning startup processing");
-            
+
             m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine);
             // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
             // the clr version number doesn't match the project version number under Mono.
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers
             m_log.InfoFormat(
                 "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
                 Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
-            
+
             try
             {
                 StartupSpecific();
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Servers
                     (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
                 Environment.Exit(1);
             }
-            
+
             TimeSpan timeTaken = DateTime.Now - m_startuptime;
-            
+
 //            MainConsole.Instance.OutputFormat(
 //                "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.  Non-script portion of startup took {0}m {1}s.",
 //                timeTaken.Minutes, timeTaken.Seconds);
         }
 
-        public string osSecret 
+        public string osSecret
         {
             // Secret uuid for the simulator
-            get { return m_osSecret; }            
+            get { return m_osSecret; }
         }
 
         public string StatReport(IOSHttpRequest httpRequest)
@@ -187,8 +187,8 @@ namespace OpenSim.Framework.Servers
             if (httpRequest.Query.ContainsKey("callback"))
             {
                 return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
-            } 
-            else 
+            }
+            else
             {
                 return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index e431042..fb92b92 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         /// <summary>
         /// This is a pending websocket request before it got an sucessful upgrade response.
-        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to 
+        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to
         /// start the connection and optionally provide an origin authentication method.
         /// </summary>
         /// <param name="servicepath"></param>
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             new Dictionary<string, PollServiceEventArgs>();
 
         protected Dictionary<string, WebSocketRequestDelegate> m_WebSocketHandlers =
-            new Dictionary<string, WebSocketRequestDelegate>(); 
+            new Dictionary<string, WebSocketRequestDelegate>();
 
         protected uint m_port;
         protected uint m_sslport;
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 return new List<string>(m_rpcHandlers.Keys);
         }
 
-        // JsonRPC 
+        // JsonRPC
         public bool AddJsonRPCHandler(string method, JsonRPCMethod handler)
         {
             lock(jsonRpcHandlers)
@@ -459,11 +459,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHttpServerHandler(req, context, 8192));
                 return;
             }
-            
+
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
             resp.ReuseContext = true;
 //            resp.ReuseContext = false;
-            HandleRequest(req, resp);           
+            HandleRequest(req, resp);
 
             // !!!HACK ALERT!!!
             // There seems to be a bug in the underlying http code that makes subsequent requests
@@ -554,7 +554,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         LogIncomingToStreamHandler(request, requestHandler);
 
                     response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
-                    
+
                     if (requestHandler is IStreamedRequestHandler)
                     {
                         IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -630,16 +630,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                         case "text/html":
                             if (DebugLevel >= 3)
                                 LogIncomingToContentTypeHandler(request);
-    
+
                             buffer = HandleHTTPRequest(request, response);
                             break;
-    
+
                         case "application/llsd+xml":
                         case "application/xml+llsd":
                         case "application/llsd+json":
                             if (DebugLevel >= 3)
                                 LogIncomingToContentTypeHandler(request);
-    
+
                             buffer = HandleLLSDRequests(request, response);
                             break;
 
@@ -649,7 +649,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                             buffer = HandleJsonRpcRequests(request, response);
                             break;
-    
+
                         case "text/xml":
                         case "application/xml":
                         case "application/json":
@@ -666,7 +666,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToContentTypeHandler(request);
-    
+
                                 buffer = HandleLLSDRequests(request, response);
                             }
     //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
@@ -674,18 +674,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToContentTypeHandler(request);
-    
+
                                 buffer = HandleHTTPRequest(request, response);
                             }
                             else
                             {
                                 if (DebugLevel >= 3)
                                     LogIncomingToXmlRpcHandler(request);
-    
+
                                 // generic login request.
                                 buffer = HandleXmlRpcRequests(request, response);
                             }
-    
+
                             break;
                     }
                 }
@@ -972,7 +972,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        private bool TryGetAgentHandler(OSHttpRequest request, OSHttpResponse response, out IHttpAgentHandler agentHandler)
 //        {
 //            agentHandler = null;
-//            
+//
 //            lock (m_agentHandlers)
 //            {
 //                foreach (IHttpAgentHandler handler in m_agentHandlers.Values)
@@ -1171,7 +1171,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             return buffer;
         }
 
-        // JsonRpc (v2.0 only) 
+        // JsonRpc (v2.0 only)
         // Batch requests not yet supported
         private byte[] HandleJsonRpcRequests(OSHttpRequest request, OSHttpResponse response)
         {
@@ -1188,7 +1188,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 jsonRpcResponse.Error.Code = ErrorCode.InternalError;
                 jsonRpcResponse.Error.Message = e.Message;
             }
-            
+
             requestStream.Close();
 
             if (jsonRpcRequest != null)
@@ -1253,7 +1253,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             string responseData = string.Empty;
 
             responseData = jsonRpcResponse.Serialize();
-       
+
             byte[] buffer = Encoding.UTF8.GetBytes(responseData);
             return buffer;
         }
@@ -1533,7 +1533,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                     }
                 }
-    
+
                 if (String.IsNullOrEmpty(bestMatch))
                 {
                     llsdHandler = null;
@@ -1899,8 +1899,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
-            
-                
+
+
             return buffer;
         }
 
@@ -1977,7 +1977,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 throw e;
             }
 
-            m_requestsProcessedStat 
+            m_requestsProcessedStat
                 = new Stat(
                     "HTTPRequestsServed",
                     "Number of inbound HTTP requests processed",
@@ -1989,7 +1989,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     MeasuresOfInterest.AverageChangeOverTime,
                     stat => stat.Value = RequestNumber,
                     StatVerbosity.Debug);
-          
+
             StatsManager.RegisterStat(m_requestsProcessedStat);
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index d4a1ec3..01d95e9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -69,13 +69,13 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 StatsManager.RegisterStat(
                     new Stat(
-                    "requests", 
-                    "requests", 
-                    "Number of requests received by this service endpoint", 
-                    "requests", 
-                    "service", 
-                    string.Format("{0}:{1}", httpMethod, path), 
-                    StatType.Pull, 
+                    "requests",
+                    "requests",
+                    "Number of requests received by this service endpoint",
+                    "requests",
+                    "service",
+                    string.Format("{0}:{1}", httpMethod, path),
+                    StatType.Pull,
                     MeasuresOfInterest.AverageChangeOverTime,
                     s => s.Value = RequestsReceived,
                     StatVerbosity.Debug));
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index 41aa19b..7fc9f0b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             : base(httpMethod, path, name, description) {}
 
         protected BaseStreamHandler(string httpMethod, string path, IServiceAuth auth)
-            : base(httpMethod, path, null, null) 
+            : base(httpMethod, path, null, null)
         {
             m_Auth = auth;
         }
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 HttpStatusCode statusCode;
 
                 if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out statusCode))
-                {                
+                {
                     httpResponse.StatusCode = (int)statusCode;
                     httpResponse.ContentType = "text/plain";
                     return new byte[0];
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 1b88545..9619e03 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     /// </remarks>
     public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
     {
-       
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 result = ThrottledRequest(path, request, httpRequest, httpResponse);
             if (_options.MaxConcurrentSessions > 0)
                 _dosProtector.ProcessEnd(clientstring, endpoint);
-            
+
             RequestsHandled++;
 
             return result;
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             return new byte[0];
         }
 
-        
+
         private string GetRemoteAddr(IOSHttpRequest httpRequest)
         {
             string remoteaddr = string.Empty;
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 clientstring = GetRemoteAddr(httpRequest);
 
             return clientstring;
-           
+
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index cd4b8ff..98d33e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private readonly GenericHTTPMethod _normalMethod;
         private readonly GenericHTTPMethod _throttledMethod;
-      
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-            
+
             _options = options;
             _dosProtector = new BasicDOSProtector(_options);
         }
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return process;
         }
-        
+
         private string GetRemoteAddr(Hashtable request)
         {
             string remoteaddr = "";
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index d162bc1..3a04074 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -45,26 +45,26 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        // the handlers - it is NOT required to be an actual agent header
 //        // value.
 //        bool AddAgentHandler(string agent, IHttpAgentHandler handler);
-        
+
         /// <summary>
         /// Add a handler for an HTTP request.
         /// </summary>
         /// <remarks>
-        /// This handler can actually be invoked either as 
-        /// 
-        /// http://<hostname>:<port>/?method=<methodName> 
-        /// 
+        /// This handler can actually be invoked either as
+        ///
+        /// http://<hostname>:<port>/?method=<methodName>
+        ///
         /// or
-        /// 
+        ///
         /// http://<hostname>:<port><method>
-        /// 
+        ///
         /// if the method name starts with a slash.  For example, AddHTTPHandler("/object/", ...) on a standalone region
         /// server will register a handler that can be invoked with either
-        /// 
+        ///
         /// http://localhost:9000/?method=/object/
-        /// 
+        ///
         /// or
-        /// 
+        ///
         /// http://localhost:9000/object/
         ///
         /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="handler">handle the LLSD response</param>
         /// <returns></returns>
         bool AddLLSDHandler(string path, LLSDMethod handler);
-        
+
         /// <summary>
         /// Add a stream handler to the http server.  If the handler already exists, then nothing happens.
         /// </summary>
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive);
 
         bool AddJsonRPCHandler(string method, JsonRPCMethod handler);
-        
+
         /// <summary>
         /// Websocket HTTP server handlers.
         /// </summary>
@@ -108,7 +108,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
 
         void RemoveWebSocketHandler(string servicepath);
-       
+
         /// <summary>
         /// Gets the XML RPC handler for given method name
         /// </summary>
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        /// <param name="handler"></param>
 //        /// <returns></returns>
 //        bool RemoveAgentHandler(string agent, IHttpAgentHandler handler);
-        
+
         /// <summary>
         /// Remove an HTTP handler
         /// </summary>
@@ -134,15 +134,15 @@ namespace OpenSim.Framework.Servers.HttpServer
         void RemoveHTTPHandler(string httpMethod, string path);
 
         void RemovePollServiceHTTPHandler(string httpMethod, string path);
-        
+
         bool RemoveLLSDHandler(string path, LLSDMethod handler);
-        
+
         void RemoveStreamHandler(string httpMethod, string path);
 
         void RemoveXmlRPCHandler(string method);
 
         void RemoveJsonRPCHandler(string method);
-        
+
         string GetHTTP404(string host);
 
         string GetHTTP500();
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index b8541cb..62d92fb 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         void Handle(string path, Stream request, Stream response, IOSHttpRequest httpReqbuest, IOSHttpResponse httpResponse);
     }
-    
+
     public interface IGenericHTTPHandler : IRequestHandler
     {
         Hashtable Handle(string path, Hashtable request);
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
index f3faf4f..411ee31 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     public class JsonRpcRequestManager
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public JsonRpcRequestManager()
         {
         }
@@ -188,6 +188,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return true;
         }
-    
+
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
index 2c50587..91d284b 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
 
             }
-            return result; 
+            return result;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 05ec6dc..1a6b8cf 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -155,11 +155,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private string _userAgent;
 
         internal IHttpRequest IHttpRequest
-        { 
+        {
             get { return _request; }
         }
 
-        internal IHttpClientContext IHttpClientContext 
+        internal IHttpClientContext IHttpClientContext
         {
             get { return _context; }
         }
@@ -192,19 +192,19 @@ namespace OpenSim.Framework.Servers.HttpServer
                     // ignore
                 }
             }
-            
+
             if (null != req.Headers["content-type"])
                 _contentType = _request.Headers["content-type"];
             if (null != req.Headers["user-agent"])
                 _userAgent = req.Headers["user-agent"];
-            
+
             if (null != req.Headers["remote_addr"])
             {
                 try
                 {
                     IPAddress addr = IPAddress.Parse(req.Headers["remote_addr"]);
                     // sometimes req.Headers["remote_port"] returns a comma separated list, so use
-                    // the first one in the list and log it 
+                    // the first one in the list and log it
                     string[] strPorts = req.Headers["remote_port"].Split(new char[] { ',' });
                     if (strPorts.Length > 1)
                     {
@@ -216,7 +216,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (FormatException)
                 {
-                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring", 
+                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring",
                                      req.Headers["remote_addr"], req.Headers["remote_port"]);
                 }
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index ccf9c91..d7744fc 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public bool KeepAlive
         {
-            get 
+            get
             {
                 return _httpResponse.Connection == ConnectionType.KeepAlive;
             }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
index a736c8b..88e3068 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// 300 Redirect: different presentation forms available, take a pick
         /// </summary>
         RedirectMultipleChoices = 300,
-        
+
         /// <summary>
         /// 301 Redirect: requested resource has moved and now lives somewhere else
         /// </summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 3fd3bf7..8ace7a9 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         public RequestMethod Request;
         public UUID Id;
         public int TimeOutms;
-        public EventType Type;    
+        public EventType Type;
 
         public enum EventType : int
         {
             LongPoll = 0,
             LslHttp = 1,
             Inventory = 2,
-            Texture = 3, 
+            Texture = 3,
             Mesh = 4
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index ffcad0f..936146d 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             startInfo.ThreadPoolName = "PoolService";
 
             m_threadPool = new SmartThreadPool(startInfo);
-                
+
         }
 
         public void Start()
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 true,
                 null,
                 1000 * 60 * 10);
-                                
+
 
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 398179f..9b663ba 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Servers.HttpServer")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index ad69cd2..68073c1 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -291,5 +291,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                 serializer.Serialize(xmlWriter, response);
             }
         }
-    }   
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index c2925e3..c8af90f 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public event PongDelegate OnPong;
 
         /// <summary>
-        /// This is a regular HTTP Request...    This may be removed in the future.   
+        /// This is a regular HTTP Request...    This may be removed in the future.
         /// </summary>
 //        public event RegularHttpRequestDelegate OnRegularHttpRequest;
 
@@ -93,9 +93,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// When the websocket is closed, this will be fired.
         /// </summary>
         public event CloseDelegate OnClose;
-        
+
         /// <summary>
-        /// Set this delegate to allow your module to validate the origin of the 
+        /// Set this delegate to allow your module to validate the origin of the
         /// Websocket request.  Primary line of defense against cross site scripting
         /// </summary>
         public ValidateHandshake HandshakeValidateMethodOverride = null;
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     throw new InvalidOperationException("The socket has been shutdown");
                 }
-            } 
+            }
             set
             {
                 if (_networkContext != null && _networkContext.Socket != null)
@@ -194,8 +194,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// This triggers the websocket to start the upgrade process...  
-        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead 
+        /// This triggers the websocket to start the upgrade process...
+        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead
         /// of the more context appropriate HandshakeAndUpgrade()
         /// </summary>
         public void Start()
@@ -261,7 +261,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     acceptKey = GenerateAcceptKey(websocketKey);
                     string rawaccept = string.Format(HandshakeAcceptText, acceptKey);
                     SendUpgradeSuccess(rawaccept);
-                    
+
 
                 }
                 else
@@ -282,7 +282,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// Generates a handshake response key string based on the client's 
+        /// Generates a handshake response key string based on the client's
         /// provided key to prove to the client that we're allowing the Websocket
         /// upgrade of our own free will and we were not coerced into doing it.
         /// </summary>
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             SHA1 hashobj = SHA1.Create();
             string ret = Convert.ToBase64String(hashobj.ComputeHash(Encoding.UTF8.GetBytes(acceptkey)));
             hashobj.Clear();
-            
+
             return ret;
         }
 
@@ -310,11 +310,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             // Create a new websocket state so we can keep track of data in between network reads.
             WebSocketState socketState = new WebSocketState() { ReceivedBytes = new List<byte>(), Header = WebsocketFrameHeader.HeaderDefault(), FrameComplete = true};
-            
+
             byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(pHandshakeResponse);
 
-            
-           
+
+
 
             try
             {
@@ -324,7 +324,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 // Begin reading the TCP stream before writing the Upgrade success message to the other side of the stream.
                 _networkContext.Stream.BeginRead(_buffer, 0, _bufferLength, OnReceive, socketState);
-                
+
                 // Write the upgrade handshake success message
                 _networkContext.Stream.Write(bhandshakeResponse, 0, bhandshakeResponse.Length);
                 _networkContext.Stream.Flush();
@@ -345,7 +345,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             catch (ObjectDisposedException)
             {
                 Close(string.Empty);
-            }           
+            }
         }
 
         /// <summary>
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         /// <summary>
         /// This is our ugly Async OnReceive event handler.
-        /// This chunks the input stream based on the length of the provided buffer and processes out 
+        /// This chunks the input stream based on the length of the provided buffer and processes out
         /// as many frames as it can.   It then moves the unprocessed data to the beginning of the buffer.
         /// </summary>
         /// <param name="ar">Our Async State from beginread</param>
@@ -390,7 +390,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 if (_bufferPosition > _bufferLength)
                 {
-                    // Message too big for chunksize..   not sure how this happened...  
+                    // Message too big for chunksize..   not sure how this happened...
                     //Close(string.Empty);
                 }
 
@@ -413,7 +413,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             if (pheader.PayloadLen > (ulong) _maxPayloadBytes)
                             {
                                 Close("Invalid Payload size");
-                                
+
                                 return;
                             }
                             if (pheader.PayloadLen > 0)
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             _socketState.ReceivedBytes.Clear();
                             _socketState.ExpectedBytes = 0;
                             // do some processing
-                        }                       
+                        }
                     }
                 }
                 if (offset > 0)
@@ -504,7 +504,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 else
                 {
-                    // We can't read the stream anymore...  
+                    // We can't read the stream anymore...
                 }
             }
             catch (IOException)
@@ -533,7 +533,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             textMessageFrame.Header.Opcode = WebSocketReader.OpCode.Text;
             textMessageFrame.Header.IsEnd = true;
             SendSocket(textMessageFrame.ToBytes());
-            
+
         }
 
         public void SendData(byte[] data)
@@ -657,7 +657,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     SendSocket(pongFrame.ToBytes());
                     break;
                 case WebSocketReader.OpCode.Pong:
-                 
+
                     PongDelegate pongD = OnPong;
                     if (pongD != null)
                     {
@@ -701,7 +701,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         {
                             textD(this, new WebsocketTextEventArgs() { Data = Encoding.UTF8.GetString(psocketState.ReceivedBytes.ToArray()) });
                         }
-                        
+
                         // Send Done Event!
                     }
                     break;
@@ -719,7 +719,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     {
                         if (psocketState.ContinuationFrame.Header.Opcode == WebSocketReader.OpCode.Text)
                         {
-                            // Send Done event    
+                            // Send Done event
                             TextDelegate textD = OnText;
                             if (textD != null)
                             {
@@ -744,9 +744,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                     break;
                 case WebSocketReader.OpCode.Close:
                     Close(string.Empty);
-                    
+
                     break;
-               
+
             }
             psocketState.Header.SetDefault();
             psocketState.ReceivedBytes.Clear();
@@ -837,12 +837,12 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
-        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader, 
+        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader,
         /// and an int to move the buffer forward when it reads a header.  False when it can't read a header
         /// </summary>
         /// <param name="pBuffer">Bytes read from the stream</param>
         /// <param name="pOffset">Starting place in the stream to begin trying to read from</param>
-        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the 
+        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the
         /// buffer's length is larger then the data in it</param>
         /// <param name="oHeader">Outputs the read WebSocket frame header</param>
         /// <param name="moveBuffer">Informs the calling stream to move the buffer forward</param>
@@ -897,7 +897,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     oHeader.PayloadLen = BitConverter.ToUInt16(pBuffer, pOffset + index);
                     index += 2;
                     break;
-                case 127:   // we got more this is a bigger frame  
+                case 127:   // we got more this is a bigger frame
                     // 8 bytes - uint64 - most significant bit 0  network byte order
                     minumheadersize += 8;
                     if (length < minumheadersize)
@@ -909,7 +909,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     oHeader.PayloadLen = BitConverter.ToUInt64(pBuffer, pOffset + index);
                     index += 8;
                     break;
-                
+
             }
             //oHeader.PayloadLeft = oHeader.PayloadLen; // Start the count in case it's chunked over the network.  This is different then frame fragmentation
             if (oHeader.IsMasked)
@@ -937,9 +937,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         /*
          * RFC6455
 nib   0       1       2       3       4       5       6       7
-byt   0               1               2               3               
-dec   0                   1                   2                   3   
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+byt   0               1               2               3
+dec   0                   1                   2                   3
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
      +-+-+-+-+-------+-+-------------+-------------------------------+
      |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
      |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           +
@@ -963,7 +963,7 @@ dec   0                   1                   2                   3
         public static readonly WebSocketFrame DefaultFrame = new WebSocketFrame(){Header = new WebsocketFrameHeader(),WebSocketPayload = new byte[0]};
         public WebsocketFrameHeader Header;
         public byte[] WebSocketPayload;
-        
+
         public byte[] ToBytes()
         {
             Header.PayloadLen = (ulong)WebSocketPayload.Length;
@@ -991,7 +991,7 @@ dec   0                   1                   2                   3
         public int Mask;
         /*
 byt   0               1               2               3
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
      +---------------+---------------+---------------+---------------+
      |    Octal 1    |    Octal 2    |    Octal 3    |    Octal 4    |
      +---------------+---------------+---------------+---------------+
@@ -1002,11 +1002,11 @@ byt   0               1               2               3
 
         public UInt64 PayloadLen;
         //public UInt64 PayloadLeft;
-        // Payload is X + Y   
+        // Payload is X + Y
         //public UInt64 ExtensionDataLength;
         //public UInt64 ApplicationDataLength;
         public static readonly WebsocketFrameHeader ZeroHeader = WebsocketFrameHeader.HeaderDefault();
-       
+
         public void SetDefault()
         {
 
@@ -1025,16 +1025,16 @@ byt   0               1               2               3
         /// <summary>
         /// Returns a byte array representing the Frame header
         /// </summary>
-        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload. 
+        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload.
         /// If payload is null, a Zero sized payload is assumed</param>
         /// <returns>Returns a byte array representing the frame header</returns>
         public byte[] ToBytes(byte[] payload)
         {
             List<byte> result = new List<byte>();
-           
+
             // Squeeze in our opcode and our ending bit.
             result.Add((byte)((byte)Opcode | (IsEnd?0x80:0x00) ));
-           
+
             // Again with the three different byte interpretations of size..
 
             //bytesize
@@ -1056,7 +1056,7 @@ byt   0               1               2               3
                 Array.Reverse(payloadLengthByte);
                 result.AddRange(payloadLengthByte);
             }
-            
+
             // Only add a payload if it's not null
             if (payload != null)
             {
@@ -1155,5 +1155,5 @@ byt   0               1               2               3
 
     }
 
-   
+
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index f212208..6b2c0ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private readonly XmlRpcMethod _normalMethod;
         private readonly XmlRpcMethod _throttledMethod;
-       
+
         private readonly BasicDosProtectorOptions _options;
         private readonly BasicDOSProtector _dosProtector;
 
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-           
+
             _options = options;
             _dosProtector = new BasicDOSProtector(_options);
 
@@ -87,5 +87,5 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     }
 
-    
+
 }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 57931d4..ea7b2b5 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -223,11 +223,11 @@ namespace OpenSim.Framework.Servers
                 {
                     handlers.AppendFormat(
                         "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port);
-        
+
                     handlers.AppendFormat("* XMLRPC:\n");
                     foreach (String s in httpServer.GetXmlRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* HTTP:\n");
                     foreach (String s in httpServer.GetHTTPHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -235,19 +235,19 @@ namespace OpenSim.Framework.Servers
                     handlers.AppendFormat("* HTTP (poll):\n");
                     foreach (String s in httpServer.GetPollServiceHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-                    
+
                     handlers.AppendFormat("* JSONRPC:\n");
                     foreach (String s in httpServer.GetJsonRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
 //                    handlers.AppendFormat("* Agent:\n");
 //                    foreach (String s in httpServer.GetAgentHandlerKeys())
 //                        handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* LLSD:\n");
                     foreach (String s in httpServer.GetLLSDHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count);
                     foreach (String s in httpServer.GetStreamHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.Servers
         {
             if (port == 0)
                 return Instance;
-            
+
             if (instance != null && port == Instance.Port)
                 return Instance;
 
diff --git a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
index 792c62e..4469e7c 100644
--- a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Servers")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 7b806a4..8965e71 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Servers
         protected ICommandConsole m_console;
 
         protected OpenSimAppender m_consoleAppender;
-        protected FileAppender m_logFileAppender; 
+        protected FileAppender m_logFileAppender;
 
         protected DateTime m_startuptime;
         protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers
         {
             if (File.Exists(path))
                 m_log.ErrorFormat(
-                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.", 
+                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.",
                     path);
 
             try
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Servers
                 m_log.Warn(string.Format("[SERVER BASE]: Could not create PID file at {0} ", path), e);
             }
         }
-           
+
         protected void RemovePIDFile()
         {
             if (m_pidFile != String.Empty)
@@ -166,11 +166,11 @@ namespace OpenSim.Framework.Servers
             {
                 // FIXME: This should be done through an interface rather than casting.
                 m_consoleAppender.Console = (ConsoleBase)m_console;
-                
+
                 // If there is no threshold set then the threshold is effectively everything.
                 if (null == m_consoleAppender.Threshold)
                     m_consoleAppender.Threshold = Level.All;
-                
+
                 Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
             }
 
@@ -205,11 +205,11 @@ namespace OpenSim.Framework.Servers
                 "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
 
             m_console.Commands.AddCommand(
-                "General", false, "get log level", "get log level", "Get the current console logging level", 
+                "General", false, "get log level", "get log level", "Get the current console logging level",
                 (mod, cmd) => ShowLogLevel());
 
             m_console.Commands.AddCommand(
-                "General", false, "set log level", "set log level <level>", 
+                "General", false, "set log level", "set log level <level>",
                 "Set the console logging level for this session.", HandleSetLogLevel);
 
             m_console.Commands.AddCommand(
@@ -222,14 +222,14 @@ namespace OpenSim.Framework.Servers
                 "config get [<section>] [<key>]",
                 "Synonym for config show",
                 HandleConfig);
-            
+
             m_console.Commands.AddCommand(
                 "General", false, "config show",
                 "config show [<section>] [<key>]",
-                "Show config information", 
+                "Show config information",
                 "If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine
                 + "If a section is given but not a field, then all fields in that section are printed.",
-                HandleConfig);            
+                HandleConfig);
 
             m_console.Commands.AddCommand(
                 "General", false, "config save",
@@ -280,7 +280,7 @@ namespace OpenSim.Framework.Servers
                 "debug threadpool status",
                 "Show current debug threadpool parameters.",
                 HandleDebugThreadpoolStatus);
-            
+
             m_console.Commands.AddCommand(
                 "Debug", false, "debug threadpool level",
                 "debug threadpool level 0.." + Util.MAX_THREADPOOL_LEVEL,
@@ -332,7 +332,7 @@ namespace OpenSim.Framework.Servers
             {
                 WebUtil.SerializeOSDRequestsPerEndpoint = networkConfig.GetBoolean("SerializeOSDRequests", false);
             }
-    
+
             m_serverStatsCollector = new ServerStatsCollector();
             m_serverStatsCollector.Initialise(configSource);
             m_serverStatsCollector.Start();
@@ -432,7 +432,7 @@ namespace OpenSim.Framework.Servers
 
             ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
             Notice("Available worker threads: {0}", workerThreads);
-            Notice("Available IOCP threads:   {0}", iocpThreads);           
+            Notice("Available IOCP threads:   {0}", iocpThreads);
         }
 
         private void HandleDebugThreadpoolSet(string module, string[] args)
@@ -488,7 +488,7 @@ namespace OpenSim.Framework.Servers
                         fail = true;
                 }
             }
-             
+
             if (fail)
             {
                 Notice("ERROR: Could not set {0} {1} threads to {2}", poolType, bound, newThreads);
@@ -582,7 +582,7 @@ namespace OpenSim.Framework.Servers
             if (cmdparams.Length > 0)
             {
                 string firstParam = cmdparams[0].ToLower();
-                
+
                 switch (firstParam)
                 {
                     case "set":
@@ -633,12 +633,12 @@ namespace OpenSim.Framework.Servers
                                 {
                                     Notice("[{0}]", config.Name);
                                     foreach (string key in config.GetKeys())
-                                        Notice("  {0} = {1}", key, config.GetString(key));                                
+                                        Notice("  {0} = {1}", key, config.GetString(key));
                                 }
                                 else
                                 {
                                     Notice(
-                                        "config get {0} {1} : {2}", 
+                                        "config get {0} {1} : {2}",
                                         cmdparams[1], cmdparams[2], config.GetString(cmdparams[2]));
                                 }
                             }
@@ -692,10 +692,10 @@ namespace OpenSim.Framework.Servers
             }
 
             string rawLevel = cmd[3];
-            
+
             ILoggerRepository repository = LogManager.GetRepository();
             Level consoleLevel = repository.LevelMap[rawLevel];
-            
+
             if (consoleLevel != null)
                 m_consoleAppender.Threshold = consoleLevel;
             else
@@ -770,9 +770,9 @@ namespace OpenSim.Framework.Servers
         protected void ShowInfo()
         {
             Notice(GetVersionText());
-            Notice("Startup directory: " + m_startupDirectory);                
+            Notice("Startup directory: " + m_startupDirectory);
             if (null != m_consoleAppender)
-                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));              
+                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));
         }
 
         /// <summary>
@@ -873,7 +873,7 @@ namespace OpenSim.Framework.Servers
 
         public string GetVersionText()
         {
-            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", 
+            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})",
                 m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax);
         }
 
@@ -898,7 +898,7 @@ namespace OpenSim.Framework.Servers
             foreach (Watchdog.ThreadWatchdogInfo twi in threads)
             {
                 Thread t = twi.Thread;
-                
+
                 sb.AppendFormat(
                     reportFormat,
                     t.ManagedThreadId,
@@ -1005,7 +1005,7 @@ namespace OpenSim.Framework.Servers
                 MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
             else
                 MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
-        } 
+        }
 
         /// <summary>
         /// Console output is only possible if a console has been established.
@@ -1020,13 +1020,13 @@ namespace OpenSim.Framework.Servers
                 m_console.Output(msg);
             }
         }
-        
+
         /// <summary>
         /// Console output is only possible if a console has been established.
         /// That is something that cannot be determined within this class. So
         /// all attempts to use the console MUST be verified.
         /// </summary>
-        /// <param name="format"></param>        
+        /// <param name="format"></param>
         /// <param name="components"></param>
         protected void Notice(string format, params object[] components)
         {
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index 60533cd..e5f7043 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -92,87 +92,87 @@ namespace OpenSim.Framework.Servers.Tests
         public class TestHttpRequest: IHttpRequest
         {
             private string _uriPath;
-            public bool BodyIsComplete 
-            { 
-                get { return true; } 
+            public bool BodyIsComplete
+            {
+                get { return true; }
             }
-            public string[] AcceptTypes 
-            { 
+            public string[] AcceptTypes
+            {
                 get {return _acceptTypes; }
             }
             private string[] _acceptTypes;
-            public Stream Body 
-            { 
-                get { return _body; } 
-                set { _body = value;} 
+            public Stream Body
+            {
+                get { return _body; }
+                set { _body = value;}
             }
             private Stream _body;
-            public ConnectionType Connection 
-            { 
+            public ConnectionType Connection
+            {
                 get { return _connection; }
                 set { _connection = value; }
             }
             private ConnectionType _connection;
-            public int ContentLength 
-            { 
+            public int ContentLength
+            {
                 get { return _contentLength; }
                 set { _contentLength = value; }
             }
             private int _contentLength;
-            public NameValueCollection Headers 
-            { 
+            public NameValueCollection Headers
+            {
                 get { return _headers; }
             }
             private NameValueCollection _headers = new NameValueCollection();
-            public string HttpVersion 
-            { 
+            public string HttpVersion
+            {
                 get { return _httpVersion; }
                 set { _httpVersion = value; }
             }
             private string _httpVersion = null;
-            public string Method 
-            { 
+            public string Method
+            {
                 get { return _method; }
                 set { _method = value; }
             }
             private string _method = null;
-            public HttpInput QueryString 
-            { 
+            public HttpInput QueryString
+            {
                 get { return _queryString;  }
             }
             private HttpInput _queryString = null;
-            public Uri Uri 
-            { 
+            public Uri Uri
+            {
                 get { return _uri; }
-                set { _uri = value; } 
+                set { _uri = value; }
             }
             private Uri _uri = null;
-            public string[] UriParts 
-            { 
+            public string[] UriParts
+            {
                 get { return _uri.Segments; }
             }
-            public HttpParam Param 
-            { 
-                get { return null; } 
+            public HttpParam Param
+            {
+                get { return null; }
             }
-            public HttpForm Form 
-            { 
-                get { return null; } 
+            public HttpForm Form
+            {
+                get { return null; }
             }
-            public bool IsAjax 
-            { 
-                get { return false; } 
+            public bool IsAjax
+            {
+                get { return false; }
             }
-            public RequestCookies Cookies 
-            { 
-                get { return null; } 
+            public RequestCookies Cookies
+            {
+                get { return null; }
             }
 
             public TestHttpRequest() {}
 
-            public TestHttpRequest(string contentEncoding, string contentType, string userAgent, 
+            public TestHttpRequest(string contentEncoding, string contentType, string userAgent,
                                    string remoteAddr, string remotePort, string[] acceptTypes,
-                                   ConnectionType connectionType, int contentLength, Uri uri) 
+                                   ConnectionType connectionType, int contentLength, Uri uri)
             {
                 _headers["content-encoding"] = contentEncoding;
                 _headers["content-type"] = contentType;
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Servers.Tests
             {
                 _headers.Add(name, value);
             }
-            public int AddToBody(byte[] bytes, int offset, int length) 
+            public int AddToBody(byte[] bytes, int offset, int length)
             {
                 return 0;
             }
@@ -223,7 +223,7 @@ namespace OpenSim.Framework.Servers.Tests
                 set
                 {
                     _uriPath = value;
-                   
+
                 }
             }
 
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Servers.Tests
 
         public class TestHttpResponse: IHttpResponse
         {
-            public Stream Body 
+            public Stream Body
             {
                 get { return _body; }
 
@@ -239,14 +239,14 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private Stream _body;
 
-            public string ProtocolVersion 
-            { 
+            public string ProtocolVersion
+            {
                 get { return _protocolVersion; }
                 set { _protocolVersion = value; }
             }
             private string _protocolVersion;
 
-            public bool Chunked 
+            public bool Chunked
             {
                 get { return _chunked; }
 
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private bool _chunked;
 
-            public ConnectionType Connection 
+            public ConnectionType Connection
             {
                 get { return _connection; }
 
@@ -262,7 +262,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private ConnectionType _connection;
 
-            public Encoding Encoding 
+            public Encoding Encoding
             {
                 get { return _encoding; }
 
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private Encoding _encoding;
 
-            public int KeepAlive 
+            public int KeepAlive
             {
                 get { return _keepAlive; }
 
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private int _keepAlive;
 
-            public HttpStatusCode Status 
+            public HttpStatusCode Status
             {
                 get { return _status; }
 
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private HttpStatusCode _status;
 
-            public string Reason 
+            public string Reason
             {
                 get { return _reason; }
 
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private string _reason;
 
-            public long ContentLength 
+            public long ContentLength
             {
                 get { return _contentLength; }
 
@@ -302,7 +302,7 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private long _contentLength;
 
-            public string ContentType 
+            public string ContentType
             {
                 get { return _contentType; }
 
@@ -310,19 +310,19 @@ namespace OpenSim.Framework.Servers.Tests
             }
             private string _contentType;
 
-            public bool HeadersSent 
+            public bool HeadersSent
             {
                 get { return _headersSent; }
             }
             private bool _headersSent;
 
-            public bool Sent 
+            public bool Sent
             {
                 get { return _sent; }
             }
             private bool _sent;
 
-            public ResponseCookies Cookies 
+            public ResponseCookies Cookies
             {
                 get { return _cookies; }
             }
@@ -335,25 +335,25 @@ namespace OpenSim.Framework.Servers.Tests
             }
 
             public void AddHeader(string name, string value) {}
-            public void Send() 
+            public void Send()
             {
                 if (!_headersSent) SendHeaders();
                 if (_sent) throw new InvalidOperationException("stuff already sent");
                 _sent = true;
             }
 
-            public void SendBody(byte[] buffer, int offset, int count) 
+            public void SendBody(byte[] buffer, int offset, int count)
             {
                 if (!_headersSent) SendHeaders();
                 _sent = true;
             }
-            public void SendBody(byte[] buffer) 
+            public void SendBody(byte[] buffer)
             {
                 if (!_headersSent) SendHeaders();
                 _sent = true;
             }
 
-            public void SendHeaders() 
+            public void SendHeaders()
             {
                 if (_headersSent) throw new InvalidOperationException("headers already sent");
                 _headersSent = true;
@@ -362,7 +362,7 @@ namespace OpenSim.Framework.Servers.Tests
             public void Redirect(Uri uri) {}
             public void Redirect(string url) {}
         }
-       
+
 
         public OSHttpRequest req0;
         public OSHttpRequest req1;
@@ -374,22 +374,22 @@ namespace OpenSim.Framework.Servers.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
-                                                       new string[] {"text/xml"}, 
-                                                       ConnectionType.KeepAlive, 4711, 
+            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
+                                                       new string[] {"text/xml"},
+                                                       ConnectionType.KeepAlive, 4711,
                                                        new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis"));
             threq0.Method = "GET";
             threq0.HttpVersion = HttpHelper.HTTP10;
 
-            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
-                                                       new string[] {"text/xml"}, 
-                                                       ConnectionType.KeepAlive, 4711, 
+            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
+                                                       new string[] {"text/xml"},
+                                                       ConnectionType.KeepAlive, 4711,
                                                        new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis?a=0&b=1&c=2"));
             threq1.Method = "POST";
             threq1.HttpVersion = HttpHelper.HTTP11;
             threq1.Headers["x-wuff"] = "wuffwuff";
             threq1.Headers["www-authenticate"] = "go away";
-            
+
             req0 = new OSHttpRequest(new TestHttpClientContext(false), threq0);
             req1 = new OSHttpRequest(new TestHttpClientContext(false), threq1);
 
diff --git a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
index 512ac4f..9126cfb 100644
--- a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
         {
 //            remove_me = section;
             m_Username = Util.GetConfigVarFromSections<string>(config, "HttpAuthUsername", new string[] { "Network", section }, string.Empty);
-            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty); 
+            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty);
             string str = m_Username + ":" + m_Password;
             byte[] encData_byte = Util.UTF8.GetBytes(str);
 
diff --git a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
index a49952c..79d6ff4 100644
--- a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
             m_authentications.Remove(auth);
         }
 
-        public void AddAuthorization(NameValueCollection headers) 
+        public void AddAuthorization(NameValueCollection headers)
         {
             foreach (IServiceAuth auth in m_authentications)
                 auth.AddAuthorization(headers);
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index a811187..f19a270 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     /// <summary>
     /// Enapsulate statistics for a simulator/scene.
-    /// 
+    ///
     /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
     /// storage.
     /// </summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Framework
             get { return m_regionY; }
         }
         private uint m_regionY;
-        
+
         public SimStatsPacket.RegionBlock RegionBlock
         {
             get { return m_regionBlock; }
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
             get { return m_regionFlags; }
         }
         private uint m_regionFlags;
-            
+
         public uint ObjectCapacity
         {
             get { return m_objectCapacity; }
@@ -85,9 +85,9 @@ namespace OpenSim.Framework
             get { return regionUUID; }
         }
         private UUID regionUUID;
-                
+
         public SimStats(
-            uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 
+            uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
             SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock,
             SimStatsPacket.StatBlock[] ExtraStatsBlock, UUID pRUUID)
         {
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index c270d98..223d91f 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework
 
         private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Thread LockedByThread;
 //        private string WriterStack;
 
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
                     if (!LockedByThread.IsAlive)
                     {
                         //Locked by dead thread, reset.
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim(); 
+                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
                     }
                 }
 
@@ -146,7 +146,7 @@ namespace OpenSim.Framework
 //                    {}
                     m_itemLock.ExitWriteLock();
                 }
-                
+
                 while (!m_itemLock.TryEnterReadLock(60000))
                 {
                     m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index b195bbe..1cc32b3 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
         private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
-        
+
         public UUID AssetID {
             get {
                 return _assetID;
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index e8ae728..5ad0030 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOOT_SIZE] = 45;
 
 
-            // head 
+            // head
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SIZE] = 255;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SQUASH_STRETCH_HEAD] = 0; // head stretch
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SHAPE] = 155;
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Tests
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FACE_SHEAR] = 127;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOREHEAD_ANGLE] = 104;
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BIG_BROW] = 94;
-            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks 
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DOUBLE_CHIN] = 122; //  lower cheeks
             VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIGH_CHEEK_BONES] = 130;
 
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Tests
         /// <summary>
         /// Test to ensure that the serialization format is the same and the underlying types don't change without notice
         /// oldSerialization is just a json serialization of the OSDMap packed for the AgentCircuitData.
-        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types 
+        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types
         /// have changed and are incompatible.
         /// </summary>
         [Test]
@@ -319,7 +319,7 @@ namespace OpenSim.Framework.Tests
                 string str = OSDParser.SerializeJsonString(map);
                 //System.Console.WriteLine(str);
                 map2 = (OSDMap) OSDParser.DeserializeJson(str);
-            } 
+            }
             catch (System.NullReferenceException)
             {
                 //spurious litjson errors :P
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index ae132c8..b572afc 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Tests
 
             resp = agentCircuitManager.AuthenticateSession(UUID.Random(), AgentId1, circuitcode1);
             Assert.That(!resp.Authorised);
-            
+
             resp = agentCircuitManager.AuthenticateSession(SessionId1, AgentId1, circuitcode2);
             Assert.That(!resp.Authorised);
 
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs
index d8f17d0..daf8611 100644
--- a/OpenSim/Framework/Tests/AnimationTests.cs
+++ b/OpenSim/Framework/Tests/AnimationTests.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework.Tests
             anim4.AnimID = anim2.AnimID;
             anim4.ObjectID = anim2.ObjectID;
             anim4.SequenceNum = anim2.SequenceNum;
-            
+
             Assert.That(anim4.ObjectID == objUUID2 && anim4.AnimID == animUUID2 && anim4.SequenceNum == 1, "void constructor and manual field population failed to set the properties correctly.");
         }
     }
diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs
index c709860..a92ff3c 100644
--- a/OpenSim/Framework/Tests/CacheTests.cs
+++ b/OpenSim/Framework/Tests/CacheTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Tests
             Assert.That(citem == null, "Item should not be in Cache");
         }
 
-        
+
         [Test]
         public void ExpireItemManually()
         {
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
             cache.Clear();
-  
+
             object citem = cache.Get(cacheItemUUID.ToString());
             Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
         }
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 3d5d1d2..5e84026 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -85,6 +85,6 @@ namespace OpenSim.Framework.Tests
             Assert.That(TestLocation2.Equals(cln), "Cloned object failed .Equals(obj) Test");
 
         }
-        
+
     }
 }
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index d8072c7..bde7056 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Tests
                 && position2.Center == position1.Center
                 && position2.RegionHandle == position1.RegionHandle
                 && position2.Far == position1.Far
-               
+
                 ,"Copy From ChildAgentDataUpdate failed");
 
             position2 = new AgentPosition();
@@ -148,13 +148,13 @@ namespace OpenSim.Framework.Tests
 //            string time = settings.LoadedCreationTime;
 
             Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
-            
+
         }
         public void RegionSaveFired(RegionSettings settings)
         {
             m_RegionSettingsOnSaveEventFired = true;
         }
-        
+
         [Test]
         public void InventoryItemBaseConstructorTest01()
         {
@@ -164,7 +164,7 @@ namespace OpenSim.Framework.Tests
 
             UUID ItemID = UUID.Random();
             UUID OwnerID = UUID.Random();
-            
+
             InventoryItemBase b2 = new InventoryItemBase(ItemID);
             Assert.That(b2.ID == ItemID, "ID constructor should create an inventory item with ID = ItemID");
             Assert.That(b2.Owner == UUID.Zero, "ID constructor  should create an inventory item with Owner = UUID.Zero");
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Tests
             Assert.That(fld.ID == uuid1, "ID,Owner constructor failed to save value in ID field.");
             Assert.That(fld.Owner == uuid2, "ID,Owner constructor failed to save value in ID field.");
         }
-        
+
         [Test]
         public void AsssetBaseConstructorTest01()
         {
@@ -304,6 +304,6 @@ namespace OpenSim.Framework.Tests
             Culture.SetCurrentCulture();
             Assert.That(Thread.CurrentThread.CurrentCulture.Name == ci.Name, "SetCurrentCulture failed to set thread culture to en-US");
 
-        }     
+        }
     }
 }
diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
index 82e13e5..cc30fb9 100644
--- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
+++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Framework.Tests
 
             int[] nonprimes = {
                                4, 6, 8, 10, 14, 16, 18, 22, 28, 30, 36, 40, 42, 46, 52, 58, 60, 66, 70, 72, 78, 82, 88,
-                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462, 
-                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936, 
-                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662, 
+                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462,
+                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936,
+                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662,
                                4672, 4678, 4690, 7740, 7752, 7756, 7758, 7788, 7792, 7816, 7822, 7828, 7840, 7852, 7866, 7872,
                                7876, 7878, 7882, 7900, 7906, 7918
                            };
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 14b9d2f..b3d79ee 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Framework.Tests
                                                "application/vnd.ll.clothing",
                                                "application/vnd.ll.gesture"
                                            };
-        
+
             for (int i=0;i<inventorytypes.Length;i++)
             {
                 Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index f7069a5..d8fa629 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -159,12 +159,12 @@ namespace OpenSim.Framework
         /// </summary>
         public virtual ulong HomeRegion
         {
-            get 
-            { 
+            get
+            {
                 return Util.RegionWorldLocToHandle(Util.RegionToWorldLoc(m_homeRegionX), Util.RegionToWorldLoc(m_homeRegionY));
-                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize); 
+                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize);
             }
-            
+
             set
             {
                 uint regionWorldLocX, regionWorldLocY;
@@ -212,7 +212,7 @@ namespace OpenSim.Framework
             get { return m_surname; }
             set { m_surname = value; }
         }
-        
+
         /// <value>
         /// The concatentation of the various name components.
         /// </value>
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 4ed890b..7c6a6fe 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
         public byte Flags = 0;
         public int Price = 0;
     }
-    
+
     public class UserProfileProperties
     {
         public UUID UserId = UUID.Zero;
@@ -68,7 +68,7 @@ namespace OpenSim.Framework
         public UUID FirstLifeImageId = UUID.Zero;
         public string FirstLifeText = string.Empty;
     }
-    
+
     public class UserProfilePick
     {
         public UUID PickId = UUID.Zero;
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
         public int SortOrder = 0;
         public bool Enabled = false;
     }
-    
+
     public class UserProfileNotes
     {
         public UUID UserId;
@@ -101,7 +101,7 @@ namespace OpenSim.Framework
         public bool Visible = false;
         public string EMail = string.Empty;
     }
-    
+
     public class UserAccountProperties
     {
         public string EmailAddress = string.Empty;
@@ -110,13 +110,13 @@ namespace OpenSim.Framework
         public string Password = string.Empty;
         public string UserId = string.Empty;
     }
-    
+
     public class UserAccountAuth
     {
         public string UserId = UUID.Zero.ToString();
         public string Password = string.Empty;
     }
-    
+
     public class UserAppData
     {
         public string TagId = string.Empty;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 89cf045..6d679f2 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
 {
     [Flags]
     public enum PermissionMask : uint
-    { 
+    {
         None = 0,
 
         // folded perms
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
         public STPStartInfo STPStartInfo { get; set; }
         public WIGStartInfo WIGStartInfo { get; set; }
         public bool IsIdle { get; set; }
-        public bool IsShuttingDown { get; set; }       
+        public bool IsShuttingDown { get; set; }
         public int MaxThreads { get; set; }
         public int MinThreads { get; set; }
         public int InUseThreads { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
         public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
 
         /// <value>
-        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
+        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards)
         /// </value>
         public static UUID BLANK_TEXTURE_UUID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
 
@@ -280,7 +280,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="a">A 3d vector</param>
         /// <returns>A new vector which is normalized form of the vector</returns>
-        
+
         public static Vector3 GetNormalizedVector(Vector3 a)
         {
             Vector3 v = new Vector3(a.X, a.Y, a.Z);
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
         // Regions are identified with a 'handle' made up of its world coordinates packed into a ulong.
         // Region handles are based on the coordinate of the region corner with lower X and Y
         // var regions need more work than this to get that right corner from a generic world position
-        // this corner must be on a grid point 
+        // this corner must be on a grid point
         public static ulong RegionWorldLocToHandle(uint X, uint Y)
         {
            ulong handle = X & 0xffffff00; // make sure it matchs grid coord points.
@@ -450,7 +450,7 @@ namespace OpenSim.Framework
 
                 string host;
                 uint port = 80;
-                
+
                 string[] parts = inputName.Split(new char[] { ':' });
                 int indx;
                 if(parts.Length == 0)
@@ -470,7 +470,7 @@ namespace OpenSim.Framework
                 else
                 {
                     host = parts[0];
-               
+
                     if (parts.Length >= 2)
                     {
                         indx = parts[1].IndexOf('/');
@@ -875,8 +875,8 @@ namespace OpenSim.Framework
         /// <param name="newx">New region x-coord</param>
         /// <param name="oldy">Old region y-coord</param>
         /// <param name="newy">New region y-coord</param>
-        /// <returns></returns>        
-        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy, 
+        /// <returns></returns>
+        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy,
             int oldsizex, int oldsizey, int newsizex, int newsizey)
         {
             // we still need to make sure we see new region  1stNeighbors
@@ -1267,7 +1267,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
         /// any values previously found.
         /// </summary>
         /// <typeparam name="T">Type of the variable</typeparam>
@@ -1282,7 +1282,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
         /// any values previously found.
         /// </summary>
         /// <remarks>
@@ -1338,7 +1338,7 @@ namespace OpenSim.Framework
                 ConfigSource.ExpandKeyValues();
             }
         }
-        
+
         public static T ReadSettingsFromIniFile<T>(IConfig config, T settingsClass)
         {
             Type settingsType = settingsClass.GetType();
@@ -1449,7 +1449,7 @@ namespace OpenSim.Framework
 
             if (File.Exists(configFile))
             {
-                // Merge 
+                // Merge
                 config.Merge(new IniConfigSource(configFile));
                 config.ExpandKeyValues();
                 configFilePath = configFile;
@@ -1598,7 +1598,7 @@ namespace OpenSim.Framework
             }
 
             memory.Position = 0;
-           
+
             byte[] compressed = new byte[memory.Length];
             memory.Read(compressed, 0, compressed.Length);
 
@@ -1645,7 +1645,7 @@ namespace OpenSim.Framework
             const int readSize = 256;
             byte[] buffer = new byte[readSize];
             MemoryStream ms = new MemoryStream();
-        
+
             int count = inputStream.Read(buffer, 0, readSize);
 
             while (count > 0)
@@ -1731,10 +1731,10 @@ namespace OpenSim.Framework
             regionHandle = Utils.BytesToUInt64(bytes);
             x = Utils.BytesToUInt(bytes, 8) & 0xffff;
             y = Utils.BytesToUInt(bytes, 12) & 0xffff;
-            // validation may fail, just reducing the odds of using a real UUID as encoded parcel  
+            // validation may fail, just reducing the odds of using a real UUID as encoded parcel
             return  ( bytes[0] == 0 && bytes[4] == 0 && // handler x,y multiples of 256
                          bytes[9] < 64 && bytes[13] < 64 && // positions < 16km
-                         bytes[14] == 0 && bytes[15] == 0);          
+                         bytes[14] == 0 && bytes[15] == 0);
         }
 
         public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y, out uint z)
@@ -1757,7 +1757,7 @@ namespace OpenSim.Framework
             x += rx;
             y += ry;
         }
-        
+
         /// <summary>
         /// Get operating system information if available.  Returns only the first 45 characters of information
         /// </summary>
@@ -1776,12 +1776,12 @@ namespace OpenSim.Framework
 //            {
 //                os = ReadEtcIssue();
 //            }
-//                      
+//
 //            if (os.Length > 45)
 //            {
 //                os = os.Substring(0, 45);
 //            }
-            
+
             return os;
         }
 
@@ -1993,7 +1993,7 @@ namespace OpenSim.Framework
                     vol = vcomps[0];
                 }
             }
-            
+
             string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
 
             // Glob
@@ -2095,7 +2095,7 @@ namespace OpenSim.Framework
 
             if (!str.EndsWith("\0"))
                 str += "\0";
-            
+
             // Because this is UTF-8 encoding and not ASCII, it's possible we
             // might have gotten an oversized array even after the string trim
             byte[] data = UTF8.GetBytes(str);
@@ -2354,7 +2354,7 @@ namespace OpenSim.Framework
                     throw new NotImplementedException();
             }
         }
-                
+
         /// <summary>
         /// Additional information about threads in the main thread pool. Used to time how long the
         /// thread has been running, and abort it if it has timed-out.
@@ -2365,7 +2365,7 @@ namespace OpenSim.Framework
             public string StackTrace { get; set; }
             private string context;
             public bool LogThread { get; set; }
-            
+
             public IWorkItemResult WorkItem { get; set; }
             public Thread Thread { get; set; }
             public bool Running { get; set; }
@@ -2470,7 +2470,7 @@ namespace OpenSim.Framework
         public static Dictionary<string, int> GetFireAndForgetCallsMade()
         {
             return new Dictionary<string, int>(m_fireAndForgetCallsMade);
-        }       
+        }
 
         private static Dictionary<string, int> m_fireAndForgetCallsMade = new Dictionary<string, int>();
 
@@ -2490,7 +2490,7 @@ namespace OpenSim.Framework
         {
             FireAndForget(callback, obj, null);
         }
-     
+
         public static void FireAndForget(System.Threading.WaitCallback callback, object obj, string context)
         {
             Interlocked.Increment(ref numTotalThreadFuncsCalled);
@@ -2511,19 +2511,19 @@ namespace OpenSim.Framework
             WaitCallback realCallback;
 
             bool loggingEnabled = LogThreadPool > 0;
-            
+
             long threadFuncNum = Interlocked.Increment(ref nextThreadFuncNum);
             ThreadInfo threadInfo = new ThreadInfo(threadFuncNum, context);
 
             if (FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
             {
                 // If we're running regression tests, then we want any exceptions to rise up to the test code.
-                realCallback = 
-                    o => 
-                    { 
-                        Culture.SetCurrentCulture(); 
-                        callback(o); 
-                        
+                realCallback =
+                    o =>
+                    {
+                        Culture.SetCurrentCulture();
+                        callback(o);
+
                         if (context != null)
                             m_fireAndForgetCallsInProgress[context]--;
                     };
@@ -2666,7 +2666,7 @@ namespace OpenSim.Framework
                 if (stackTrace.Contains("BeginFireQueueEmpty"))
                     return false;
             }
-            
+
             return true;
         }
 
@@ -2679,7 +2679,7 @@ namespace OpenSim.Framework
         {
             string src = Environment.StackTrace;
             string[] lines = src.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
-            
+
             StringBuilder dest = new StringBuilder(src.Length);
 
             bool started = false;
@@ -2724,11 +2724,11 @@ namespace OpenSim.Framework
         /// trace. And pausing another thread can cause a deadlock. This method attempts to
         /// avoid deadlock by using a short timeout (200ms), after which it gives up and
         /// returns 'null' instead of the stack trace.
-        /// 
+        ///
         /// Take from: http://stackoverflow.com/a/14935378
-        /// 
+        ///
         /// WARNING: this doesn't work in Mono. See https://bugzilla.novell.com/show_bug.cgi?id=571691
-        /// 
+        ///
         /// </remarks>
         /// <returns>The stack trace, or null if failed to get it</returns>
         private static StackTrace GetStackTrace(Thread targetThread)
@@ -2829,7 +2829,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
         /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
-        /// for the callers. 
+        /// for the callers.
         /// This trims it to a 12 day interval so don't let your frame time get too long.
         /// </summary>
         /// <returns></returns>
@@ -3186,7 +3186,7 @@ namespace OpenSim.Framework
                 if (parts.Length == 2)
                     return CalcUniversalIdentifier(id, agentsURI, parts[0] + " " + parts[1]);
             }
-            
+
             return CalcUniversalIdentifier(id, agentsURI, firstName + " " + lastName);
         }
 
@@ -3286,10 +3286,10 @@ namespace OpenSim.Framework
 
         public virtual int Count
         {
-            get 
-            { 
+            get
+            {
                 lock (m_syncRoot)
-                    return m_highQueue.Count + m_lowQueue.Count; 
+                    return m_highQueue.Count + m_lowQueue.Count;
             }
         }
 
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index 7bb0351..1e6efe5 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -58,10 +58,10 @@ namespace OpenSim
         }
 
         public const int VERSIONINFO_VERSION_LENGTH = 27;
-        
+
         /// <value>
         /// This is the external interface version.  It is separate from the OpenSimulator project version.
-        /// 
+        ///
         /// </value>
         /// Commented because it's not used anymore, see below for new
         /// versioning method.
@@ -70,18 +70,18 @@ namespace OpenSim
         /// <summary>
         /// This rules versioning regarding teleports, and compatibility between simulators in that regard.
         /// </summary>
-        /// 
+        ///
         /// <remarks>
         /// The protocol version that we will use for outgoing transfers
-        /// Valid values are 
-        /// "SIMULATION/0.3" 
+        /// Valid values are
+        /// "SIMULATION/0.3"
         ///   - This is the latest, and it supports teleports to variable-sized regions
         ///   - Older versions can teleport to this one, but only if the destination region
         ///     is 256x256
         /// "SIMULATION/0.2"
         ///   - A source simulator which only implements "SIMULATION/0.1" can still teleport here
         ///   - this protocol is more efficient than "SIMULATION/0.1"
-        /// "SIMULATION/0.1" 
+        /// "SIMULATION/0.1"
         ///   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
         /// </remarks>
         public readonly static float SimulationServiceVersionAcceptedMin = 0.3f;
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index 966a6bc..ccaf69e 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
             WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
             for (uint i=0;i<itemmax;i++)
                 retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
-            return retitems;          
+            return retitems;
         }
 
         public static WearableCacheItem[] FromOSD(OSD pInput, IAssetCache dataCache)
@@ -64,7 +64,7 @@ namespace OpenSim.Framework
                                     CacheId = item["cacheid"].AsUUID(),
                                     TextureID = item["textureid"].AsUUID()
                                 });
-                    
+
                     if (dataCache != null && item.ContainsKey("assetdata"))
                     {
                         AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString());
@@ -181,7 +181,7 @@ namespace OpenSim.Framework
                         pcache[idx].TextureAsset = asset;
                     }
                     else
- */ 
+ */
                         pcache[idx].TextureAsset = null;
                 }
             }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index f927e69..12f58fe 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Framework
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
+
                 // If there is some input, write it into the request
                 if (data != null)
                 {
@@ -261,7 +261,7 @@ namespace OpenSim.Framework
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
                     request.ContentType = rpc ? "application/json-rpc" : "application/json";
-                    
+
                     if (compressed)
                     {
                         request.Headers["X-Content-Encoding"] = "gzip"; // can't set "Content-Encoding" because old OpenSims fail if they get an unrecognized Content-Encoding
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
                             requestStream.Write(buffer, 0, buffer.Length);         //Send it
                     }
                 }
-                
+
                 // capture how much time was spent writing, this may seem silly
                 // but with the number concurrent requests, this often blocks
                 tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -354,7 +354,7 @@ namespace OpenSim.Framework
                         reqnum, tickdiff, tickdata);
                 }
             }
-           
+
             m_log.DebugFormat(
                 "[LOGHTTP]: JSON-RPC request {0} {1} to {2} FAILED: {3}", reqnum, method, url, errorMessage);
 
@@ -378,7 +378,7 @@ namespace OpenSim.Framework
             result["success"] = OSD.FromBoolean(true);
             result["_RawResult"] = OSD.FromString(response);
             result["_Result"] = new OSDMap();
-            
+
             if (response.Equals("true",System.StringComparison.OrdinalIgnoreCase))
                 return result;
 
@@ -389,7 +389,7 @@ namespace OpenSim.Framework
                 return result;
             }
 
-            try 
+            try
             {
                 OSD responseOSD = OSDParser.Deserialize(response);
                 if (responseOSD.Type == OSDType.Map)
@@ -403,10 +403,10 @@ namespace OpenSim.Framework
                 // don't need to treat this as an error... we're just guessing anyway
 //                m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
             }
-            
+
             return result;
         }
-        
+
         #endregion JSONRequest
 
         #region FormRequest
@@ -419,7 +419,7 @@ namespace OpenSim.Framework
         {
             return ServiceFormRequest(url,data, 30000);
         }
-        
+
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
         {
             lock (EndPointLock(url))
@@ -436,7 +436,7 @@ namespace OpenSim.Framework
             if (DebugLevel >= 3)
                 m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} ServiceForm '{1}' to {2}",
                     reqnum, method, url);
-            
+
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
@@ -451,7 +451,7 @@ namespace OpenSim.Framework
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
+
                 if (data != null)
                 {
                     queryString = BuildQueryString(data);
@@ -460,7 +460,7 @@ namespace OpenSim.Framework
                         LogOutgoingDetail("SEND", reqnum, queryString);
 
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
-                    
+
                     request.ContentLength = buffer.Length;
                     request.ContentType = "application/x-www-form-urlencoded";
                     using (Stream requestStream = request.GetRequestStream())
@@ -538,7 +538,7 @@ namespace OpenSim.Framework
         }
 
         #endregion FormRequest
-        
+
         #region Uri
 
         /// <summary>
@@ -591,7 +591,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Appends a query string to a Uri that may or may not have existing 
+        /// Appends a query string to a Uri that may or may not have existing
         /// query parameters
         /// </summary>
         /// <param name="uri">Uri to append the query to</param>
@@ -643,7 +643,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="collection"></param>
         /// <param name="key"></param>
@@ -662,12 +662,12 @@ namespace OpenSim.Framework
         #region Stream
 
         /// <summary>
-        /// Copies the contents of one stream to another, starting at the 
+        /// Copies the contents of one stream to another, starting at the
         /// current position of each stream
         /// </summary>
-        /// <param name="copyFrom">The stream to copy from, at the position 
+        /// <param name="copyFrom">The stream to copy from, at the position
         /// where copying should begin</param>
-        /// <param name="copyTo">The stream to copy to, at the position where 
+        /// <param name="copyTo">The stream to copy to, at the position where
         /// bytes should be written</param>
         /// <param name="maximumBytesToCopy">The maximum bytes to copy</param>
         /// <returns>The total number of bytes copied</returns>
@@ -811,7 +811,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static void MakeRequest<TRequest, TResponse>(string verb,
@@ -909,7 +909,7 @@ namespace OpenSim.Framework
                             // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
                             // documented in MSDN
                             using (WebResponse response = request.EndGetResponse(res2))
-                            {   
+                            {
                                 try
                                 {
                                     using (Stream respStream = response.GetResponseStream())
@@ -930,7 +930,7 @@ namespace OpenSim.Framework
                                 if (e.Response is HttpWebResponse)
                                 {
                                     using (HttpWebResponse httpResponse = (HttpWebResponse)e.Response)
-                                    {        
+                                    {
                                         if (httpResponse.StatusCode != HttpStatusCode.NotFound)
                                         {
                                             // We don't appear to be handling any other status codes, so log these feailures to that
@@ -955,7 +955,7 @@ namespace OpenSim.Framework
                                 "[ASYNC REQUEST]: Request {0} {1} failed with exception {2}{3}",
                                 verb, requestUrl, e.Message, e.StackTrace);
                         }
-        
+
                         //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
 
                         try
@@ -968,7 +968,7 @@ namespace OpenSim.Framework
                                 "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}{3}",
                                 verb, requestUrl, e.Message, e.StackTrace);
                         }
-        
+
                     }, null);
                 }
 
@@ -997,7 +997,7 @@ namespace OpenSim.Framework
                 }
             }
             finally
-            { 
+            {
                 if (buffer != null)
                     buffer.Dispose();
             }
@@ -1168,7 +1168,7 @@ namespace OpenSim.Framework
         /// Request timeout in milliseconds.  Timeout.Infinite indicates no timeout.  If 0 is passed then the default HttpWebRequest timeout is used (100 seconds)
         /// </param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
@@ -1191,7 +1191,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections)
@@ -1210,7 +1210,7 @@ namespace OpenSim.Framework
         /// </param>
         /// <param name="maxConnections"></param>
         /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
         /// then the default(TResponse) is returned.
         /// </returns>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections, IServiceAuth auth)
@@ -1375,7 +1375,7 @@ namespace OpenSim.Framework
 
             return deserial;
         }
-    
+
         public static class XMLResponseHelper
         {
             public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength)
@@ -1400,7 +1400,7 @@ namespace OpenSim.Framework
         }
     }
 
-    
+
     public static class XMLRPCRequester
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -1444,7 +1444,7 @@ namespace OpenSim.Framework
                 {
                     m_log.Error("Error parsing XML-RPC response", e);
                 }
-                    
+
                 if (Resp.IsFault)
                 {
                     m_log.DebugFormat(