233 files changed, 973 insertions, 1011 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 20cec04..0f827b0 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -185,11 +185,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
        }
        protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
-        {    
+        {
            m_commsManager 
                = new HGCommunicationsStandalone(
                    m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 
-                    libraryRootFolder, false);                        
+                    libraryRootFolder, false);
            
            CreateGridInfoService();
        }
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 7e0a4ba..ef45f73 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -69,7 +69,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        private string m_name = "RemoteAdminPlugin";
        private string m_version = "0.0";
-        //AnakinLohner 0.6.5-post-fixes
        //guard for XmlRpc-related methods
        private void FailIfRemoteAdminDisabled(string requestName)
        {
@@ -142,7 +141,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    availableMethods["admin_acl_remove"] = XmlRpcAccessListRemove;
                    availableMethods["admin_acl_list"] = XmlRpcAccessListList;
-                    // Either enable full remote functionality or just selected features                    
+                    // Either enable full remote functionality or just selected features
                    string enabledMethods = m_config.GetString("enabled_methods", "all");
                    // To get this, you must explicitly specify "all" or
@@ -469,7 +468,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: CreateRegion: new request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("CreateRegion");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -477,7 +475,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            lock (rslock)
            {
                int  m_regionLimit = m_config.GetInt("region_limit", 0);
                bool m_enableVoiceForNewRegions = m_config.GetBoolean("create_region_enable_voice", false);
                bool m_publicAccess = m_config.GetBoolean("create_region_public", true);
@@ -502,7 +499,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    // check whether we still have space left (iff we are using limits)
                    if (m_regionLimit != 0 && m_app.SceneManager.Scenes.Count >= m_regionLimit)
-                        throw new Exception(String.Format("cannot instantiate new region, server capacity {0} already reached; delete regions first", 
+                        throw new Exception(String.Format("cannot instantiate new region, server capacity {0} already reached; delete regions first",
                                                          m_regionLimit));
                    // extract or generate region ID now
                    Scene scene = null;
@@ -561,7 +558,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
                                scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
                    region.ExternalHostName = (string) requestData["external_address"];
                    string masterFirst = (string) requestData["region_master_first"];
@@ -580,10 +576,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        if (masterFirst != String.Empty && masterLast != String.Empty) // User requests a master avatar
                        {
                            // no client supplied UUID: look it up...
-                            CachedUserInfo userInfo 
+                            CachedUserInfo userInfo
                                = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(
                                    masterFirst, masterLast);
-                                
                            if (null == userInfo)
                            {
                                m_log.InfoFormat("master avatar does not exist, creating it");
@@ -636,7 +632,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
                                          region.RegionID, regionXmlPath);
                        region.SaveRegionToFile("dynamic region", regionXmlPath);
-                    } 
+                    }
                    else
                    {
                        region.Persistent = false;
@@ -664,7 +660,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        {
                            parcel.landData.Flags |= (uint) ParcelFlags.AllowVoiceChat;
                            parcel.landData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan;
-                            ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);                    
+                            ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData);
                        }
                    }
@@ -684,7 +680,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    response.Value = responseData;
                }
-                    
                m_log.Info("[RADMIN]: CreateRegion: request complete");
                return response;
            }
@@ -756,7 +752,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                return response;
            }
        }
-                    
        /// <summary>
        /// Close a region.
        /// <summary>
@@ -798,7 +794,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                {
                    Hashtable requestData = (Hashtable) request.Params[0];
                    checkStringParameters(request, new string[] {"password"});
-                    
                    if (requestData.ContainsKey("region_id") &&
                        !String.IsNullOrEmpty((string) requestData["region_id"]))
                    {
@@ -899,8 +895,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    if (!m_app.SceneManager.TryGetScene(regionName, out scene))
                        throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
-                    // Modify access 
+                    // Modify access
-                    scene.RegionInfo.EstateSettings.PublicAccess = 
+                    scene.RegionInfo.EstateSettings.PublicAccess =
                        getBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
                    if (scene.RegionInfo.Persistent)
                        scene.RegionInfo.EstateSettings.Save();
@@ -988,8 +984,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: CreateUser: new request");
-            
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("CreateUser");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -1024,13 +1019,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    if (requestData.Contains("user_email"))
                        email = (string)requestData["user_email"];
-                    CachedUserInfo userInfo =  
+                    CachedUserInfo userInfo =
                        m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
-                                
                    if (null != userInfo)
                        throw new Exception(String.Format("Avatar {0} {1} already exists", firstname, lastname));
-                    UUID userID = 
+                    UUID userID =
                        m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname,
                                                                             passwd, email, regX, regY);
@@ -1101,7 +1096,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: UserExists: new request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("UserExists");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -1117,8 +1111,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                string firstname = (string) requestData["user_firstname"];
                string lastname = (string) requestData["user_lastname"];
-                CachedUserInfo userInfo 
+                CachedUserInfo userInfo
-                    = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);                 
+                    = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
                responseData["user_firstname"] = firstname;
                responseData["user_lastname"] = lastname;
@@ -1131,10 +1125,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                else
                {
                    responseData["success"] = true;
-                    responseData["lastlogin"] = userInfo.UserProfile.LastLogin;                
+                    responseData["lastlogin"] = userInfo.UserProfile.LastLogin;
                }
                response.Value = responseData;
            }
            catch (Exception e)
@@ -1252,7 +1245,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    if (requestData.ContainsKey("about_virtual_world"))
                        aboutAvatar = (string)requestData["about_virtual_world"];
-                    UserProfileData userProfile 
+                    UserProfileData userProfile
                        = m_app.CommunicationsManager.UserService.GetUserProfile(firstname, lastname);
                    if (null == userProfile)
@@ -1308,20 +1301,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
            return response;
        }
        /// <summary>
        /// This method is called by the user-create and user-modify methods to establish
        /// or change, the user's appearance. Default avatar names can be specified via
-        /// the config file, but must correspond to avatars in the default appearance 
+        /// the config file, but must correspond to avatars in the default appearance
        /// file, or pre-existing in the user database.
        /// This should probably get moved into somewhere more core eventually.
        /// </summary>
        private void updateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
        {
            m_log.DebugFormat("[RADMIN] updateUserAppearance");
            string dmale   = m_config.GetString("default_male", "Default Male");
@@ -1347,7 +1338,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        break;
                }
            }
-            
            // Has an explicit model been specified?
            if (requestData.Contains("model"))
@@ -1384,7 +1375,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                return;
            }
-            // Set current user's appearance. This bit is easy. The appearance structure is populated with 
+            // Set current user's appearance. This bit is easy. The appearance structure is populated with
            // actual asset ids, however to complete the magic we need to populate the inventory with the
            // assets in question.
@@ -1393,7 +1384,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}",
                              userid, model);
        }
-        
        /// <summary>
        /// This method is called by updateAvatarAppearance once any specified model has been
        /// ratified, or an appropriate default value has been adopted. The intended prototype
@@ -1402,19 +1393,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        private void establishAppearance(UUID dest, UUID srca)
        {
            m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca);
            AvatarAppearance ava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(srca);
            // If the model has no associated appearance we're done.
-            // if (ava == null) 
+            // if (ava == null)
            // {
            //     return new AvatarAppearance();
            // }
-            if (ava == null) 
+            if (ava == null)
                return;
            UICallback sic  = new UICallback();
@@ -1423,7 +1413,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            try
            {
                Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>();
                iserv.GetUserInventory(dest, dic.callback);
@@ -1434,7 +1423,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                if (sic.OK && dic.OK)
                {
                    InventoryFolderImpl efolder;
                    InventoryFolderImpl srcf = sic.root.FindFolderForType(5);
                    InventoryFolderImpl dstf = dic.root.FindFolderForType(5);
@@ -1460,7 +1448,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                               if (item.Folder == folder.ID)
                                {
                                    InventoryItemBase dsti = new InventoryItemBase();
-                                    dsti.ID = UUID.Random(); 
+                                    dsti.ID = UUID.Random();
                                    dsti.Name = item.Name;
                                    dsti.Description = item.Description;
                                    dsti.InvType = item.InvType;
@@ -1494,7 +1482,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                            ava.SetWearable(i, dw);
                        }
                    }
                }
                else
                {
@@ -1502,7 +1489,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                }
                m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(dest, ava);
            }
            catch (Exception e)
            {
@@ -1510,16 +1496,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 dest, e.Message);
                return;
            }
-            
-            return;
+            return;
        }
        ///<summary>
        /// This method is called if a given model avatar name can not be found. If the external
-        /// file has already been loaded once, then control returns immediately. If not, then it 
+        /// file has already been loaded once, then control returns immediately. If not, then it
        /// looks for a default appearance file. This file contains XML definitions of zero or more named
-        /// avatars, each avatar can specify zero or more "outfits". Each outfit is a collection 
+        /// avatars, each avatar can specify zero or more "outfits". Each outfit is a collection
        /// of items that together, define a particular ensemble for the avatar. Each avatar should
        /// indicate which outfit is the default, and this outfit will be automatically worn. The
        /// other outfits are provided to allow "real" avatars a way to easily change their outfits.
@@ -1527,7 +1512,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        private bool createDefaultAvatars()
        {
            // Only load once
            if (daload)
@@ -1543,10 +1527,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            try
            {
                string dafn = null;
- 
-                //AnakinLohner 0.6.5-post-fixes
                //m_config may be null if RemoteAdmin configuration secition is missing or disabled in OpenSim.ini
                if (m_config != null)
                {
@@ -1555,7 +1537,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                if (File.Exists(dafn))
                {
                    XmlDocument doc = new XmlDocument();
                    string name     = "*unknown*";
                    string email    = "anon@anon";
@@ -1630,12 +1611,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                            }
                            m_log.DebugFormat("[RADMIN] User {0}[{1}] created or retrieved", name, ID);
-                            include = true; 
+                            include = true;
                        }
                        catch (Exception e)
                        {
                            m_log.DebugFormat("[RADMIN] Error creating user {0} : {1}", name, e.Message);
-                            include = false; 
+                            include = false;
                        }
                        // OK, User has been created OK, now we can install the inventory.
@@ -1654,7 +1635,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                            {
                                mava = new AvatarAppearance();
                            }
-                            
                            {
                                AvatarWearable[] wearables = mava.Wearables;
                                for (int i=0; i<wearables.Length; i++)
@@ -1670,8 +1651,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                            if (uic.OK)
                            try
                            {
+                                m_log.DebugFormat("[RADMIN] {0} folders, {1} items in inventory",
-                                m_log.DebugFormat("[RADMIN] {0} folders, {1} items in inventory", 
                                   uic.folders.Count, uic.items.Count);
                                InventoryFolderImpl cfolder = uic.root.FindFolderForType(5);
@@ -1699,7 +1679,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                foreach (XmlElement outfit in outfits)
                                {
                                    m_log.DebugFormat("[RADMIN] Loading outfit {0} for {1}",
                                        GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?"));
@@ -1707,7 +1686,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                    select  = (GetStringAttribute(outfit,"default","no") == "yes");
                                    efolder = null;
-                                    // If the folder already exists, re-use it. The defaults may 
+                                    // If the folder already exists, re-use it. The defaults may
                                    // change over time. Augment only.
                                    foreach (InventoryFolderImpl folder in uic.folders)
                                    {
@@ -1756,10 +1735,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                        InventoryItemBase iitem = null;
-                                        if ((iitem = efolder.FindAsset(assetid)) == null)   
+                                        if ((iitem = efolder.FindAsset(assetid)) == null)
                                        {
                                            iitem = new InventoryItemBase();
-                                            iitem.ID = UUID.Random(); 
+                                            iitem.ID = UUID.Random();
                                            iitem.Name = GetStringAttribute(item,"name","");
                                            iitem.Description = GetStringAttribute(item,"desc","");
                                            iitem.InvType = GetIntegerAttribute(item,"invtype",-1);
@@ -1820,9 +1799,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            }
            return true;
        }
-    
        /// <summary>
        /// Load an OAR file into a region..
        /// <summary>
@@ -1859,9 +1837,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: Received Load OAR Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Load OAR");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -1962,9 +1939,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: Received Save OAR Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Save OAR");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -2003,7 +1979,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
                if (archiver != null)
                {
                    scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
@@ -2014,11 +1989,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                else
                    throw new Exception("Archiver module not present for scene");
                responseData["saved"] = true;
                response.Value = responseData;
            }
            catch (Exception e)
            {
@@ -2045,7 +2018,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: Received Load XML Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Load XML");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -2129,12 +2101,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            }
        }
        public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: Received Save XML Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Save XML");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -2220,7 +2190,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: Received Query XML Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Query XML");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -2255,9 +2224,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                else throw new Exception("neither region_name nor region_uuid given");
                Scene s = m_app.SceneManager.CurrentScene;
                int health = s.GetHealth();
                responseData["health"] = health;
                response.Value = responseData;
@@ -2280,7 +2247,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        {
            m_log.Info("[RADMIN]: Received Command XML Administrator Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Command XML");
            XmlRpcResponse response = new XmlRpcResponse();
@@ -2320,12 +2286,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: Received Access List Clear Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Access List Clear");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -2360,7 +2324,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                s.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
                if (s.RegionInfo.Persistent)
                    s.RegionInfo.EstateSettings.Save();
            }
            catch (Exception e)
            {
@@ -2368,7 +2331,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                responseData["success"] = false;
                responseData["error"] = e.Message;
            }
            finally
            {
@@ -2381,12 +2343,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: Received Access List Add Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Access List Add");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -2419,7 +2379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                int addk = 0;
-               if (requestData.Contains("users"))
+                if (requestData.Contains("users"))
                {
                    UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
                    Scene s = m_app.SceneManager.CurrentScene;
@@ -2450,7 +2410,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                }
                responseData["added"] = addk;
            }
            catch (Exception e)
            {
@@ -2458,7 +2417,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                responseData["success"] = false;
                responseData["error"] = e.Message;
            }
            finally
            {
@@ -2471,12 +2429,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: Received Access List Remove Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Access List Remove");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -2509,7 +2465,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                int remk = 0;
-               if (requestData.Contains("users"))
+                if (requestData.Contains("users"))
                {
                    UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
                    Scene s = m_app.SceneManager.CurrentScene;
@@ -2539,7 +2495,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                }
                responseData["removed"] = remk;
            }
            catch (Exception e)
            {
@@ -2547,7 +2502,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                responseData["success"] = false;
                responseData["error"] = e.Message;
            }
            finally
            {
@@ -2560,12 +2514,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            m_log.Info("[RADMIN]: Received Access List List Request");
-            //AnakinLohner 0.6.5-post-fixes
            FailIfRemoteAdminDisabled("Access List List");
-            
            XmlRpcResponse response = new XmlRpcResponse();
            Hashtable responseData = new Hashtable();
@@ -2608,9 +2560,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        users[user.ToString()] = udata.UserProfile.Name;
                    }
                }
-                
-                responseData["users"] = users;
+                responseData["users"] = users;
            }
            catch (Exception e)
            {
@@ -2618,7 +2569,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                responseData["success"] = false;
                responseData["error"] = e.Message;
            }
            finally
            {
@@ -2695,12 +2645,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public void Dispose()
        {
        }
    }
    class UICallback
    {
        private  Object uilock = new Object();
        internal InventoryFolderImpl root = null;
        internal List<InventoryFolderImpl> folders;
@@ -2720,7 +2668,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        public void GetInventory()
        {
            Dictionary<UUID, InventoryFolderImpl> fmap = new Dictionary<UUID, InventoryFolderImpl>();
            if (OK == false)
@@ -2729,7 +2676,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                {
                    if (OK == false)
                        System.Threading.Monitor.Wait(uilock);
-                }  
+                }
            }
            // Got the inventory OK. So now merge the content of the default appearance
@@ -2774,8 +2721,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            {
                 fmap[item.Folder].Items.Add(item.ID, item);
            }
        }
    }
 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index a407b9e..9c90a7e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -218,7 +218,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            httpResponse.ContentType = "text/xml";
            
            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)              
+            if (serialiser != null)
                serialiser.SavePrimsToXml2(scene, new StreamWriter(httpResponse.OutputStream), min, max);
            
            return "";
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 104f2d5..02eaf5d 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Client.MXP.ClientStack
            String typeName = ToOmType(primShape.PCode);
            m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName);
-            PerceptionEventMessage pe = new PerceptionEventMessage();           
+            PerceptionEventMessage pe = new PerceptionEventMessage();
            pe.ObjectFragment.ObjectId = objectID.Guid;
            pe.ObjectFragment.ParentObjectId = Guid.Empty;
diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs
index ee69366..e9a1e81 100644
--- a/OpenSim/Data/IUserData.cs
+++ b/OpenSim/Data/IUserData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data
        
        /// <summary>
        /// Get a user from a given uri.
-        /// </summary>  
+        /// </summary>
        /// <param name="uri"></param>
        /// <returns>The user data profile.  Null if no user is found.</returns>
        UserProfileData GetUserByUri(Uri uri);
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index d193cf5..25f7cf0 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Data.MSSQL
                            (@id, @name, @description, @assetType, @local, 
                             @temporary, @create_time, @access_time, @data)";
            
-            string assetName = asset.Name;            
+            string assetName = asset.Name;
            if (asset.Name.Length > 64)
            {
                assetName = asset.Name.Substring(0, 64);
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MSSQL
                            local = @local, temporary = @temporary, data = @data
                           WHERE id = @keyId;";
-            string assetName = asset.Name;            
+            string assetName = asset.Name;
            if (asset.Name.Length > 64)
            {
                assetName = asset.Name.Substring(0, 64);
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 27a4e70..1482184 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -428,7 +428,7 @@ namespace OpenSim.Data.MSSQL
                             @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType,
                             @creationDate, @groupID, @groupOwned, @flags)";
            
-            string itemName = item.Name;            
+            string itemName = item.Name;
            if (item.Name.Length > 64)
            {
                itemName = item.Name.Substring(0, 64);
@@ -529,7 +529,7 @@ namespace OpenSim.Data.MSSQL
            {
                itemDesc = item.Description.Substring(0, 128);
                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
-            }            
+            }
            
            using (AutoClosingSqlCommand command = database.Query(sql))
            {
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index adedcce..e26a830 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MSSQL
                                    sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
                                sceneObjectPart.UUID = groupID;
-                            }                               
+                            }
                            grp = new SceneObjectGroup(sceneObjectPart);
                        }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index e0c0ed6..38be9f4 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MSSQL
                conn.Open();
                Migration m = new Migration(conn, GetType().Assembly, "UserStore");
                m.Update();
-            }            
+            }
        }
        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 6efb89d..3ef1053 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -1146,7 +1146,7 @@ ELSE
                if (reader.IsDBNull(reader.GetOrdinal("homeRegionID")))
                    retval.HomeRegionID = UUID.Zero;
                else
-                    retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);       
+                    retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);
                retval.Created = Convert.ToInt32(reader["created"].ToString());
                retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
@@ -1200,7 +1200,7 @@ ELSE
                if (reader.IsDBNull(reader.GetOrdinal("partner")))
                    retval.Partner = UUID.Zero;
                else
-                    retval.Partner = new UUID((Guid)reader["partner"]);    
+                    retval.Partner = new UUID((Guid)reader["partner"]);
            }
            else
            {
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 66c34fe..0502b2b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
                        "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?data)",
                        _dbConnection.Connection);
-                string assetName = asset.Name;            
+                string assetName = asset.Name;
                if (asset.Name.Length > 64)
                {
                    assetName = asset.Name.Substring(0, 64);
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 4521a0f..0eecf06 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -325,10 +325,10 @@ namespace OpenSim.Data.MySQL
                UUID GroupID = UUID.Zero;
                UUID.TryParse((string)reader["avatarID"], out Owner);
                UUID.TryParse((string)reader["groupID"], out GroupID);
-                item.Owner = Owner;                
+                item.Owner = Owner;
                item.GroupID = GroupID;
-                // Rest of the parsing.  If these UUID's fail, we're dead anyway                
+                // Rest of the parsing.  If these UUID's fail, we're dead anyway
                item.ID = new UUID((string) reader["inventoryID"]);
                item.AssetID = new UUID((string) reader["assetID"]);
                item.AssetType = (int) reader["assetType"];
@@ -472,7 +472,7 @@ namespace OpenSim.Data.MySQL
                    + ", ?inventoryBasePermissions, ?inventoryEveryOnePermissions, ?inventoryGroupPermissions, ?salePrice, ?saleType, ?creationDate"
                    + ", ?groupID, ?groupOwned, ?flags)";
-            string itemName = item.Name;            
+            string itemName = item.Name;
            if (item.Name.Length > 64)
            {
                itemName = item.Name.Substring(0, 64);
@@ -484,7 +484,7 @@ namespace OpenSim.Data.MySQL
            {
                itemDesc = item.Description.Substring(0, 128);
                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length + " to " + itemDesc.Length + " characters on add item");
-            }            
+            }
            try
            {
@@ -590,12 +590,12 @@ namespace OpenSim.Data.MySQL
                "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version) VALUES ";
            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)";
-            string folderName = folder.Name;            
+            string folderName = folder.Name;
            if (folderName.Length > 64)
            {
                folderName = folderName.Substring(0, 64);
                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length + " to " + folderName.Length + " characters on add folder");
-            }         
+            }
            database.CheckConnection();
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index ed62172..c2dd788 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Data.MySQL
                                    prim.Name, prim.UUID, prim.GroupPosition, groupID);
                                
                                prim.UUID = groupID;
-                            }                            
+                            }
                            grp = new SceneObjectGroup(prim);
                        }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.MySQL
        /// <summary>
        /// Load in a prim's persisted inventory.
        /// </summary>
-        /// <param name="prim">The prim</param>        
+        /// <param name="prim">The prim</param>
        private void LoadItems(SceneObjectPart prim)
        {
            lock (m_Connection)
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 537ef6c..04f872f 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -632,7 +632,7 @@ namespace OpenSim.Data.MySQL
            UUID zero = UUID.Zero;
            if (user.ID == zero)
            {
-                return;   
+                return;
            }
            MySQLSuperManager dbm = GetLockedConnection("AddNewUserProfile");
@@ -666,7 +666,7 @@ namespace OpenSim.Data.MySQL
        {
            UUID zero = UUID.Zero;
            if (agent.ProfileID == zero || agent.SessionID == zero)
-                return;   
+                return;
            MySQLSuperManager dbm = GetLockedConnection("AddNewUserAgent");
            try
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 7c5cf33..2e7081e 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Data.NHibernate
                    m_log.ErrorFormat("[NHIBERNATE] {0} of id {1} loading threw exception: " + e.ToString(), type.Name, id);
                }
                return obj;
-            }            
+            }
        }
        /// <summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 73b630f..1b0c4c9 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.NHibernate
            m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid);
            
            user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid);
-            if (user != null)    
+            if (user != null)
            {
                UserAgentData agent = GetAgentByUUID(uuid);
                if (agent != null)
@@ -245,7 +245,7 @@ namespace OpenSim.Data.NHibernate
            UserProfileData user=GetUserByUUID(agentID);
            user.WebLoginKey = webLoginKey;
            UpdateUserProfile(user);
-            return;         
+            return;
        }
        public override void AddNewUserFriend(UUID ownerId, UUID friendId, uint perms) 
@@ -258,7 +258,7 @@ namespace OpenSim.Data.NHibernate
            {
                manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms));
            }
-            return;         
+            return;
        }
        private bool FriendRelationExists(UUID ownerId, UUID friendId)
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 1d96631..86d7f6b 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Data
        public uint maturity;
-        //Data Wrappers        
+        //Data Wrappers
        public string RegionName
        {
            get { return regionName; }
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index ea076fe..d22a3ec 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Data.SQLite
        {
            //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
    
-            DataTable dbItems = ds.Tables["primitems"];          
+            DataTable dbItems = ds.Tables["primitems"];
            String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
            DataRow[] dbItemRows = dbItems.Select(sql);
            IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index c66ab7c..97990e1 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests
        public UUID item2;
        public UUID item3;
-        public static Random random;        
+        public static Random random;
        
        public string itemname1 = "item1";
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
            UUID tmp0 = UUID.Random();
            UUID tmp1 = UUID.Random();
            UUID tmp2 = UUID.Random();
-            UUID tmp3 = UUID.Random();            
+            UUID tmp3 = UUID.Random();
            UUID newregion = UUID.Random();
            SceneObjectPart p1 = NewSOP("SoP 1",tmp1);
            SceneObjectPart p2 = NewSOP("SoP 2",tmp2);
@@ -224,7 +224,7 @@ namespace OpenSim.Data.Tests
            random.NextBytes(partsys);
            DateTime expires = new DateTime(2008, 12, 20);
            DateTime rezzed = new DateTime(2009, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
            Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
            Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
            Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
@@ -261,7 +261,7 @@ namespace OpenSim.Data.Tests
            sop.Shape = pbshap;
            sop.GroupPosition = groupos;
            sop.RotationOffset = rotoff;
-            sop.CreatorID = creator;            
+            sop.CreatorID = creator;
            sop.InventorySerial = iserial;
            sop.TaskInventory = dic;
            sop.ObjectFlags = objf;
@@ -306,7 +306,7 @@ namespace OpenSim.Data.Tests
            Assert.That(expires,Is.EqualTo(sop.Expires), "Assert.That(expires,Is.EqualTo(sop.Expires))");
            Assert.That(rezzed,Is.EqualTo(sop.Rezzed), "Assert.That(rezzed,Is.EqualTo(sop.Rezzed))");
            Assert.That(offset,Is.EqualTo(sop.OffsetPosition), "Assert.That(offset,Is.EqualTo(sop.OffsetPosition))");
-            Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");                       
+            Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");
            Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity))");
            Assert.That(accel,Is.EqualTo(sop.Acceleration), "Assert.That(accel,Is.EqualTo(sop.Acceleration))");
            Assert.That(description,Is.EqualTo(sop.Description), "Assert.That(description,Is.EqualTo(sop.Description))");
@@ -319,7 +319,7 @@ namespace OpenSim.Data.Tests
            Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
            Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
            
-            // This is necessary or object will not be inserted in DB            
+            // This is necessary or object will not be inserted in DB
            sop.ObjectFlags = 0;
            SceneObjectGroup sog = new SceneObjectGroup(sop);
@@ -332,11 +332,11 @@ namespace OpenSim.Data.Tests
            // Makes sure there are no double insertions:
            db.StoreObject(sog,region3);
            sogs = db.LoadObjects(region3);
-            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");            
+            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
                
            // Tests if the parameters were inserted correctly
-            SceneObjectPart p = sogs[0].RootPart;               
+            SceneObjectPart p = sogs[0].RootPart;
            Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
            //Assert.That(localid,Is.EqualTo(p.LocalId), "Assert.That(localid,Is.EqualTo(p.LocalId))");
            Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
@@ -402,7 +402,7 @@ namespace OpenSim.Data.Tests
            random.NextBytes(partsys);
            DateTime expires = new DateTime(2010, 12, 20);
            DateTime rezzed = new DateTime(2005, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
            Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
            Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
            Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
@@ -418,7 +418,7 @@ namespace OpenSim.Data.Tests
            PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
            pbshap = PrimitiveBaseShape.Default;
            Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            byte updatef = (byte) random.Next(127);            
+            byte updatef = (byte) random.Next(127);
            
            // Updates the region with new values
            SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
@@ -427,7 +427,7 @@ namespace OpenSim.Data.Tests
            sog2.RootPart.Shape = pbshap;
            sog2.RootPart.GroupPosition = groupos;
            sog2.RootPart.RotationOffset = rotoff;
-            sog2.RootPart.CreatorID = creator;            
+            sog2.RootPart.CreatorID = creator;
            sog2.RootPart.TaskInventory = dic;
            sog2.RootPart.Name = name;
            sog2.RootPart.Material = material;
@@ -492,12 +492,12 @@ namespace OpenSim.Data.Tests
            {
                UUID tmp = UUID.Random();
                SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
-                Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());             
+                Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
                Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
                Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
                Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
-                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());  
+                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
                
                sop.GroupPosition = groupos;
                sop.RotationOffset = rotoff;
@@ -648,7 +648,7 @@ namespace OpenSim.Data.Tests
        {
            InventoryItemBase i = new InventoryItemBase();
            UUID id = UUID.Random();
-            i.ID = id;            
+            i.ID = id;
            UUID folder = UUID.Random();
            i.Folder = folder;
            UUID owner = UUID.Random();
@@ -666,13 +666,13 @@ namespace OpenSim.Data.Tests
            i.NextPermissions = nextperm;
            uint curperm = (uint) random.Next();
            i.CurrentPermissions = curperm;
-            uint baseperm = (uint) random.Next();            
+            uint baseperm = (uint) random.Next();
            i.BasePermissions = baseperm;
            uint eoperm = (uint) random.Next();
            i.EveryOnePermissions = eoperm;
            int assettype = random.Next();
            i.AssetType = assettype;
-            UUID groupid = UUID.Random();            
+            UUID groupid = UUID.Random();
            i.GroupID = groupid;
            bool groupown = true;
            i.GroupOwned = groupown;
@@ -1010,7 +1010,7 @@ namespace OpenSim.Data.Tests
        
        private SceneObjectPart NewSOP(string name, UUID uuid)
        {
-            SceneObjectPart sop = new SceneObjectPart();           
+            SceneObjectPart sop = new SceneObjectPart();
            sop.Name = name;
            sop.Description = name;
            sop.Text = RandomName();
@@ -1042,12 +1042,12 @@ namespace OpenSim.Data.Tests
            int size = random.Next(5,12); 
            char ch ;
            for (int i=0; i<size; i++)
-            {       
+            {
                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                name.Append(ch);
            }
            return name.ToString();
-        }      
+        }
 //        private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
 //        {
 //            InventoryFolderBase f = new InventoryFolderBase();
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index f9feb9b..1f472a5 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Data.Tests
            u1.FirstName = "Ugly";
            
            db.UpdateUserProfile(u1);
-            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");                   
+            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");
        }
        [Test]
@@ -174,7 +174,7 @@ namespace OpenSim.Data.Tests
            db.AddNewUserProfile(u4);
            Assert.That(db.GetUserByUUID(zero),Is.Null);
            Assert.That(db.GetUserByUUID(user4),Is.Null);
-        }        
+        }
        
        [Test]
        public void T015_UserPersistency()
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
            
            //HomeRegionX and HomeRegionY must only use 24 bits
            homeregx = ((homeregx << 8) >> 8);
-            homeregy = ((homeregy << 8) >> 8);            
+            homeregy = ((homeregy << 8) >> 8);
            u.ID = id;
            u.WebLoginKey = webloginkey;
@@ -299,7 +299,7 @@ namespace OpenSim.Data.Tests
            uint homeregx = (uint) random.Next();
            uint homeregy = (uint) random.Next();
            Vector3 homeloc = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            Vector3 homelookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));            
+            Vector3 homelookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
            int created = random.Next();
            int lastlogin = random.Next();
            string userinvuri = RandomName();
@@ -359,7 +359,7 @@ namespace OpenSim.Data.Tests
            Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");            
+            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
@@ -426,7 +426,7 @@ namespace OpenSim.Data.Tests
            UserAgentData a2 = db.GetAgentByName(fname2,lname2);
            UserAgentData a3 = db.GetAgentByName(name3);
            Assert.That(user2,Is.EqualTo(a2.ProfileID), "Assert.That(user2,Is.EqualTo(a2.ProfileID))");
-            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");                    
+            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");
        }
        
        [Test]
@@ -501,11 +501,11 @@ namespace OpenSim.Data.Tests
            db.AddNewUserFriend(user1,user3, 2);
            db.AddNewUserFriend(user1,user2, 4); 
            List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");                   
+            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
            perms.Add(user2,1);
            perms.Add(user3,2);
            for (int i = 0; i < fl1.Count; i++)
-            {   
+            {
                Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner), "Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner))");
                friends.Add(fl1[i].Friend,1);
                temp = perms[fl1[i].Friend];
@@ -544,7 +544,7 @@ namespace OpenSim.Data.Tests
            db.UpdateUserFriendPerms(user1, user3, 4);
            
            fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");                  
+            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");
        }
        
        [Test]
@@ -560,7 +560,7 @@ namespace OpenSim.Data.Tests
        [Test]
        public void T041_UserAppearancePersistency()
        {
-            AvatarAppearance appear = new AvatarAppearance();            
+            AvatarAppearance appear = new AvatarAppearance();
            UUID owner = UUID.Random();
            int serial = random.Next();
            byte[] visualp = new byte[218];
@@ -698,7 +698,7 @@ namespace OpenSim.Data.Tests
            int size = random.Next(5,12); 
            char ch ;
            for (int i=0; i<size; i++)
-            {       
+            {
                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                name.Append(ch);
            }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 84926f2..3d370da 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data
        public abstract UserAgentData GetAgentByUUID(UUID user);
        public abstract UserAgentData GetAgentByName(string name);
        public abstract UserAgentData GetAgentByName(string fname, string lname);
-        public UserProfileData GetUserByUri(Uri uri) { return null; }        
+        public UserProfileData GetUserByUri(Uri uri) { return null; }
        public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
        public abstract void AddNewUserProfile(UserProfileData user);
        
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 5071594..4a5253c 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
                
                // Body
                defaultWearables[0].ItemID  = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
-                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");                
+                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
                // Skin
                defaultWearables[1].ItemID  = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index 46dbd3d..0334e4b 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 namespace OpenSim.Framework.Capabilities
-{    
+{
    /// <summary>
    /// Capabilities utility methods
    /// </summary>
diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
index 81b1d9e..3df86d0 100644
--- a/OpenSim/Framework/Client/IClientIM.cs
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Client
    // Porting Guide from old IM
    // SendIM(...)
    //      Loses FromAgentSession - this should be added by implementers manually.
-    //      
+    //
    public interface IClientIM
    {
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index db532e0..094a3ff 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Framework
        }
        public void ViewerEffectHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args)
-        {            
+        {
            // TODO: don't create new blocks if recycling an old packet
-            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();                        
+            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();
            for (int i = 0; i < args.Count; i++)
            {
                ViewerEffectPacket.EffectBlock effect = new ViewerEffectPacket.EffectBlock();
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index db91801..92af331 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// How many operations between time checks.
-        /// </summary>        
+        /// </summary>
        private const int DefaultOperationsBetweenTimeChecks = 40;
        /// <summary>
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
        private int m_version;
        /// <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>
        public CnmMemoryCache()
            : this(DefaultMaxSize)
@@ -277,7 +277,7 @@ namespace OpenSim.Framework
        /// </param>
        protected virtual void AddToNewGeneration(int bucketIndex, TKey key, TValue value, long size)
        {
-            // Add to newest generation    
+            // Add to newest generation
            if (!m_newGeneration.Set(bucketIndex, key, value, size))
            {
                // Failed to add new generation
@@ -311,7 +311,7 @@ namespace OpenSim.Framework
        /// Bucket index is remainder when element key's hash value is divided by bucket count.
        /// </para>
        /// <para>
-        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.        
+        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.
        /// </para>
        /// </remarks>
        protected virtual int GetBucketIndex(TKey key)
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
        /// </summary>
        private void RecycleGenerations()
        {
-            // Rotate old generation to new generation, new generation to old generation            
+            // Rotate old generation to new generation, new generation to old generation
            IGeneration temp = m_newGeneration;
            m_newGeneration = m_oldGeneration;
            m_newGeneration.Clear();
@@ -522,7 +522,7 @@ namespace OpenSim.Framework
            /// <summary>
            /// Index of first element's in element chain.
            /// </summary>
-            /// <value>                        
+            /// <value>
            /// -1 if there is no element in bucket; otherwise first element's index in the element chain.
            /// </value>
            /// <remarks>
@@ -692,7 +692,7 @@ namespace OpenSim.Framework
                /// </summary>
                /// <value>
                /// 0 if element is free; otherwise larger than 0.
-                /// </value>              
+                /// </value>
                public long Size;
                /// <summary>
@@ -771,7 +771,7 @@ namespace OpenSim.Framework
                /// </returns>
                /// <exception cref="InvalidOperationException">
                /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-                /// </exception>              
+                /// </exception>
                public KeyValuePair<TKey, TValue> Current
                {
                    get
@@ -1405,10 +1405,10 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsSizeLimited
@@ -1438,7 +1438,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// 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; 
@@ -1449,7 +1449,7 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -1503,7 +1503,7 @@ namespace OpenSim.Framework
        /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        public long MaxElementSize
        {
            get { return m_maxElementSize; }
@@ -1517,7 +1517,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -1562,10 +1562,10 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        public long Size
@@ -1576,9 +1576,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -1630,7 +1630,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -1810,7 +1810,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index c09900e..2bafbe9 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
            /// </returns>
            /// <exception cref="InvalidOperationException">
            /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-            /// </exception>              
+            /// </exception>
            public KeyValuePair<TKey, TValue> Current
            {
                get { return m_enumerator.Current; }
@@ -327,10 +327,10 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsSizeLimited
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// 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; 
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -440,7 +440,7 @@ namespace OpenSim.Framework
        /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        public long MaxElementSize
        {
            get
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -507,10 +507,10 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        public long Size
@@ -527,9 +527,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -584,7 +584,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -704,7 +704,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 238810a..aa71536 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache
    /// Stores user profile and inventory data received from backend services for a particular user.
    /// </summary>
    public class CachedUserInfo
-    {        
+    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        //// <value>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Cache
                            resolvedFolders.Add(folder);
                            resolvedFolderDictionary[folder.ID] = folder;
                            parentFolder.AddChildFolder(folder);
-                        }                            
+                        }
                    }
                } // foreach (folder in pendingCategorizationFolders[parentFolder.ID])
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Communications.Cache
        /// <summary>
        /// Fetch inventory for this user.
        /// </summary>
-        /// This has to be executed as a separate step once user information is retreived.  
+        /// This has to be executed as a separate step once user information is retreived.
        /// This will occur synchronously if the inventory service is in the same process as this class, and
        /// asynchronously otherwise.
        public void FetchInventory()
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Cache
        ///
        /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
        /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
-        /// and needs to be changed.        
+        /// and needs to be changed.
        ///
        /// <param name="folderID"></param>
        /// <param name="type"></param>
@@ -500,7 +500,7 @@ namespace OpenSim.Framework.Communications.Cache
                    InventoryFolderImpl oldParentFolder = RootFolder.FindFolder(folder.ParentID);
                    if (oldParentFolder != null)
-                    {                        
+                    {
                        oldParentFolder.RemoveChildFolder(folderID);
                        parentFolder.AddChildFolder(folder);
                    }
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 7f1c7e9..9e12d948 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
        /// User profiles indexed by name
        /// </summary>
        private readonly Dictionary<string, CachedUserInfo> m_userProfilesByName 
-            = new Dictionary<string, CachedUserInfo>();        
+            = new Dictionary<string, CachedUserInfo>();
        
        /// <summary>
        /// The root library folder.
@@ -123,35 +123,35 @@ namespace OpenSim.Framework.Communications.Cache
        /// <summary>
        /// Get details of the given user.
        /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
        /// <param name="userID"></param>
-        /// <returns>null if no user details are found</returns>        
+        /// <returns>null if no user details are found</returns>
        public CachedUserInfo GetUserDetails(string fname, string lname)
        {
            lock (m_userProfilesByName)
-            {    
+            {
                CachedUserInfo userInfo;
                
-                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))                    
+                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))
                {
                    return userInfo;
-                }                
+                }
                else
-                {                
+                {
                    UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
                
                    if (userProfile != null)
-                        return AddToCaches(userProfile);             
+                        return AddToCaches(userProfile);
                    else
                        return null;
-                }               
+                }
            }
        }
        
        /// <summary>
        /// Get details of the given user.
        /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
        /// <param name="userID"></param>
        /// <returns>null if no user details are found</returns>
        public CachedUserInfo GetUserDetails(UUID userID)
@@ -185,20 +185,20 @@ namespace OpenSim.Framework.Communications.Cache
        // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
        // returning a read only class from the cache).
 //        public bool StoreProfile(UserProfileData userProfile)
-//        {            
+//        {
 //            lock (m_userProfilesById)
-//            {            
+//            {
 //                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-//                
+//
 //                if (userInfo != null)
 //                {
-//                    userInfo.m_userProfile = userProfile;                   
+//                    userInfo.m_userProfile = userProfile;
 //                    m_commsManager.UserService.UpdateUserProfile(userProfile);
-//                    
+//
 //                    return true;
 //                }
 //            }
-//            
+//
 //            return false;
 //        }
        
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Communications.Cache
                }
            }
            
-            return createdUserInfo;            
+            return createdUserInfo;
        }
        
        /// <summary>
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications.Cache
            {
                if (m_userProfilesById.ContainsKey(userId))
                {
-                    CachedUserInfo userInfo = m_userProfilesById[userId];                    
+                    CachedUserInfo userInfo = m_userProfilesById[userId];
                    m_userProfilesById.Remove(userId);
                    
                    lock (m_userProfilesByName)
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.Communications.Cache
                    
                    return true;
                }
-            }        
+            }
            
            return false;
        }
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 9f377a6..2410f31 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -90,8 +90,8 @@ namespace OpenSim.Framework.Communications
        public IUserAdminService UserAdminService
        {
            get { return m_userAdminService; }
-        }        
+        }
-        protected IUserAdminService m_userAdminService;        
+        protected IUserAdminService m_userAdminService;
        /// <summary>
        /// Constructor
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 4afc58f..760aa62 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
        /// Update avatar appearance information
        /// </summary>
        /// <param name="user"></param>
-        /// <param name="appearance"></param>        
+        /// <param name="appearance"></param>
        void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
    }
 }
diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs
index 15b989d..423b49b 100644
--- a/OpenSim/Framework/Communications/IUserAdminService.cs
+++ b/OpenSim/Framework/Communications/IUserAdminService.cs
@@ -66,6 +66,6 @@ namespace OpenSim.Framework.Communications
        /// <param name="lastName"></param>
        /// <param name="newPassword"></param>
        /// <returns>true if the update was successful, false otherwise</returns>
-        bool ResetUserPassword(string firstName, string lastName, string newPassword);        
+        bool ResetUserPassword(string firstName, string lastName, string newPassword);
    }
 }
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 15c5a96..dfa059d 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Communications
        /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
        /// <param name="friend">The agent that is getting or loosing permissions</param>
        /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);   
+        void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
        /// <summary>
        /// Logs off a user on the user server
@@ -128,9 +128,9 @@ namespace OpenSim.Framework.Communications
        /// 
        /// <param name="friendlistowner">The agent for whom we're retreiving the friends Data.</param>
        /// <returns>
-        /// A List of FriendListItems that contains info about the user's friends.  
+        /// A List of FriendListItems that contains info about the user's friends.
        /// Always returns a list even if the user has no friends
-        /// </returns>        
+        /// </returns>
        List<FriendListItem> GetUserFriendList(UUID friendlistowner);
        // This probably shouldn't be here, it belongs to IAuthentication
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Communications
        /// <param name="userID"></param>
        /// <param name="password"></param>
        /// <returns></returns>
-        bool AuthenticateUserByPassword(UUID userID, string password);        
+        bool AuthenticateUserByPassword(UUID userID, string password);
        // Temporary Hack until we move everything to the new service model
        void SetInventoryService(IInventoryService invService);
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
index 98d0e0f..e96c5e8 100644
--- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
+++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Osp
            
        public string Name { get { return "OspInventoryWrapperPlugin"; } }
        public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
        public void Initialise(string connect) {}
        public void Dispose() {}
@@ -80,9 +80,9 @@ namespace OpenSim.Framework.Communications.Osp
        }
        protected InventoryItemBase PostProcessItem(InventoryItemBase item)
-        {            
+        {
            item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
-            return item;            
+            return item;
        }
        
        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index e98317a..32f0efc 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -33,13 +33,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Framework.Communications.Osp
-{    
+{
    /// <summary>
    /// 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:";
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Osp
        {
            return 
                OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
-        }        
+        }
        
        /// <summary>
        /// Resolve an osp string into the most suitable internal OpenSim identifier.
@@ -89,13 +89,13 @@ namespace OpenSim.Framework.Communications.Osp
        /// is returned.
        /// </returns>
        public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
-        {                       
+        {
            if (!ospa.StartsWith(OSPA_PREFIX))
                return UUID.Zero;
            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
            
-            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);            
+            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
            string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
            
            foreach (string tuple in ospaTuples)
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications.Osp
            tempUserProfile.ID = HashName(tempUserProfile.Name);
            
            m_log.DebugFormat(
-                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);            
+                "[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/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index a6cd918..922cd49 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1072,7 +1072,7 @@ namespace OpenSim.Framework.Communications.Services
        /// <param name="user"></param>
        /// <param name="response"></param>
        /// <param name="remoteClient"></param>
-        /// <returns>true if the region was successfully contacted, false otherwise</returns>        
+        /// <returns>true if the region was successfully contacted, false otherwise</returns>
        protected abstract bool PrepareLoginToRegion(
            RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
index 43f1440..2413055 100644
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
 using OpenSim.Data;
 namespace OpenSim.Framework.Communications
-{                
+{
    /// <summary>
-    /// Plugin for managing temporary user profiles.  
+    /// Plugin for managing temporary user profiles.
    /// </summary>
    public class TemporaryUserProfilePlugin : IUserDataPlugin
    {
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications
        
        public string Name { get { return "TemporaryUserProfilePlugin"; } }
        public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
        public void Initialise(string connect) {}
        public void Dispose() {}
        
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index a757282..caaebd7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -152,8 +152,8 @@ namespace OpenSim.Framework.Communications.Tests
            public virtual bool AuthenticateUserByPassword(UUID userID, string password)
            {
-                throw new NotImplementedException();        
+                throw new NotImplementedException();
-            }             
+            }
        }
    }
 }
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index e5d8895..830c877 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests
            timedOut = true;
            lock (this)
-            {                   
+            {
                UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
             }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo userInfo;
            
            lock (this)
-            {                   
+            {
                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo userInfo;
            lock (this)
-            {                   
+            {
                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo userInfo;
            lock (this)
-            {                   
+            {
                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo userInfo;
            lock (this)
-            {                   
+            {
                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo userInfo;
            lock (this)
-            {                   
+            {
                userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 0a9d2ae..e891d9c 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications.Tests
        {
            TestHelper.InMethod();
-            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");            
+            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");
            //log4net.Config.XmlConfigurator.Configure();
            
            string error_already_logged = "You appear to be already logged in. " +
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 86238b1..bf4f331 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -94,9 +94,9 @@ namespace OpenSim.Framework.Communications
        public void AddPlugin(string provider, string connect)
        {
            m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect));
-        }       
+        }
-        #region UserProfile        
+        #region UserProfile
        
        public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
        {
@@ -924,8 +924,8 @@ namespace OpenSim.Framework.Communications
            if (md5PasswordHash == userProfile.PasswordHash)
                return true;
            else
-                return false;         
+                return false;
-        }          
+        }
        #endregion
    }
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 06136ff..9671bc2 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console
        /// <param name="helpParts">Parsed parts of the help string.  If empty then general help is returned.</param>
        /// <returns></returns>
        public List<string> GetHelp(string[] cmd)
-        {                  
+        {
            List<string> help = new List<string>();
            List<string> helpParts = new List<string>(cmd);
            
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Console
        /// <param name="helpParts"></param>
        /// <returns></returns>
        private List<string> CollectHelp(List<string> helpParts)
-        {            
+        {
            string originalHelpRequest = string.Join(" ", helpParts.ToArray());
            List<string> help = new List<string>();
            
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
                if (dict[helpPart] is Dictionary<string, Object>)
                    dict = (Dictionary<string, object>)dict[helpPart]; 
                
-                helpParts.RemoveAt(0);                                                               
+                helpParts.RemoveAt(0);
            }
        
            // There was a command for the given help string
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Console
            }
            
            return help;
-        }            
+        }
        private List<string> CollectHelp(Dictionary<string, object> dict)
        {
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Console
        /// <param name="longhelp"></param>
        /// <param name="fn"></param>
        public void AddCommand(string module, bool shared, string command,
-                string help, string longhelp, CommandDelegate fn)   
+                string help, string longhelp, CommandDelegate fn)
        {
            AddCommand(module, shared, command, help, longhelp,
                    String.Empty, fn);
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 9aa5d03..3a43a14 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -90,13 +90,13 @@ namespace OpenSim.Framework
            m_configMember.addConfigurationOption("allow_forceful_banlines",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Allow Forceful Banlines", "TRUE", true);   
+                                                "Allow Forceful Banlines", "TRUE", true);
            
            m_configMember.addConfigurationOption("allow_region_registration", 
                                                ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
                                                "Allow regions to register immediately upon grid server startup? true/false", 
                                                "True", 
-                                                false);            
+                                                false);
            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Remote console access user name [Default: disabled]", "", false);
@@ -147,7 +147,7 @@ namespace OpenSim.Framework
                    break;
                case "allow_region_registration":
                    AllowRegionRegistration = (bool)configuration_result;
-                    break;                
+                    break;
                case "console_user":
                    ConsoleUser = (string)configuration_result;
                    break;
diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index 751fdd5..654180d 100644
--- a/OpenSim/Framework/IAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -34,23 +34,23 @@ namespace OpenSim.Framework
    /// <summary>
    /// Interface to the local asset cache.  This is the mechanism through which assets can be added and requested.
-    /// </summary>    
+    /// </summary>
    public interface IAssetCache :  IPlugin
    {
        /// <value>
        /// The 'server' from which assets can be requested and to which assets are persisted.
-        /// </value>        
+        /// </value>
       
-        void Initialise(ConfigSettings cs);        
+        void Initialise(ConfigSettings cs);
        /// <summary>
        /// Report statistical data to the log.
-        /// </summary>        
+        /// </summary>
        void ShowState();
        
        /// <summary>
        /// Clear the asset cache.
-        /// </summary>        
+        /// </summary>
        void Clear();
        
        /// <summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="assetId"></param>
        /// <param name="asset"></param>
-        /// <returns>true if the asset was in the cache, false if it was not</returns>        
+        /// <returns>true if the asset was in the cache, false if it was not</returns>
        bool TryGetCachedAsset(UUID assetID, out AssetBase asset);
        
        /// <summary>
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
        /// <param name="isTexture"></param>
        /// A callback invoked when the asset has either been found or not found.
        /// If the asset was found this is called with the asset UUID and the asset data
-        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>        
+        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
        void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture);
        
        /// <summary>
@@ -84,13 +84,13 @@ namespace OpenSim.Framework
        ///
        /// <param name="assetID"></param>
        /// <param name="isTexture"></param>
-        /// <returns>null if the asset could not be retrieved</returns>        
+        /// <returns>null if the asset could not be retrieved</returns>
        AssetBase GetAsset(UUID assetID, bool isTexture);
        
        /// <summary>
        /// Add an asset to both the persistent store and the cache.
        /// </summary>
-        /// <param name="asset"></param>        
+        /// <param name="asset"></param>
        void AddAsset(AssetBase asset);
        
        /// <summary>
@@ -100,14 +100,14 @@ namespace OpenSim.Framework
        /// of the asset cache.  This is needed because the osdynamic
        /// texture code grows the asset cache without bounds.  The
        /// real solution here is a much better cache archicture, but
-        /// this is a stop gap measure until we have such a thing.        
+        /// this is a stop gap measure until we have such a thing.
        void ExpireAsset(UUID assetID);
        
        /// <summary>
        /// Handle an asset request from the client.  The result will be sent back asynchronously.
        /// </summary>
        /// <param name="userInfo"></param>
-        /// <param name="transferRequest"></param>        
+        /// <param name="transferRequest"></param>
        void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest);
    }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 444adf9..4bc35e6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -810,7 +810,7 @@ namespace OpenSim.Framework
        /// </summary>
        void Start();
        
-        void Stop();        
+        void Stop();
        //     void ActivateGesture(UUID assetId, UUID gestureId);
@@ -824,7 +824,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="agentID">The id of the agent associated with the appearance</param>
        /// <param name="visualParams"></param>
-        /// <param name="textureEntry"></param>        
+        /// <param name="textureEntry"></param>
        void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
        void SendStartPingCheck(byte seq);
@@ -833,7 +833,7 @@ namespace OpenSim.Framework
        /// Tell the client that an object has been deleted
        /// </summary>
        /// <param name="regionHandle"></param>
-        /// <param name="localID"></param>        
+        /// <param name="localID"></param>
        void SendKillObject(ulong regionHandle, uint localID);
        void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index a1ac322..27b9c56 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -180,16 +180,16 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
        /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        /// <seealso cref="IsCountLimited"/>
        /// <seealso cref="IsTimeLimited"/>
        bool IsSizeLimited { get; }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// 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; 
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="ExpirationTime"/>
        /// <seealso cref="PurgeExpired"/>
        /// <seealso cref="IsCountLimited"/>
@@ -237,7 +237,7 @@ namespace OpenSim.Framework
        /// <seealso cref="Set"/>
        /// <seealso cref="IsSizeLimited"/>
        /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        long MaxElementSize { get; }
        /// <summary>
@@ -246,7 +246,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -278,10 +278,10 @@ namespace OpenSim.Framework
        /// 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>        
+        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
        /// <seealso cref="IsSizeLimited"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        /// <seealso cref="IsCountLimited"/>
        /// <seealso cref="ExpirationTime"/>
        long Size { get; }
@@ -289,9 +289,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -322,7 +322,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="IsTimeLimited"/>
@@ -418,7 +418,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index d61e08c..489653f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
        GodTakeCopy = 5,
        Delete = 6,
        Return = 9
-    };     
+    };
    public interface IScene
    {
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index db19527..4fc3e01 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    public interface ISceneObject
    {
-        UUID UUID { get; }            
+        UUID UUID { get; }
        ISceneObject CloneForNewScene();
        string ToXml2();
        string ExtraToXmlString();
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 3eef6f6..a12183c 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework
            ID = id;
            Name = name;
            Owner = owner;
-            ParentID = parent;           
+            ParentID = parent;
        }
        public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 00462f9..29c7682 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// Find a folder given a PATH_DELIMITER delimited path starting from this folder
-        /// </summary>        
+        /// </summary>
        ///
        /// This method does not handle paths that contain multiple delimitors
        ///
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
        /// FIXME: Delimitors which occur in names themselves are not currently escapable.
        /// 
        /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
        /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
        /// </param>
        /// <returns>null if the folder is not found</returns>
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 7150c82..aeb01e2 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,10 +34,10 @@ 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>        
+        /// </value>
        public int InvType 
        { 
            get
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The folder this item is contained in
-        /// </value>        
+        /// </value>
        public UUID Folder 
        { 
            get
@@ -71,7 +71,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The creator of this item
-        /// </value>        
+        /// </value>
        public string CreatorId 
        { 
            get
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
            {
                m_creatorIdAsUuid = value;
            }
-        }     
+        }
        protected UUID m_creatorIdAsUuid = UUID.Zero;
        /// <value>
@@ -130,13 +130,13 @@ namespace OpenSim.Framework
            set
            {
                m_description = value;
-            }            
+            }
        }
        protected string m_description = String.Empty;
        /// <value>
        ///
-        /// </value>          
+        /// </value>
        public uint NextPermissions 
        { 
            get
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
        /// <value>
        /// A mask containing permissions for the current owner (cannot be enforced)
-        /// </value>        
+        /// </value>
        public uint CurrentPermissions 
        { 
            get
@@ -170,7 +170,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint BasePermissions 
        { 
            get
@@ -187,7 +187,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint EveryOnePermissions 
        { 
            get
@@ -204,7 +204,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint GroupPermissions 
        { 
            get
@@ -221,7 +221,7 @@ namespace OpenSim.Framework
        /// <value>
        /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
-        /// </value>        
+        /// </value>
        public int AssetType 
        { 
            get
@@ -238,7 +238,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The UUID of the associated asset on the asset server
-        /// </value>        
+        /// </value>
        public UUID AssetID 
        { 
            get
@@ -255,7 +255,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public UUID GroupID 
        { 
            get
@@ -272,13 +272,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public bool GroupOwned 
        { 
            get
            {
                return m_groupOwned;
-            }               
+            }
                
            set
            {
@@ -289,7 +289,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public int SalePrice 
        { 
            get
@@ -306,7 +306,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public byte SaleType 
        { 
            get
@@ -323,7 +323,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint Flags 
        { 
            get
@@ -340,7 +340,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public int CreationDate 
        { 
            get
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index f49cce1..31c3fd1 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -31,12 +31,12 @@ namespace OpenSim.Framework
 {
    /// <summary>
    /// Common base class for inventory nodes of different types (files, folders, etc.)
-    /// </summary>        
+    /// </summary>
    public class InventoryNodeBase
-    {                
+    {
        /// <summary>
        /// The name of the node (64 characters or less)
-        /// </summary>        
+        /// </summary>
        public virtual string Name
        {
            get { return m_name; }
@@ -51,17 +51,17 @@ namespace OpenSim.Framework
        {
            get { return m_id; }
            set { m_id = value; }
-        }       
+        }
        private UUID m_id;
        
        /// <summary>
        /// The agent who's inventory this is contained by
-        /// </summary>        
+        /// </summary>
        public virtual UUID Owner
        {
            get { return m_owner; }
            set { m_owner = value; }
        }
-        private UUID m_owner;        
+        private UUID m_owner;
    }
 }
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 7e66742..f720222 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    public class NetworkServersInfo
    {
-        public string AssetSendKey = String.Empty;        
+        public string AssetSendKey = String.Empty;
        public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
        public string GridRecvKey = String.Empty;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index cee1d4b..d3a5357 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Framework
        public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)
        {
            RegionInfo regionInfo;
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);                    
+            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);
            regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalHostName);
            regionInfo.RemotingPort = remotingPort;
            regionInfo.RemotingAddress = externalHostName;
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index 6bfae41..4376249 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization.External
            xtw.WriteElementString("OwnerID", landData.OwnerID.ToString());
            xtw.WriteStartElement("ParcelAccessList");
-            foreach(ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
            {
                xtw.WriteStartElement("ParcelAccessEntry");
                xtw.WriteElementString("AgentID", pal.AgentID.ToString());
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 274f41f..b5901e1 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Serialization.External
                        settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());
                        break;
                }
-            }                    
+            }
           
            xtr.ReadEndElement();
            xtr.ReadStartElement("Terrain");
@@ -200,8 +200,8 @@ namespace OpenSim.Framework.Serialization.External
            
            xtw.WriteStartElement("RegionSettings");
            
-            xtw.WriteStartElement("General");            
+            xtw.WriteStartElement("General");
-            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());            
+            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
            xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
            xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString());
            xtw.WriteElementString("BlockFly", settings.BlockFly.ToString());
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index eb77e65..fb269b7 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External
    /// Serialize and deserialize region settings as an external format.
    /// </summary>
    public class UserProfileSerializer
-    {    
+    {
        public const int MAJOR_VERSION = 0;
        public const int MINOR_VERSION = 1;
        
@@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External
            sw.Close();
            
            return sw.ToString();
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 7a244ff..632b551 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Servers
                        m_consoleAppender.Threshold = Level.All;
                    
                    Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
-                }                                          
+                }
                
                m_console.Commands.AddCommand("base", false, "quit",
                        "quit",
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
        
        /// <summary>
        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
        public virtual void ShutdownSpecific() {}
        
        /// <summary>
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Servers
        /// </summary>
        public virtual void Startup()
        {
-            m_log.Info("[STARTUP]: Beginning startup processing");                        
+            m_log.Info("[STARTUP]: Beginning startup processing");
            EnhanceVersionInformation();
            
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Servers
        /// <summary>
        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
        public virtual void Shutdown()
        {
            ShutdownSpecific();
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Servers
        }
        public virtual void HandleShow(string module, string[] cmd)
-        {            
+        {
            List<string> args = new List<string>(cmd);
            args.RemoveAt(0);
@@ -375,7 +375,7 @@ namespace OpenSim.Framework.Servers
            string[] showParams = args.ToArray();
            switch (showParams[0])
-            {                       
+            {
                case "info":
                    Notice("Version: " + m_version);
                    Notice("Startup directory: " + m_startupDirectory);
diff --git a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
index fe69ad3..5afa110 100644
--- a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}", verb, requestUrl, e);
                }
                    
-            }, null);         
+            }, null);
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 01990fa..6c63c6c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public BaseHttpServer(uint port, bool ssl) : this (port)
        {
-            m_ssl = ssl;          
+            m_ssl = ssl;
        }
        public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) : this (port, ssl)
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            lock (m_rpcHandlers)
            {
                m_rpcHandlers[method] = handler;
-                m_rpcHandlersKeepAlive[method] = keepAlive; // default              
+                m_rpcHandlersKeepAlive[method] = keepAlive; // default
            }
            
            return true;
@@ -323,7 +323,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            OSHttpRequest request = objstate.oreq;
            OSHttpResponse resp = objstate.oresp;
-            HandleRequest(request,resp);           
+            HandleRequest(request,resp);
        }
        public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
@@ -712,7 +712,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    lock (m_rpcHandlers)
                    {
                        methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
-                    }                            
+                    }
                    
                    if (methodWasFound)
                    {
@@ -931,7 +931,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (IOException e)
                {
-                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);                    
+                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);
                }
                catch (SocketException e)
                {
@@ -1368,7 +1368,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                bestMatch = pattern;
                        }
                    }
-                }           
+                }
                if (String.IsNullOrEmpty(bestMatch))
                {
@@ -1480,7 +1480,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message);
                }
-            }            
+            }
        }
        public void SendHTML404(OSHttpResponse response, string host)
@@ -1589,7 +1589,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    // if you want more detailed trace information from the HttpServer
                    //m_httpListener2.UseTraceLogs = true;
                    
-                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;                    
+                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
                }
                else
                {
@@ -1624,7 +1624,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
-        {            
+        {
            switch (err)
            {
                case SocketError.NotSocket:
@@ -1635,7 +1635,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        public void httpServerException(object source, Exception exception)
-        {            
+        {
            m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
           /*
            if (HTTPDRunning)// && NotSocketErrors > 5)
@@ -1662,7 +1662,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            } 
            catch (NullReferenceException)
            {
-                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");    
+                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");
            }
            
        }
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 1bdf4fa..d13408d 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -128,6 +128,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        
        string GetHTTP404(string host);
-        string GetHTTP500();       
+        string GetHTTP500();
    }
 }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index d06adb5..9f98310 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -56,7 +56,7 @@ namespace OpenSim
        public const int VERSIONINFO_VERSION_LENGTH = 27;
        
        /// <value>
-        /// This is the external interface version.  It is separate from the OpenSimulator project version.  
+        /// This is the external interface version.  It is separate from the OpenSimulator project version.
        /// 
        /// This version number should be 
        /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible
@@ -67,7 +67,7 @@ namespace OpenSim
        /// 
        /// Having this version number allows the grid service to reject connections from regions running a version
        /// of the code that is too old. 
-        ///   
+        ///
        /// </value>
        public readonly static int MajorInterfaceVersion = 6;
    }
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 084964d..3d8f32f 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Framework
    /// 
    /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
    /// storage.
-    /// </summary>        
+    /// </summary>
    public class SimStats
-    {                 
+    {
        public uint RegionX
        {
            get { return m_regionX; }
@@ -47,25 +47,25 @@ namespace OpenSim.Framework
        public uint RegionY
        {
            get { return m_regionY; }
-        }        
+        }
        private uint m_regionY;
        
        public SimStatsPacket.RegionBlock RegionBlock
        {
            get { return m_regionBlock; }
-        }                
+        }
        private SimStatsPacket.RegionBlock m_regionBlock;
        
        public SimStatsPacket.StatBlock[] StatsBlock
        {
            get { return m_statsBlock; }
-        }        
+        }
        private SimStatsPacket.StatBlock[] m_statsBlock;
        
        public uint RegionFlags
        {
            get { return m_regionFlags; }
-        }        
+        }
        private uint m_regionFlags;
            
        public uint ObjectCapacity
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
        public UUID RegionUUID
        {
-            get { return regionUUID;}   
+            get { return regionUUID; }
        }
        private UUID regionUUID;
                
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 946d7f5..25ae6b0 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
    /// A dictionary for task inventory.
    /// </summary>
    /// This class is not thread safe.  Callers must synchronize on Dictionary methods or Clone() this object before
-    /// iterating over it.    
+    /// iterating over it.
    public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
                                           ICloneable, IXmlSerializable
    {
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index fa6f0b8..d3a239d 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
        }
        private static void ThreadTrackerThreadLoop()
-        {            
+        {
            try
            {
                while (true)
@@ -70,8 +70,8 @@ namespace OpenSim.Framework
            {
                m_log.ErrorFormat(
                    "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception.  Please report this error.  Exception is {0}", 
-                    e);                
+                    e);
-            }                
+            }
        }
        public static void Add(Thread thread)
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 16f265c..0fa82cf 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
            m_configMember.addConfigurationOption("library_location",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                "Path to library control file",
-                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);            
+                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
            
            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index f51a199..413f152 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Framework
        public string Name
        {
            get { return String.Format("{0} {1}", m_firstname, m_surname); }
-        }        
+        }
        public string Email
        {
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a28a617..17fc58c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
    /// </summary>
    public class Util
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);       
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static uint nextXferID = 5000;
        private static Random randomClass = new Random();
@@ -136,7 +136,7 @@ namespace OpenSim.Framework
            float dx = a.X - b.X;
            float dy = a.Y - b.Y;
            float dz = a.Z - b.Z;
-            return (dx*dx + dy*dy + dz*dz) < (amount*amount);           
+            return (dx*dx + dy*dy + dz*dz) < (amount*amount);
        }
        /// <summary>
@@ -975,7 +975,7 @@ namespace OpenSim.Framework
            else
            {
                os = ReadEtcIssue();
-            }         
+            }
                      
            if (os.Length > 45)
            {
diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
index 8006119..76c4899 100644
--- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
@@ -70,6 +70,6 @@ namespace OpenSim.Grid.MessagingServer.Modules
        {
            //throw new Exception("The method or operation is not implemented.");
            return null;
-        }     
+        }
    }
 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
index 9d31d81..77caf47 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.UserServer.Modules
    /// <summary>
    /// Hypergrid login service used in grid mode.
-    /// </summary>     
+    /// </summary>
    public class UserLoginAuthService : HGLoginAuthService
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index c95e054..7d0e0de 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer.Modules
    /// <summary>
    /// Login service used in grid mode.
-    /// </summary>     
+    /// </summary>
    public class UserLoginService : LoginService
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index efbf45e..36c6297 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Grid.UserServer.Modules
            UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid);
            if (null == userProfile)
-                return Util.CreateUnknownUserErrorResponse();            
+                return Util.CreateUnknownUserErrorResponse();
            string authed;
            
@@ -249,12 +249,12 @@ namespace OpenSim.Grid.UserServer.Modules
 //                "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}",
 //                remoteClient, userUuid, authed);
-            XmlRpcResponse response = new XmlRpcResponse();            
+            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable responseData = new Hashtable();            
+            Hashtable responseData = new Hashtable();
            responseData["auth_user"] = authed;
            response.Value = responseData;
            
-            return response;            
+            return response;
        }
        public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient)
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index a92226d..286076d7 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer
        /// <param name="inventoryService"></param>
        protected virtual void StartupUserServerModules()
        {
-            m_log.Info("[STARTUP]: Establishing data connection");                        
+            m_log.Info("[STARTUP]: Establishing data connection");
            
            //we only need core components so we can request them from here
            IInterServiceInventoryServices inventoryService;
            TryGet<IInterServiceInventoryServices>(out inventoryService);
            
-            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);            
+            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);
            //setup database access service, for now this has to be created before the other modules.
            m_userDataBaseService = new UserDataBaseService(commsManager);
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
index 7200836..8ef693b 100644
--- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
@@ -28,9 +28,9 @@
 using OpenSim.Framework.Communications;
 namespace OpenSim.Grid.UserServer
-{        
+{
    public class UserServerCommsManager : CommunicationsManager
-    {        
+    {
        public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService)
            : base(null, null)
        {
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 2fd26bf..241af53 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -91,7 +91,7 @@ namespace OpenSim
                m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
            }
-            // Check if the system is compatible with OpenSimulator.   
+            // Check if the system is compatible with OpenSimulator.
            // Ensures that the minimum system requirements are met
            m_log.Info("Performing compatibility checks... ");
            string supported = String.Empty;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index d7a4944..f070812 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1245,20 +1245,20 @@ namespace OpenSim
        protected void LoadOar(string module, string[] cmdparams)
        {
            try
-            {            
+            {
                if (cmdparams.Length > 2)
                {
-                    m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);             
+                    m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
                }
                else
                {
-                    m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);              
+                    m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
                }
            }
            catch (Exception e)
            {
                m_log.Error(e.Message);
-            }   
+            }
        }
        /// <summary>
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 821de35..468c5d7 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -98,7 +98,7 @@ namespace OpenSim
        /// <value>
        /// The config information passed into the OpenSimulator region server.
-        /// </value>        
+        /// </value>
        public OpenSimConfigSource ConfigSource
        {
            get { return m_config; }
@@ -383,14 +383,14 @@ namespace OpenSim
            scene.SetModuleInterfaces();
-            // Prims have to be loaded after module configuration since some modules may be invoked during the load            
+            // Prims have to be loaded after module configuration since some modules may be invoked during the load
            scene.LoadPrimsFromStorage(regionInfo.originRegionID);
            
            // moved these here as the terrain texture has to be created after the modules are initialized
            // and has to happen before the region is registered with the grid.
            scene.CreateTerrainTexture(false);
            
-            // TODO : Try setting resource for region xstats here on scene            
+            // TODO : Try setting resource for region xstats here on scene
            MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
            
            try
@@ -507,7 +507,7 @@ namespace OpenSim
        /// Remove a region from the simulator without deleting it permanently.
        /// </summary>
        /// <param name="scene"></param>
-        /// <returns></returns>   
+        /// <returns></returns>
        public void CloseRegion(Scene scene)
        {
            // only need to check this if we are not at the
@@ -526,7 +526,7 @@ namespace OpenSim
        /// Remove a region from the simulator without deleting it permanently.
        /// </summary>
        /// <param name="name"></param>
-        /// <returns></returns>   
+        /// <returns></returns>
        public void CloseRegion(string name)
        {
            Scene target;
@@ -539,7 +539,7 @@ namespace OpenSim
        /// </summary>
        /// <param name="regionInfo"></param>
        /// <param name="clientServer"> </param>
-        /// <returns></returns>        
+        /// <returns></returns>
        protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)
        {
            return SetupScene(regionInfo, 0, null, out clientServer);
@@ -750,7 +750,7 @@ namespace OpenSim
            }
            public string Path
-            {   
+            {
                // This is for the OpenSimulator instance and is the osSecret hashed
                get { return "/" + osXStatsURI + "/"; }
            }
@@ -791,7 +791,7 @@ namespace OpenSim
            }
            public string Path
-            {   
+            {
                // This is for the OpenSimulator instance and is the user provided URI 
                get { return "/" + osUXStatsURI + "/"; }
            }
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 5667d64..84ea0b3 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -87,9 +87,9 @@ namespace OpenSim.Region.ClientStack
        public IClientNetworkServer CreateServer(
            IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port,
            AgentCircuitManager authenticateClass)
-        {    
+        {
            return CreateServer(
-                _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass);                                               
+                _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass);
        }
        /// <summary>
@@ -104,11 +104,11 @@ namespace OpenSim.Region.ClientStack
        /// </param>
        /// <param name="assetCache"></param>
        /// <param name="authenticateClass"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
        public IClientNetworkServer CreateServer(
            IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource,
            AgentCircuitManager authenticateClass)
-        {            
+        {
            if (plugin != null)
            {
                IClientNetworkServer server =
diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
index a3c23cc..231b3aa 100644
--- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
+++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.ClientStack
    /// 
    /// At the moment this is very incomplete - other tweakable settings could be added.  This is also somewhat LL client
    /// oriented right now.
-    /// </summary>    
+    /// </summary>
    public class ClientStackUserSettings
    {
        /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
index 665c773..32a4ad4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/ILLPacketHandler.cs
@@ -31,7 +31,7 @@ using OpenMetaverse.Packets;
 using OpenSim.Framework;
 namespace OpenSim.Region.ClientStack.LindenUDP
-{        
+{
    public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
    public delegate void PacketDrop(Packet pack, Object id);
    public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, UUID agentID, ThrottleOutPacketType throttlePacketType);
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Take action depending on the type and contents of an received packet.
        /// </summary>
-        /// <param name="item"></param>        
+        /// <param name="item"></param>
        void ProcessInPacket(LLQueItem item);
        
        void ProcessOutPacket(LLQueItem item);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 6cffd70..638c765 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else
            {
-                m_asset = asset;              
+                m_asset = asset;
            }
            RunUpdate();
        }
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                try 
                { 
                    Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)cFirstPacketSize);
-                    client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_asset.Data.Length, firstImageData, 2);                
+                    client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_asset.Data.Length, firstImageData, 2);
                }
                catch (Exception)
                {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 912cbf1..88ace6a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2332,7 +2332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return itemBlock;
        }
        
-        public void SendBulkUpdateInventory(InventoryNodeBase node)        
+        public void SendBulkUpdateInventory(InventoryNodeBase node)
        {
            if (node is InventoryItemBase)
                SendBulkUpdateInventoryItem((InventoryItemBase)node);
@@ -2937,7 +2937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                else if (m_avatarTerseUpdates.Count == 1)
                {
                    lock (m_avatarTerseUpdateTimer)
-                        m_avatarTerseUpdateTimer.Start();                
+                        m_avatarTerseUpdateTimer.Start();
                }
            }
        }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 798c1e7..c427870 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            TextureThrottle = new LLPacketThrottle(1000, throttleMaxBPS / 2, 4000, userSettings.ClientThrottleMultipler);
-            // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.           
+            // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.
            ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;
@@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    {
                        LLQueItem qpack = ResendOutgoingPacketQueue.Dequeue();
-                        SendQueue.Enqueue(qpack);                        
+                        SendQueue.Enqueue(qpack);
                        TotalThrottle.AddBytes(qpack.Length);
                        ResendThrottle.AddBytes(qpack.Length);
                        
@@ -470,7 +470,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    {
                        LLQueItem qpack = TextureOutgoingPacketQueue.Dequeue();
-                        SendQueue.Enqueue(qpack);                       
+                        SendQueue.Enqueue(qpack);
                        TotalThrottle.AddBytes(qpack.Length);
                        TextureThrottle.AddBytes(qpack.Length);
                        qchanged = true;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 56219d1..70d94e7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Tweakable user settings
        /// </summary>
-        private ClientStackUserSettings m_userSettings;        
+        private ClientStackUserSettings m_userSettings;
        public LLPacketServer(ILLClientStackNetworkHandler networkHandler, ClientStackUserSettings userSettings)
        {
-            m_userSettings = userSettings;            
+            m_userSettings = userSettings;
            m_networkHandler = networkHandler;
            
            m_networkHandler.RegisterPacketServer(this);
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            sessionInfo = circuitManager.AuthenticateSession(sessionId, agentId, circuitCode); 
            if (!sessionInfo.Authorised)
-                return false;  
+                return false;
            
            return true;
        }
@@ -129,7 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="proxyEP"></param>
        /// <returns>
        /// true if a new circuit was created, false if a circuit with the given circuit code already existed
-        /// </returns>        
+        /// </returns>
        public virtual bool AddNewClient(
            EndPoint epSender, UseCircuitCodePacket useCircuit, 
            AuthenticateResponse sessionInfo, EndPoint proxyEP)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
index 01bff6d..52effc5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
@@ -26,7 +26,7 @@
 */
 namespace OpenSim.Region.ClientStack.LindenUDP
-{    
+{
    public class LLPacketThrottle
    {
        private readonly int m_maxAllowableThrottle;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public int Min
        {
            get { return m_minAllowableThrottle; }
-        }  
+        }
        
        public int Current
        {
@@ -105,13 +105,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public int Throttle
        {
-            get { return m_currentThrottle; }            
+            get { return m_currentThrottle; }
            set
            {
                if (value < m_minAllowableThrottle)
                {
                    m_currentThrottle = m_minAllowableThrottle;
-                }                
+                }
                else if (value > m_maxAllowableThrottle)
                {
                    m_currentThrottle = m_maxAllowableThrottle;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 9ee8df5..c779b08 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier");
                if (config.Contains("client_socket_rcvbuf_size"))
                    m_clientSocketReceiveBuffer = config.GetInt("client_socket_rcvbuf_size");
-            }   
+            }
            
            m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
            m_log.DebugFormat("[CLIENT]: client_socket_rcvbuf_size  = {0}", (m_clientSocketReceiveBuffer != 0 ? 
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    {
                        m_log.Debug("[CLIENT]: " + e);
                    }
-                }    
+                }
            
            
                if (proxyPortOffset != 0)
@@ -254,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (packet != null)
            {
                if (packet.Type == PacketType.UseCircuitCode)
-                    AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy);                                  
+                    AddNewClient((UseCircuitCodePacket)packet, epSender, epProxy);
                else
                    ProcessInPacket(packet, epSender);
            }
@@ -290,7 +290,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            catch (Exception e)
            {
                m_log.Error("[CLIENT]: Exception in processing packet - ignoring: ", e);
-            }           
+            }
        }
        
        /// <summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected virtual void BeginReceive()
        {
            m_socket.BeginReceiveFrom(
-                RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);            
+                RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);
        }
        /// <summary>
@@ -322,7 +322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    // ENDLESS LOOP ON PURPOSE!
                    // Reset connection and get next UDP packet off the buffer
                    // If the UDP packet is part of the same stream, this will happen several hundreds of times before
-                    // the next set of UDP data is for a valid client.         
+                    // the next set of UDP data is for a valid client.
                    try
                    {
@@ -347,7 +347,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    m_log.ErrorFormat("[CLIENT]: Exception thrown during BeginReceive(): {0}", ex);
                }
            }
-        }       
+        }
        /// <summary>
        /// Close a client circuit.  This is done in response to an exception on receive, and should not be called
@@ -363,12 +363,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    m_packetServer.CloseCircuit(circuit);
                    
-                    if (e != null)                    
+                    if (e != null)
                        m_log.ErrorFormat(
-                            "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e);                                    
+                            "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e);
                }
            }
-        }       
+        }
        
        /// <summary>
        /// Finish the process of asynchronously receiving the next bit of raw data
@@ -410,7 +410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                m_log.DebugFormat("[CLIENT]: ObjectDisposedException: Object {0} disposed.", e.ObjectName);
                // Uhh, what object, and why? this needs better handling.
-            }      
+            }
            
            return hasReceivedOkay;
        }
@@ -422,10 +422,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="epSender"></param>
        /// <param name="epProxy"></param>
        protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
-        {            
+        {
            //Slave regions don't accept new clients
            if (m_localScene.RegionStatus != RegionStatus.SlaveScene)
-            {                
+            {
                AuthenticateResponse sessionInfo;
                bool isNewCircuit = false;
                
@@ -441,8 +441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                lock (clientCircuits)
                {
                    if (!clientCircuits.ContainsKey(epSender))
-                    {                        
+                    {
-                        clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);                        
+                        clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
                        isNewCircuit = true;
                    }
                }
@@ -461,9 +461,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                    
                    //m_log.DebugFormat(
                    //    "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 
-                    //    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);                    
+                    //    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
-                }                
+                }
-            }            
+            }
            
            // Ack the UseCircuitCode packet
            PacketAckPacket ack_it = (PacketAckPacket)PacketPool.Instance.GetPacket(PacketType.PacketAck);
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
                
                return;
-            }               
+            }
            lock (clientCircuits)
            {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
index f2a8bd2..c45d11f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 namespace OpenSim.Region.ClientStack.LindenUDP
-{        
+{
    public class LLUtil
    {
        /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 9fb1041..daab84f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            catch
            {
                // I don't care, just leave log4net off
-            }            
+            }
        }
        
        /// <summary>
@@ -63,20 +63,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        /// <param name="scene"></param>
        /// <param name="testLLUDPServer"></param>
        /// <param name="testPacketServer"></param>
-        /// <param name="acm">Agent circuit manager used in setting up the stack</param>        
+        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
        protected void SetupStack(
            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
            out AgentCircuitManager acm)
        {
            IConfigSource configSource = new IniConfigSource();
            ClientStackUserSettings userSettings = new ClientStackUserSettings();
-            testLLUDPServer = new TestLLUDPServer();             
+            testLLUDPServer = new TestLLUDPServer();
            acm = new AgentCircuitManager();
                                    
-            uint port = 666;            
+            uint port = 666;
            testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
            testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
-            testLLUDPServer.LocalScene = scene;            
+            testLLUDPServer.LocalScene = scene;
        }
        
        /// <summary>
@@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            acm.AddNewCircuit(circuitCode, acd);
            
-            testLLUDPServer.LoadReceive(uccp, epSender);            
+            testLLUDPServer.LoadReceive(uccp, epSender);
            testLLUDPServer.ReceiveData(null);
        }
        
@@ -142,15 +142,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
            onp.Header.Zerocoded = false;
            
-            return onp;            
+            return onp;
        }
        
        /// <summary>
        /// Test adding a client to the stack
        /// </summary>
-        [Test, LongRunning]        
+        [Test, LongRunning]
        public void TestAddClient()
-        {            
+        {
            TestHelper.InMethod();
            uint myCircuitCode = 123456;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            
            EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999);
            
-            testLLUDPServer.LoadReceive(uccp, testEp);            
+            testLLUDPServer.LoadReceive(uccp, testEp);
            testLLUDPServer.ReceiveData(null);
            
            // Circuit shouildn't exist since the circuit manager doesn't know about this circuit for authentication yet
@@ -185,8 +185,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                        
            acm.AddNewCircuit(myCircuitCode, acd);
            
-            testLLUDPServer.LoadReceive(uccp, testEp);            
+            testLLUDPServer.LoadReceive(uccp, testEp);
-            testLLUDPServer.ReceiveData(null);            
+            testLLUDPServer.ReceiveData(null);
            
            // Should succeed now
            Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode));
@@ -196,24 +196,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        /// <summary>
        /// Test removing a client from the stack
        /// </summary>
-        [Test]        
+        [Test]
        public void TestRemoveClient()
        {
            TestHelper.InMethod();
-            uint myCircuitCode = 123457;     
+            uint myCircuitCode = 123457;
            
            TestLLUDPServer testLLUDPServer;
            TestLLPacketServer testLLPacketServer;
            AgentCircuitManager acm;
-            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);            
+            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);
            AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm);
            
-            testLLUDPServer.RemoveClientCircuit(myCircuitCode);            
+            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
            
            // Check that removing a non-existant circuit doesn't have any bad effects
-            testLLUDPServer.RemoveClientCircuit(101);            
+            testLLUDPServer.RemoveClientCircuit(101);
            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
        }
        
@@ -232,8 +232,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            TestLLUDPServer testLLUDPServer;
            TestLLPacketServer testLLPacketServer;
            AgentCircuitManager acm;
-            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);            
+            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
-            AddClient(myCircuitCode, testEp, testLLUDPServer, acm);  
+            AddClient(myCircuitCode, testEp, testLLUDPServer, acm);
            byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 };
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
            testLLUDPServer.ReceiveData(null);
            
-            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));  
+            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
        }
        
@@ -270,17 +270,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            uint circuitCodeA = 130000;
            EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300);
            UUID agentIdA   = UUID.Parse("00000000-0000-0000-0000-000000001300");
-            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");   
+            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");
            
            uint circuitCodeB = 130001;
            EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301);
            UUID agentIdB   = UUID.Parse("00000000-0000-0000-0000-000000001301");
-            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");            
+            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");
            
            TestLLUDPServer testLLUDPServer;
            TestLLPacketServer testLLPacketServer;
            AgentCircuitManager acm;
-            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);            
+            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
            AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm);
            AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm);
            
@@ -292,8 +292,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            
            Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
         
-            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));  
+            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
-            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));            
+            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index 8b11ccc..cde155b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        [Test]
        /// <summary>
        /// More a placeholder, really
-        /// </summary>        
+        /// </summary>
        public void InPacketTest()
        {
            TestHelper.InMethod();
@@ -87,20 +87,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        /// <param name="scene"></param>
        /// <param name="testLLUDPServer"></param>
        /// <param name="testPacketServer"></param>
-        /// <param name="acm">Agent circuit manager used in setting up the stack</param>        
+        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
        protected void SetupStack(
            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
            out AgentCircuitManager acm)
        {
            IConfigSource configSource = new IniConfigSource();
            ClientStackUserSettings userSettings = new ClientStackUserSettings();
-            testLLUDPServer = new TestLLUDPServer();             
+            testLLUDPServer = new TestLLUDPServer();
            acm = new AgentCircuitManager();
                                    
-            uint port = 666;            
+            uint port = 666;
            testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
            testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
-            testLLUDPServer.LocalScene = scene;            
+            testLLUDPServer.LocalScene = scene;
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
index d055969..1fba847 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
@@ -31,7 +31,7 @@ using OpenMetaverse.Packets;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 { 
    public class TestLLPacketServer : LLPacketServer
-    {        
+    {
        /// <summary>
        /// Record counts of packets received
        /// </summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                m_packetsReceived[packet.Type]++;
            else
                m_packetsReceived[packet.Type] = 1;
-        }    
+        }
        
        public int GetTotalPacketsReceived()
        {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 1dffefb..f98586d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
            RecvBuffer = tuple.Data;
            numBytes   = tuple.Data.Length;
-            epSender   = tuple.Sender;                       
+            epSender   = tuple.Sender;
            
            return true;
        }
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        {
            while (m_chunksToLoad.Count > 0)
                OnReceivedData(result);
-        }                
+        }
        
        /// <summary>
        /// Has a circuit with the given code been established?
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
    /// Record the data and sender tuple
    /// </summary>
    public class ChunkSenderTuple
-    {        
+    {
        public byte[] Data;
        public EndPoint Sender;
        public bool BeginReceiveException;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index a266a40..c7aeca14 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack
            get { return m_commsManager; }
            set { m_commsManager = value; }
        }
-        protected CommunicationsManager m_commsManager;        
+        protected CommunicationsManager m_commsManager;
        protected StorageManager m_storageManager;
        
@@ -80,15 +80,15 @@ namespace OpenSim.Region.ClientStack
        /// </summary>
        /// 
        /// <param name="osSceneIdentifier">
-        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.  
+        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.
        /// </param>
-        /// <returns></returns>        
+        /// <returns></returns>
        protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier);
        
        protected abstract StorageManager CreateStorageManager();
        protected abstract ClientStackManager CreateClientStackManager();
        protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
-                                             AgentCircuitManager circuitManager);        
+                                             AgentCircuitManager circuitManager);
        protected override void StartupSpecific()
        {
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack
        /// <param name="meshEngine">The name of the mesh engine to use</param>
        /// <param name="config">The configuration data to pass to the physics and mesh engines</param>
        /// <param name="osSceneIdentifier">
-        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.  
+        /// The name of the OpenSim scene this physics scene is serving.  This will be used in log messages.
        /// </param>
        /// <returns></returns>
        protected PhysicsScene GetPhysicsScene(
diff --git a/OpenSim/Region/ClientStack/ThrottleSettings.cs b/OpenSim/Region/ClientStack/ThrottleSettings.cs
index 5dcb706..fe4718c 100644
--- a/OpenSim/Region/ClientStack/ThrottleSettings.cs
+++ b/OpenSim/Region/ClientStack/ThrottleSettings.cs
@@ -26,12 +26,12 @@
 */
 namespace OpenSim.Region.ClientStack
-{    
+{
    /// <summary>
    /// Represent throttle settings for a client stack.  These settings are in bytes per second
    /// </summary> 
    public class ThrottleSettings
-    {        
+    {
        /// <summary>
        /// Minimum bytes per second that the throttle can be set to.
        /// </summary>
@@ -39,13 +39,13 @@ namespace OpenSim.Region.ClientStack
        
        /// <summary>
        /// Maximum bytes per second that the throttle can be set to.
-        /// </summary>        
+        /// </summary>
-        public int Max;  
+        public int Max;
        
        /// <summary>
        /// Current bytes per second that the throttle should be set to.
-        /// </summary>        
+        /// </summary>
-        public int Current;    
+        public int Current;
              
        public ThrottleSettings(int min, int max, int current)
        {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 002ea17..e80f6ab 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -50,11 +50,11 @@ namespace OpenSim.Region.Communications.Hypergrid
            HGUserServices userServices = new HGUserServices(this);
            // This plugin arrangement could eventually be configurable rather than hardcoded here.
            userServices.AddPlugin(new TemporaryUserProfilePlugin());
-            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));            
+            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));
            
            m_userService = userServices;
            m_messageService = userServices;
-            m_avatarService = userServices;           
+            m_avatarService = userServices;
        }
    }
 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index f5126ca..4e3f5a1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -41,13 +41,13 @@ namespace OpenSim.Region.Communications.Hypergrid
    public class HGCommunicationsStandalone : CommunicationsManager
    {
        public HGCommunicationsStandalone(
-            ConfigSettings configSettings,                          
+            ConfigSettings configSettings,
            NetworkServersInfo serversInfo,
            BaseHttpServer httpServer,
            LibraryRootFolder libraryRootFolder, 
            bool dumpAssetsToFile)
            : base(serversInfo, libraryRootFolder)
-        {           
+        {
            LocalUserServices localUserService =
                new LocalUserServices(
                    serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
@@ -58,8 +58,8 @@ namespace OpenSim.Region.Communications.Hypergrid
            hgUserService.AddPlugin(new TemporaryUserProfilePlugin());
            hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService));
            
-            m_userService = hgUserService;            
+            m_userService = hgUserService;
-            m_userAdminService = hgUserService;            
+            m_userAdminService = hgUserService;
            m_avatarService = hgUserService;
            m_messageService = hgUserService;
            
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index f1a56ef..49a2261 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Hypergrid
                return m_localUserServices.AddUserAgent(agentdata);
            return base.AddUserAgent(agentdata);
-        }        
+        }
        public override UserAgentData GetAgentByUUID(UUID userId)
        {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 99bcea3..eaf996d 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
    public class CommunicationsLocal : CommunicationsManager
    {
        public CommunicationsLocal(
-            ConfigSettings configSettings,                                   
+            ConfigSettings configSettings,
            NetworkServersInfo serversInfo,
            LibraryRootFolder libraryRootFolder)
            : base(serversInfo, libraryRootFolder)
@@ -47,13 +47,13 @@ namespace OpenSim.Region.Communications.Local
                = new LocalUserServices(
                    serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
            lus.AddPlugin(new TemporaryUserProfilePlugin());
-            lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);            
+            lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);
            m_userService = lus;
-            m_userAdminService = lus;            
+            m_userAdminService = lus;
            m_avatarService = lus;
            m_messageService = lus;
-            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);                      
+            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
        }
    }
 }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index d18937e..89b55c4 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.Local
            if (md5PasswordHash == userProfile.PasswordHash)
                return true;
            else
-                return false;         
+                return false;
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index c2b8f26..94e4ed2 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.OGS1
            : base(serversInfo, libraryRootFolder)
        {
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.           
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.
            OGS1UserServices userServices = new OGS1UserServices(this);
            userServices.AddPlugin(new TemporaryUserProfilePlugin());
            userServices.AddPlugin(new OGS1UserDataPlugin(this));
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index 01d6ec8..2f9a45f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Communications.OGS1
        public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
        {
            // Not interested
-        }        
+        }
        
        public UserProfileData GetUserByUri(Uri uri)
        {
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Communications.OGS1
                userData.Partner = UUID.Zero;
            return userData;
-        }            
+        }
        protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data)
        {
@@ -766,6 +766,6 @@ namespace OpenSim.Region.Communications.OGS1
            }
            return buddylist;
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 51ba2e9..ed3526d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Clients;
 namespace OpenSim.Region.Communications.OGS1
-{        
+{
    public class OGS1UserServices : UserManagerBase
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1
            catch (WebException)
            {
                m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff");
-            }   
+            }
        }
            
        /// <summary>
@@ -150,10 +150,10 @@ namespace OpenSim.Region.Communications.OGS1
            IList parameters = new ArrayList();
            parameters.Add(param);
            XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters);
-            XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);                
+            XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
            // Temporary measure to deal with older services
-            if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)       
+            if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)
            {
                throw new Exception(
                    String.Format(
@@ -170,7 +170,7 @@ namespace OpenSim.Region.Communications.OGS1
            else
            {
                return false;
-            }           
+            }
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index addc36b..9c646b6 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
            AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
            transactions.RequestUpdateTaskInventoryItem(remoteClient, part, transactionID, item);
-        }               
+        }
        /// <summary>
        /// Request that a client (agent) begin an asset transfer.
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 0c6900d..2a1355b 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -49,9 +49,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
        /// </summary>
        protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>();
        
-        protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();               
+        protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();
        protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds 
-            = new Dictionary<UUID, Dictionary<ulong, string>>();        
+            = new Dictionary<UUID, Dictionary<ulong, string>>();
        
        public void Initialise(IConfigSource source)
        {
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
                        agentId, m_scene.RegionInfo.RegionName);
                }
            }
-        }        
+        }
        
        public Caps GetCapsHandlerForUser(UUID agentId)
        {
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
            }
            return null;
-        }        
+        }
        
        public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
        {
@@ -225,6 +225,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
                y = y / Constants.RegionSize;
                m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
            }
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
index 394b1bb..8502006 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
        {
            // Only need to run through all this if there are entries in the ban list
            if (bans.Count > 0)
-            {                
+            {
                IClientIPEndpoint ipEndpoint;
                if (client.TryGet(out ipEndpoint))
                {
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 937f76b..1fdb003 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                    m_cacheddecode.Remove(AssetId);
                m_cacheddecode.Add(AssetId, layers);
-            }            
+            }
            // Notify Interested Parties
            lock (m_notifyList)
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index a1e27f1..5a5ad7e 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Asset
    /// <para>
    /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". 
    /// When cache is successfully enable log should have message 
-    /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".    
+    /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)".
    /// </para>
    /// <para>
    /// Cache's size is limited by two parameters:
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset
        /// <summary>
        /// Asset's default expiration time in the cache.
-        /// </summary>        
+        /// </summary>
        public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0);
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 37cccc8..817e0d4 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -470,7 +470,7 @@ namespace Flotsam.RegionModules.AssetCache
            else if (dirSize >= m_CacheWarnAt)
            {
                m_log.WarnFormat("[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}.  Suggest increasing tiers, tier length, or reducing cache expiration", dir, dirSize);
-            }            
+            }
        }
        private string GetFileName(string id)
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index fcc2673..66a9b5a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                    scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
                    m_scenes.Remove(scene);
                }
-            }            
+            }
        }
        
        public virtual void Close()
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 046fc4a..ebebaf9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
            m_scene.AddCommand(
-                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);            
+                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
        }
        
        public void PostInitialise() {}
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        public void SendAlertToUser(IClientAPI client, string message)
        {
            SendAlertToUser(client, message, false);
-        }          
+        }
        
        public void SendAlertToUser(IClientAPI client, string message, bool modal)
        {
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        public void SendAlertToUser(UUID agentID, string message)
        {
            SendAlertToUser(agentID, message, false);
-        }          
+        }
        
        public void SendAlertToUser(UUID agentID, string message, bool modal)
        {
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            
            if (sp != null)
                sp.ControllingClient.SendAgentAlertMessage(message, modal);
-        }           
+        }
        
        public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
        {
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                    break;
                }
            }
-        }     
+        }
        
        public void SendGeneralAlert(string message)
        {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                if (!presence.IsChildAgent)
                    presence.ControllingClient.SendAlertMessage(message);
            }
-        }    
+        }
        public void SendDialogToUser(
            UUID avatarID, string objectName, UUID objectID, UUID ownerID,
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        {
            ScenePresence sp = m_scene.GetScenePresence(avatarID);
            
-            if (sp != null)            
+            if (sp != null)
                sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
-        }        
+        }
        
        public void SendNotificationToUsersInEstate(
            UUID fromAvatarID, string fromAvatarName, string message)
@@ -145,11 +145,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            // TODO: This does not yet do what it says on the tin - it only sends the message to users in the same
            // region as the sending avatar.
            SendNotificationToUsersInRegion(fromAvatarID, fromAvatarName, message);
-        }        
+        }
        
        public void SendNotificationToUsersInRegion(
            UUID fromAvatarID, string fromAvatarName, string message)
-        {        
+        {
            List<ScenePresence> presenceList = m_scene.GetScenePresences();
            foreach (ScenePresence presence in presenceList)
@@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                
                m_log.InfoFormat(
                    "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", 
-                    m_scene.RegionInfo.RegionName, firstName, lastName, message);  
+                    m_scene.RegionInfo.RegionName, firstName, lastName, message);
                SendAlertToUser(firstName, lastName, message, false);
            }
        }
@@ -199,6 +199,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            }
            
            return result;
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index dd9b318..fc7d63a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -497,7 +497,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            {
                m_log.ErrorFormat("[FRIENDS]: No user found for id {0} in OfferFriendship()", fromUserId);
            }
-        }        
+        }
        #region FriendRequestHandling
@@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            if (im.dialog == (byte)InstantMessageDialog.FriendshipOffered) // 38
            {
-                // fromAgentName is the *destination* name (the friend we offer friendship to)                
+                // fromAgentName is the *destination* name (the friend we offer friendship to)
                ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID));
                im.fromAgentName = initiator != null ? initiator.Name : "(hippo)";
                
@@ -528,13 +528,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        /// Invoked when a user offers a friendship.
        /// </summary>
        /// 
-        /// <param name="im"></param>    
+        /// <param name="im"></param>
        /// <param name="client"></param>
        private void FriendshipOffered(GridInstantMessage im)
        {
            // this is triggered by the initiating agent:
            // A local agent offers friendship to some possibly remote friend.
-            // A IM is triggered, processed here and sent to the friend (possibly in a remote region).           
+            // A IM is triggered, processed here and sent to the friend (possibly in a remote region).
            m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}",
                       im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline);
@@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                        m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
                    }
                );
-            }            
+            }
        }
        
        /// <summary>
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        private void FriendshipAccepted(IClientAPI client, GridInstantMessage im)
        {
            m_log.DebugFormat("[FRIEND]: 39 - from client {0}, agent {2} {3}, imsession {4} to {5}: {6} (dialog {7})",
-              client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);            
+              client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);
        }
        
        /// <summary>
@@ -602,7 +602,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                delegate(bool success) {
                    m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
                }
-            );            
+            );
        }
        private void OnGridInstantMessage(GridInstantMessage msg)
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index ff12361..8ce5092 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -91,6 +91,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
            else 
                m_log.ErrorFormat(
                    "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 8926527..f941728 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
        {
            m_scene = scene;
            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
-            m_scene.RegisterModuleInterface<IGodsModule>(this);           
+            m_scene.RegisterModuleInterface<IGodsModule>(this);
        }
        
        public void PostInitialise() {}
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                        m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied");
                }
            }
-        }        
+        }
        
        /// <summary>
        /// Kicks User specified from the simulator. This logs them off of the grid
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                    }
                }
                else
-                {                  
+                {
                    m_dialogModule.SendAlertToUser(godID, "Kick request denied");
                }
            }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 66f1e14..9a68749 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
    public class InstantMessageModule : IRegionModule
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        /// <value>
        /// Is this module enabled?
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 907e2d4..f761bf0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <value>
        /// We only use this to request modules
        /// </value>
-        protected Scene m_scene;        
+        protected Scene m_scene;
        /// <value>
        /// The stream from which the inventory archive will be loaded.
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                        item.Folder = foundFolder.ID;
                        //m_userInfo.AddItem(item);
-                        m_scene.InventoryService.AddItem(item);                        
+                        m_scene.InventoryService.AddItem(item);
                        successfulItemRestores++;
                        // If we're loading an item directly into the given destination folder then we need to record
@@ -299,14 +299,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    = new InventoryFolderBase(
                        newFolderId, newFolderName, m_userInfo.UserProfile.ID, 
                        (short)AssetType.Unknown, destFolder.ID, 1);
-                m_scene.InventoryService.AddFolder(destFolder);               
+                m_scene.InventoryService.AddFolder(destFolder);
                
 //                UUID newFolderId = UUID.Random();
 //                m_scene.InventoryService.AddFolder(
 //                m_userInfo.CreateFolder(
 //                    folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
-//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);                
+//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);
 //                foundFolder = foundFolder.GetChildFolder(newFolderId);
 //                m_log.DebugFormat(
 //                    "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", 
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    nodesLoaded.Add(destFolder);
                i++;
-            }         
+            }
            
            return destFolder;
            
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    rawFolders[i++], newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
                foundFolder = foundFolder.GetChildFolder(newFolderId);
            }
-            */            
+            */
        }
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index 5ebf2fa..a822d10 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <summary>
        /// Find a folder given a PATH_DELIMITER delimited path starting from a user's root folder
-        /// </summary>        
+        /// </summary>
        ///
        /// This method does not handle paths that contain multiple delimitors
        ///
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// User id to search
        /// </param>
        /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
        /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
        /// </param>
        /// <returns>null if the folder is not found</returns>
@@ -71,11 +71,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                return null;
            return FindFolderByPath(inventoryService, rootFolder, path);
-        }        
+        }
        
        /// <summary>
        /// Find a folder given a PATH_DELIMITER delimited path starting from this folder
-        /// </summary>        
+        /// </summary>
        ///
        /// This method does not handle paths that contain multiple delimitors
        ///
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// The folder from which the path starts
        /// </param>
        /// <param name="path">
-        /// The path to the required folder.  
+        /// The path to the required folder.
        /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
        /// </param>
        /// <returns>null if the folder is not found</returns>
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                return null;
            return FindItemByPath(inventoryService, rootFolder, path);
-        }        
+        }
        
        /// <summary>
        /// Find an item given a PATH_DELIMITOR delimited path starting from this folder.
@@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            }
            else
            {
-                InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);                
+                InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
                
                foreach (InventoryFolderBase folder in contents.Folders)
                {
@@ -205,6 +205,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            // We didn't find an item or intermediate folder with the given name
            return null;
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index c6ebb24..499c552 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        private InventoryArchiverModule m_module;
        private CachedUserInfo m_userInfo;
-        private string m_invPath;        
+        private string m_invPath;
        protected TarArchiveWriter m_archiveWriter;
        protected UuidGatherer m_assetGatherer;
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            {
                path += CreateArchiveFolderName(inventoryFolder);
-                // We need to make sure that we record empty folders            
+                // We need to make sure that we record empty folders
                m_archiveWriter.WriteDir(path);
            }
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
            {
                foundStar = true;
-                maxComponentIndex--;                
+                maxComponentIndex--;
            }
            m_invPath = String.Empty;
@@ -369,8 +369,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <returns></returns>
        public static string CreateArchiveFolderName(InventoryFolderBase folder)
        {
-            return CreateArchiveFolderName(folder.Name, folder.ID);          
+            return CreateArchiveFolderName(folder.Name, folder.ID);
-        }        
+        }
        /// <summary>
        /// Create the archive name for a particular item.
@@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <returns></returns>
        public static string CreateArchiveItemName(InventoryItemBase item)
        {
-            return CreateArchiveItemName(item.Name, item.ID);          
+            return CreateArchiveItemName(item.Name, item.ID);
        }
        /// <summary>
@@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                "{0}{1}{2}/",
                name,
                ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
-                id);            
+                id);
        }
        /// <summary>
@@ -406,14 +406,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// </summary>
        /// <param name="name"></param>
        /// <param name="id"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
        public static string CreateArchiveItemName(string name, UUID id)
        {
            return string.Format(
                "{0}{1}{2}.xml",
                name,
                ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
-                id);            
+                id);
        }
        /// <summary>
@@ -438,6 +438,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            sw.Close();
            return s;
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 55dce05..1228eb1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -40,12 +40,12 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
-{          
+{
    /// <summary>
    /// This module loads and saves OpenSimulator inventory archives
-    /// </summary>    
+    /// </summary>
    public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule
-    {    
+    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        public string Name { get { return "Inventory Archiver Module"; } }
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// </value>
        public bool DisablePresenceChecks { get; set; }
        
-        public event InventoryArchiveSaved OnInventoryArchiveSaved;        
+        public event InventoryArchiveSaved OnInventoryArchiveSaved;
        
        /// <summary>
        /// The file to load and save inventory if no filename has been specified
@@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        }
        public void Initialise(Scene scene, IConfigSource source)
-        {            
+        {
            if (m_scenes.Count == 0)
            {
                scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                m_aScene = scene;
            }
                        
-            m_scenes[scene.RegionInfo.RegionID] = scene;            
+            m_scenes[scene.RegionInfo.RegionID] = scene;
        }
        public void PostInitialise() {}
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
            if (handlerInventoryArchiveSaved != null)
                handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException);
-        }       
+        }
        public bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
        {
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream)
        {
            if (m_scenes.Count > 0)
-            {            
+            {
                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
                        
                if (userInfo != null)
@@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    if (CheckPresence(userInfo.UserProfile.ID))
                    {
                        InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);                
+                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
                        UpdateClientWithLoadedNodes(userInfo, request.Execute());
                        return true;
@@ -197,12 +197,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            }
            return false;
-        }         
+        }
        
        public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, string loadPath)
        {
            if (m_scenes.Count > 0)
-            {   
+            {
                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
                
                if (userInfo != null)
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    if (CheckPresence(userInfo.UserProfile.ID))
                    {
                        InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);                
+                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
                        UpdateClientWithLoadedNodes(userInfo, request.Execute());
                        return true;
@@ -221,11 +221,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                            "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
                            userInfo.UserProfile.Name, userInfo.UserProfile.ID);
                    }
-                }                                         
+                }
            }
            return false;
-        }           
+        }
        
        /// <summary>
        /// Load inventory from an inventory file archive
@@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
                loadPath, invPath, firstName, lastName);
            
-            if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath))                 
+            if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath))
                m_log.InfoFormat(
                    "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
                    loadPath, firstName, lastName);
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            lock (m_pendingConsoleSaves)
                m_pendingConsoleSaves.Add(id);
-        }        
+        }
        
        private void SaveInvConsoleCommandCompleted(
            Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <param name="pass">User password</param>
        /// <returns></returns>
        protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass)
-        {            
+        {
            CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
            //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName);
            if (null == userInfo)
@@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            }
            try
-            {    
+            {
                if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass))
                {
                    return userInfo;
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                {
                    m_log.ErrorFormat(
                        "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.", 
-                        firstName, lastName);                    
+                        firstName, lastName);
                    return null;
                }
            }
@@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// </summary>
        /// <param name="loadedNodes">Can be empty.  In which case, nothing happens</param>
        private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List<InventoryNodeBase> loadedNodes)
-        {               
+        {
            if (loadedNodes.Count == 0)
                return;
                   
@@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID);
                
                if (user != null && !user.IsChildAgent)
-                {        
+                {
                    foreach (InventoryNodeBase node in loadedNodes)
                    {
 //                        m_log.DebugFormat(
@@ -379,8 +379,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    }
                    
                    break;
-                }        
+                }
-            }            
+            }
        }
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ed293cd..b0fdcd6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -37,7 +37,7 @@ using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
-using OpenSim.Framework.Serialization.External;    
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Osp;
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Exception reportedException)
        {
            mre.Set();
-        }        
+        }
        /// <summary>
        /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
@@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            string expectedObject1FilePath = string.Format(
                "{0}{1}{2}",
                ArchiveConstants.INVENTORY_PATH,
-                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),                                  
+                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
                expectedObject1FileName);
            string filePath;
@@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Assert.That(gotObject1File, Is.True, "No item1 file in archive");
 //            Assert.That(gotObject2File, Is.True, "No object2 file in archive");
-            // TODO: Test presence of more files and contents of files.            
+            // TODO: Test presence of more files and contents of files.
        }
        
        /// <summary>
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        /// This test also does some deeper probing of loading into nested inventory structures
        [Test]
        public void TestLoadIarV0_1ExistingUsers()
-        {   
+        {
            TestHelper.InMethod();
            
            //log4net.Config.XmlConfigurator.Configure();
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
            tar.Close();
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
            SerialiserModule serialiserModule = new SerialiserModule();
            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
            
@@ -271,9 +271,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
                "Loaded item owner doesn't match inventory reciever");
-            // Now try loading to a root child folder            
+            // Now try loading to a root child folder
            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
-            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
            InventoryItemBase foundItem2
@@ -282,12 +282,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            // Now try loading to a more deeply nested folder
            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
-            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
            InventoryItemBase foundItem3
                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName);
-            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");                        
+            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
        }
        /// <summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        /// (as tested in the a later commented out test)
        [Test]
        public void TestLoadIarV0_1AbsentUsers()
-        {   
+        {
            TestHelper.InMethod();
            
            log4net.Config.XmlConfigurator.Configure();
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
            tar.Close();
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
            SerialiserModule serialiserModule = new SerialiserModule();
            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
            
@@ -357,8 +357,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //                "Loaded item non-uuid creator doesn't match that of the loading user");
            Assert.That(
                foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), 
-                "Loaded item uuid creator doesn't match that of the loading user");                  
+                "Loaded item uuid creator doesn't match that of the loading user");
-        }        
+        }
        /// <summary>
        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        /// Disabled since temporary profiles have not yet been implemented.
        //[Test]
        public void TestLoadIarV0_1TempProfiles()
-        {   
+        {
            TestHelper.InMethod();
            
            log4net.Config.XmlConfigurator.Configure();
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
            tar.Close();
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());            
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
            SerialiserModule serialiserModule = new SerialiserModule();
            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
            
@@ -436,7 +436,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
            
            Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());
-        }        
+        }
        
        /// <summary>
        /// Test replication of an archive path to the user's inventory.
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            string itemArchivePath
                = string.Format(
                    "{0}{1}{2}{3}", 
-                    ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);            
+                    ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
            //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 75976e2..d9a021f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -169,12 +169,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                    byte[] copyIDBytes = copyID.GetBytes();
                    im.binaryBucket = new byte[1 + copyIDBytes.Length];
                    im.binaryBucket[0] = (byte)AssetType.Folder;
-                    Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);  
+                    Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length);
                    
                    if (user != null && !user.IsChildAgent)
-                    {        
+                    {
                        user.ControllingClient.SendBulkUpdateInventory(folderCopy);
-                    }                    
+                    }
                }
                else
                {
@@ -199,10 +199,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                    }
                    
                    copyID = itemCopy.ID;
-                    Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);                                       
+                    Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16);
                    
                    if (user != null && !user.IsChildAgent)
-                    {        
+                    {
                        user.ControllingClient.SendBulkUpdateInventory(itemCopy);
                    }
                }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                }
            }
            else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
-            {                                           
+            {
                // Here, the recipient is local and we can assume that the
                // inventory is loaded. Courtesy of the above bulk update,
                // It will have been pushed to the client, too
@@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                }
                
                if ((null == item && null == folder) | null == trashFolder)
-                {                        
+                {
                    string reason = String.Empty;
                    
                    if (trashFolder == null)
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 0cdd9a8..1b23d92 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
                responsedata["error_status_text"] = "Upstream error:";
                responsedata["http_protocol_version"] = "HTTP/1.0";
                return responsedata;
-            }            
+            }
            OSDArray array = new OSDArray();
            if (element == null) // didn't have an event in 15s
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index e9c1e9d..7d6f150 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -353,11 +353,11 @@ namespace OpenSim.Region.CoreModules.InterGrid
            return responseMap;
        }
-        // Using OpenSim.Framework.Capabilities.Caps here one time..   
+        // Using OpenSim.Framework.Capabilities.Caps here one time..
        // so the long name is probably better then a using statement
        public void OnRegisterCaps(UUID agentID, Caps caps)
        {
-            /* If we ever want to register our own caps here....    
+            /* If we ever want to register our own caps here....
             * 
            string capsBase = "/CAPS/" + caps.CapsObjectPath;
            caps.RegisterHandler("CAPNAME",
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index bea6222..d57a8e5 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                string value = "";
                
                if (nvp[0] != null)
-                {    
+                {
                    name = nvp[0].Trim();
                }
                
@@ -291,10 +291,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                                     temp = 128;
                                  
                                 width = temp;
-                                 height = temp;   
+                                 height = temp;
                             }
                         }
-                     break;   
+                     break;
                }
            }
@@ -410,7 +410,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            Font myFont = new Font(fontName, fontSize);
            SolidBrush myBrush = new SolidBrush(Color.Black);
            
-            char[] lineDelimiter = {dataDelim};            
+            char[] lineDelimiter = {dataDelim};
            char[] partsDelimiter = {','};
            string[] lines = data.Split(lineDelimiter);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index e69613a..85a1ac3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
        public bool IsAuthorizedForRegion(string userID, string regionID, out string message)
        {
-            return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message);   
+            return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message);
        }
    }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index a672f4f..fca2df2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
            else
            {
                m_log.ErrorFormat("[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0} ",regionID);
-            }   
+            }
            
            
            return isAuthorized;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 376ea8a..65f83fd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                TarArchiveReader.TarEntryType entryType;
                while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
-                {                    
+                {
                    //m_log.DebugFormat(
                    //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
                    
                    if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
-                        continue;                    
+                        continue;
                    if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
                    {
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
            IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
-            int sceneObjectsLoadedCount = 0;            
+            int sceneObjectsLoadedCount = 0;
            foreach (string serialisedSceneObject in serialisedSceneObjects)
            {
@@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
            XmlTextReader xtr 
-                = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context);            
+                = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context);
            RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 63608a8..9e4fbbe 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            m_scene = scene;
            m_saveStream = saveStream;
            m_requestId = requestId;
-        }        
+        }
        /// <summary>
        /// Archive the region requested.
        /// </summary>
        /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception>
        public void ArchiveRegion()
-        {            
+        {
            Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>();
            List<EntityBase> entities = m_scene.GetEntities();
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                    m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
                    m_scene,
                    archiveWriter,
-                    m_requestId);           
+                    m_requestId);
            
            new AssetsRequest(
                new AssetsArchiver(archiveWriter), assetUuids.Keys, 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 5c58b69..8d4f91b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        public void Close()
        {
-        }                
+        }
        public void ArchiveRegion(string savePath)
        {
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            m_log.InfoFormat(
                "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath);
            
-            new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion();            
+            new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion();
        }
        
        public void ArchiveRegion(Stream saveStream)
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        public void ArchiveRegion(Stream saveStream, Guid requestId)
        {
            new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion();
-        }        
+        }
        public void DearchiveRegion(string loadPath)
        {
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath);
            
            new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion();
-        }        
+        }
        
        public void DearchiveRegion(Stream loadStream)
        {
@@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId)
        {
            new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion();
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 330fa3f..95d109c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        /// </summary>
        /// <param name="archive"></param>
        public void WriteAsset(AssetBase asset)
-        {            
+        {
            //WriteMetadata(archive);
            WriteData(asset);
        }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 82803bf..fe9c8d9 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
            m_requestCallbackTimer.AutoReset = false;
-            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);        
+            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);
        }
        protected internal void Execute()
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args)
        {
            try
-            {            
+            {
                lock (this)
                {
                    // Take care of the possibilty that this thread started but was paused just outside the lock before
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                }
                // Calculate which uuids were not found.  This is an expensive way of doing it, but this is a failure
-                // case anyway.                
+                // case anyway.
                List<UUID> uuids = new List<UUID>();
                foreach (UUID uuid in m_uuids)
                {
@@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                    m_log.ErrorFormat(
                        "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
-                m_log.Error("[ARCHIVER]: OAR save aborted.");        
+                m_log.Error("[ARCHIVER]: OAR save aborted.");
            }
            catch (Exception e)
            {
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                {
                    //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
                    
-                    m_requestCallbackTimer.Stop();                     
+                    m_requestCallbackTimer.Stop();
                    
                    if (m_requestState == RequestState.Aborted)
                    {
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);                
+                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
            }
        }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 5c42e94..edac4a4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                m_lastErrorMessage = errorMessage;
                Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
                                
-                Monitor.PulseAll(this);                
+                Monitor.PulseAll(this);
            }
        }
        
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                archiverModule.ArchiveRegion(archiveWriteStream, requestId);
                //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
                //while (assetServer.HasWaitingRequests())
-                //    assetServer.ProcessNextRequest();     
+                //    assetServer.ProcessNextRequest();
                
                Monitor.Wait(this, 60000);
            }
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            
            // Also check that direct entries which will also have a file entry containing that directory doesn't 
            // upset load
-            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);            
+            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
@@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            {
                scene.EventManager.OnOarFileLoaded += LoadCompleted;
                archiverModule.DearchiveRegion(archiveReadStream);
-            }            
+            }
            
            Assert.That(m_lastErrorMessage, Is.Null);
@@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
        /// <summary>
        /// Test merging a V0.2 OpenSim Region Archive into an existing scene
-        /// </summary>        
+        /// </summary>
        //[Test]
        public void TestMergeOarV0_2()
        {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 2701f60..3be5f45 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -954,7 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        public void SetMediaUrl(string url)
        {
            landData.MediaURL = url;
-            sendLandUpdateToAvatarsOverMe();            
+            sendLandUpdateToAvatarsOverMe();
        }
        
        /// <summary>
@@ -964,7 +964,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        public void SetMusicUrl(string url)
        {
            landData.MusicURL = url;
-            sendLandUpdateToAvatarsOverMe();            
+            sendLandUpdateToAvatarsOverMe();
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
index 65f22b1..2cbaf96 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, 
            UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, 
            UUID fromtaskid)
-        {     
+        {
            int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
            int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
            rayend.X += differenceX * (int)Constants.RegionSize;
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 710e356..05d19a2 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                            scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY;
                        }
-                        /*  
+                        /*
                                                else
                                                {
                                                    conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize;
@@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject;
            VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED
            VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED
-            VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED
            VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage;
            VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED
@@ -899,11 +899,11 @@ namespace OpenSim.Region.CoreModules.World.Land
            VirtualRegion.Permissions.OnDelinkObject += BigRegion.PermissionModule.CanDelinkObject; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnBuyLand += BigRegion.PermissionModule.CanBuyLand; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnViewNotecard += BigRegion.PermissionModule.CanViewNotecard; //NOT YET IMPLEMENTED
-            VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED                       
+            VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED
-            VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED
-            VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnCreateObjectInventory += BigRegion.PermissionModule.CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
-            VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED            
+            VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
            VirtualRegion.Permissions.OnCopyObjectInventory += BigRegion.PermissionModule.CanCopyObjectInventory; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnDeleteObjectInventory += BigRegion.PermissionModule.CanDeleteObjectInventory; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnResetScript += BigRegion.PermissionModule.CanResetScript;
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f360577..a9e0b7f 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        //private uint PERM_MODIFY = (uint)16384;
        private uint PERM_MOVE = (uint)524288;
        private uint PERM_TRANS = (uint)8192;
-        private uint PERM_LOCKED = (uint)540672;  
+        private uint PERM_LOCKED = (uint)540672;
        
        /// <value>
        /// Different user set names that come in from the configuration file.
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            Administrators
        };
-        #endregion   
+        #endregion
        #region Bypass Permissions / Debug Permissions Stuff
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <value>
        /// The set of users that are allowed to edit (save) scripts.  This is only active if 
        /// permissions are not being bypassed.  This overrides normal permissions.-
-        /// </value>        
+        /// </value>
        private UserSet m_allowedScriptEditors = UserSet.All;
        
        private Dictionary<string, bool> GrantLSL = new Dictionary<string, bool>();
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
            m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
            m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED
-            m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED            
+            m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED
            m_scene.Permissions.OnInstantMessage += CanInstantMessage;
            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED
@@ -210,12 +210,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
            
            m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED                       
+            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED            
+            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED            
+            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
            
            m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
-            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED            
+            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnResetScript += CanResetScript;
@@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                foreach (string uuidl in grant.Split(',')) {
                    string uuid = uuidl.Trim(" \t".ToCharArray());
                    GrantLSL.Add(uuid, true);
-                }                
+                }
            }
            grant = myConfig.GetString("GrantCS","");
@@ -431,7 +431,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                m_log.ErrorFormat(
                    "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}",
                    rawSetting, settingName, userSet);
-            }            
+            }
            
            m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet);
            
@@ -942,7 +942,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (m_bypassPermissions) return m_bypassPermissionsValue;
                            
            if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
-                return false;   
+                return false;
            
            // Ordinarily, if you can view it, you can edit it
            // There is no viewing a no mod script
@@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="objectID"></param>
        /// <param name="user"></param>
        /// <param name="scene"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
        private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1377,11 +1377,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="objectID"></param>
        /// <param name="user"></param>
        /// <param name="scene"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
        private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;           
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
            if (objectID == UUID.Zero) // User inventory
            {
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="objectID"></param>
        /// <param name="user"></param>
        /// <param name="scene"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1609,7 +1609,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// </summary>
        /// <param name="invType"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
        private bool CanCreateUserInventory(int invType, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
@@ -1619,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID))
                    return false;
            
-            return true;            
+            return true;
        }
        
        /// <summary>
@@ -1627,27 +1627,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
        private bool CanCopyUserInventory(UUID itemID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return true;            
+            return true;
-        }        
+        }
        
        /// <summary>
        /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
        private bool CanEditUserInventory(UUID itemID, UUID userID)
-        {            
+        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return true;            
+            return true;
        }
        
        /// <summary>
@@ -1655,14 +1655,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
        private bool CanDeleteUserInventory(UUID itemID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return true;            
+            return true;
-        }        
+        }
        private bool CanTeleport(UUID userID, Scene scene)
        {
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0331d3..58e4261 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
        public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
        {
            SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
-        }       
+        }
        public SceneObjectGroup DeserializeGroupFromXml2(string xmlString)
        {
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 373b6ab..799a448 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
        {
            m_serialiserModule = new SerialiserModule();
            m_scene = SceneSetupHelpers.SetupScene("");
-            SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);            
+            SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);
        }
        [Test]
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                    continue;
                
                switch (xtr.Name)
-                {                   
+                {
                    case "UUID":
                        xtr.ReadStartElement("UUID");
                        uuid = UUID.Parse(xtr.ReadElementString("Guid"));
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                    case "CreatorID":
                        xtr.ReadStartElement("CreatorID");
                        creatorId = UUID.Parse(xtr.ReadElementString("Guid"));
-                        xtr.ReadEndElement();                  
+                        xtr.ReadEndElement();
                        break;
                }
            }
@@ -325,8 +325,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
            // TODO: More checks
            Assert.That(uuid, Is.EqualTo(rpUuid));
            Assert.That(name, Is.EqualTo(rpName));
-            Assert.That(creatorId, Is.EqualTo(rpCreatorId));           
+            Assert.That(creatorId, Is.EqualTo(rpCreatorId));
-        }        
+        }
        [Test]
        public void TestDeserializeXml2()
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
            string xml2 = m_serialiserModule.SerializeGroupToXml2(so);
            XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
-            xtr.ReadStartElement("SceneObjectGroup");      
+            xtr.ReadStartElement("SceneObjectGroup");
            xtr.ReadStartElement("SceneObjectPart");
           
            UUID uuid = UUID.Zero;
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                    continue;
                
                switch (xtr.Name)
-                {                   
+                {
                    case "UUID":
                        xtr.ReadStartElement("UUID");
                        uuid = UUID.Parse(xtr.ReadElementString("Guid"));
@@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                    case "CreatorID":
                        xtr.ReadStartElement("CreatorID");
                        creatorId = UUID.Parse(xtr.ReadElementString("Guid"));
-                        xtr.ReadEndElement();                  
+                        xtr.ReadEndElement();
                        break;
                }
            }
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 6cc0ed9..37f1f2e 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -33,9 +33,9 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Sound
-{        
+{
    public class SoundModule : IRegionModule, ISoundModule
-    {        
+    {
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_scene;
@@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.World.Sound
                if (dis > 100.0) // Max audio distance
                    continue;
                
-                // Scale by distance          
+                // Scale by distance
                gain = (float)((double)gain*((100.0 - dis) / 100.0));
                
                p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
-            }                
+            }
        }
        
        public virtual void TriggerSound(
@@ -84,12 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Sound
                if (dis > 100.0) // Max audio distance
                    continue;
                
-                // Scale by distance          
+                // Scale by distance
                gain = (float)((double)gain*((100.0 - dis) / 100.0));
                
                p.ControllingClient.SendTriggeredSound(
                    soundId, ownerID, objectID, parentID, handle, position, (float)gain);
-            }            
+            }
-        }  
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index aa38c09..0712a7f 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules
                m_DayLengthHours  = config.Configs["Sun"].GetDouble("day_length", d_day_length);
                // Horizon shift, this is used to shift the sun's orbit, this affects the day / night ratio
-                // must hard code to ~.5 to match sun position in LL based viewers                
+                // must hard code to ~.5 to match sun position in LL based viewers
                m_HorizonShift   = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night);
                
@@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules
                receivedEstateToolsSunUpdate = true;
                // Generate shared values
-                GenSunPos();        
+                GenSunPos();
                // When sun settings are updated, we should update all clients with new settings.
                SunUpdateToAllClients();
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index a09315a..c2ad7b8 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
        protected Scene m_scene;
        
        protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
-        public PCode[] CreationCapabilities { get { return creationCapabilities; } }            
+        public PCode[] CreationCapabilities { get { return creationCapabilities; } }
        
        public void Initialise(Scene scene, IConfigSource source)
        {
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
            UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
        {
            if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0)
-            {    
+            {
                m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
                return null;
            }
@@ -111,6 +111,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
                    tree.Scale = new Vector3(4, 4, 4);
                    break;
            }
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 41d2071..9d47e19 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
        private float m_avgStrength = 5.0f; // Average magnitude of the wind vector
        private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
-        private float m_varStrength = 5.0f; // Max Strength  Variance  
+        private float m_varStrength = 5.0f; // Max Strength  Variance
        private float m_varDirection = 30.0f;// Max Direction Variance
        private float m_rateChange = 1.0f; // 
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
                {
                    m_windSpeeds[y * 16 + x] = m_curPredominateWind;
                }
-            }            
+            }
        }
        public Vector3 WindSpeed(float fX, float fY, float fZ)
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
index 2c371da..071e20b 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
                        m_windSpeeds[y * 16 + x].Y *= m_strength;
                    }
                }
-            }            
+            }
        }
        public Vector3 WindSpeed(float fX, float fY, float fZ)
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b442f6f..3283c1f 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules
                }
                avatar.ControllingClient.SendWindData(windSpeeds);
-            }            
+            }
        }
        private void SendWindAllClients()
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index b45b923..5fff89f 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
            if (userInfo != null)
            {
-                UserProfileData userProfile = userInfo.UserProfile;                
+                UserProfileData userProfile = userInfo.UserProfile;
                firstname = userProfile.FirstName;
                lastname = userProfile.SurName;
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 3809749..66f4da0 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
        public override void UpdateMovement()
        {
-            UpdateGroupRotation(GroupRotation * m_rotationDirection);
+            UpdateGroupRotation(Rotation * m_rotationDirection);
            base.UpdateMovement();
        }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e9c35e9..f4526ae 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Examples.SimpleModule
        
        public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
        {
-        }        
+        }
        public void SendViewerTime(int phase)
        {
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index c1ed1ac..0cc8fb6 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
                                               sbyte type, byte wearableType, uint nextOwnerMask);
        
        void HandleTaskItemUpdateFromTransaction(
-            IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item);      
+            IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item);
        void RemoveAgentAssetTransactions(UUID userID);
    }
diff --git a/OpenSim/Region/Framework/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs
index 9371bea..6b872c1 100644
--- a/OpenSim/Region/Framework/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Framework.Interfaces
    {
        /// <value>
        /// The name of this commander
-        /// </value>        
+        /// </value>
        string Name { get; }
        /// <value>
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <summary>
        /// The commands available for this commander
        /// </summary>
-        Dictionary<string, ICommand> Commands { get; }     
+        Dictionary<string, ICommand> Commands { get; }
        
        void ProcessConsoleCommand(string function, string[] args);
        void RegisterCommand(string commandName, ICommand command);
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index a6ca7f1..ce57c44 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -37,15 +37,15 @@ namespace OpenSim.Region.Framework.Interfaces
        /// small interval.
        /// </summary>
        /// <param name="client"></param>
-        /// <param name="message"></param>        
+        /// <param name="message"></param>
-        void SendAlertToUser(IClientAPI client, string message);      
+        void SendAlertToUser(IClientAPI client, string message);
        
        /// <summary>
        /// Send an alert message to a particular user.
        /// </summary>
        /// <param name="client"></param>
        /// <param name="message"></param>
-        /// <param name="modal"></param>        
+        /// <param name="modal"></param>
        void SendAlertToUser(IClientAPI client, string message, bool modal);
        
        /// <summary>
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces
        void SendAlertToUser(string firstName, string lastName, string message, bool modal);
        
        /// <summary>
-        /// Send an alert message to all users in the scene.  
+        /// Send an alert message to all users in the scene.
        /// </summary>
        /// <param name="message"></param>
        void SendGeneralAlert(string message);
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="message"></param>
        /// <param name="url"></param>
        void SendUrlToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);        
+            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
        
        /// <summary>
        /// Send a notification to all users in the scene.  This notification should remain around until the 
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// 
        /// <param name="fromAvatarID">The user sending the message</param>
        /// <param name="fromAvatarName">The name of the user doing the sending</param>
-        /// <param name="message">The message being sent to the user</param>       
+        /// <param name="message">The message being sent to the user</param>
        void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message);
        
        /// <summary>
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// 
        /// <param name="fromAvatarID">The user sending the message</param>
        /// <param name="fromAvatarName">The name of the user doing the sending</param>
-        /// <param name="message">The message being sent to the user</param>  
+        /// <param name="message">The message being sent to the user</param>
        void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
index f3a3747..c39627c 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
@@ -29,13 +29,13 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
-namespace OpenSim.Region.Framework.Interfaces    
+namespace OpenSim.Region.Framework.Interfaces
 {
    /// <summary>
    /// Interface to a class that is capable of creating entities
-    /// </summary>        
+    /// </summary>
    public interface IEntityCreator
-    {        
+    {
        /// <summary>
        /// The entities that this class is capable of creating.  These match the PCode format.
        /// </summary>
@@ -51,6 +51,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="rot"></param>
        /// <param name="shape"></param>
        /// <returns>The entity created, or null if the creation failed</returns>
-        SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape);       
+        SceneObjectGroup CreateEntity(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 1ed92fb..2c906a2 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <summary>
        /// Change every item in this inventory to a new group.
        /// </summary>
-        /// <param name="groupID"></param>        
+        /// <param name="groupID"></param>
        void ChangeInventoryGroup(UUID groupID);
        /// <summary>
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="startParam"></param>
        /// <param name="postOnRez"></param>
        /// <param name="engine"></param>
-        /// <param name="stateSource"></param>        
+        /// <param name="stateSource"></param>
        void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
        /// <summary>
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <summary>
        /// Return the name with which a client can request a xfer of this prim's inventory metadata
-        /// </summary>      
+        /// </summary>
        string GetInventoryFileName();
        bool GetInventoryFileName(IClientAPI client, uint localID);
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index af54c76..7a8aba2 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
-{       
+{
    public interface IFriendsModule
    {
        /// <summary>
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// FIXME: This is somewhat too tightly coupled - it should arguably be possible to offer friendships even if the 
        /// receiving user is not currently online. 
        /// </param>
-        /// <param name="offerMessage"></param>      
+        /// <param name="offerMessage"></param>
-        void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);        
+        void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
index 02abb05..552ce01 100644
--- a/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGodsModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
-{      
+{
    /// <summary>
    /// This interface provides god related methods
    /// </summary>
@@ -53,6 +53,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="agentID">the person that is being kicked</param>
        /// <param name="kickflags">This isn't used apparently</param>
        /// <param name="reason">The message to send to the user after it's been turned into a field</param>
-        void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason);     
+        void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index 1622564..2d038ce 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -30,7 +30,7 @@ using System.IO;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.Framework.Interfaces
-{    
+{
    /// <summary>
    /// Used for the OnInventoryArchiveSaved event.
    /// </summary>
@@ -43,11 +43,11 @@ namespace OpenSim.Region.Framework.Interfaces
    public delegate void InventoryArchiveSaved(
        Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException);
    
-    public interface IInventoryArchiverModule       
+    public interface IInventoryArchiverModule
    {
        /// <summary>
        /// Fired when an archive inventory save has been completed.
-        /// </summary>        
+        /// </summary>
        event InventoryArchiveSaved OnInventoryArchiveSaved;
        
        /// <summary>
@@ -69,6 +69,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="invPath">The inventory path from which the inventory should be saved.</param>
        /// <param name="saveStream">The stream to which the inventory archive will be saved</param>
        /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
-        bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);     
+        bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 19b8574..74f404f 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// </summary>
        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Land object at the point supplied</returns>           
+        /// <returns>Land object at the point supplied</returns>
        ILandObject GetLandObject(int x, int y);
        ILandObject GetLandObject(int localID);
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// </summary>
        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Land object at the point supplied</returns>           
+        /// <returns>Land object at the point supplied</returns>
        ILandObject GetLandObject(float x, float y);
        
        bool IsLandPrimCountTainted();
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 78b5322..9ad2036 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -52,9 +52,9 @@ namespace OpenSim.Region.Framework.Interfaces
        /// This method occurs asynchronously.  If you want notification of when it has completed then subscribe to
        /// the EventManager.OnOarFileSaved event.
        /// 
-        /// <param name="savePath"></param>  
+        /// <param name="savePath"></param>
        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void ArchiveRegion(string savePath, Guid requestId);        
+        void ArchiveRegion(string savePath, Guid requestId);
        /// <summary>
        /// Archive the region to a stream.
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// settings in the archive will be ignored.
        /// </param>
        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(string loadPath, bool merge, Guid requestId);        
+        void DearchiveRegion(string loadPath, bool merge, Guid requestId);
        
        /// <summary>
        /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -109,8 +109,8 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="merge">
        /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
        /// settings in the archive will be ignored.
-        /// </param>    
+        /// </param>
        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);        
+        void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
index 41a1e51..78bd622 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
@@ -71,21 +71,21 @@ namespace OpenSim.Region.Framework.Interfaces
        /// Load persisted objects from region storage.
        /// </summary>
        /// <param name="regionUUID">the Region UUID</param>
-        /// <returns>List of loaded groups</returns>        
+        /// <returns>List of loaded groups</returns>
        List<SceneObjectGroup> LoadObjects(UUID regionUUID);
        /// <summary>
        /// Store a terrain revision in region storage
        /// </summary>
        /// <param name="ter">HeightField data</param>
-        /// <param name="regionID">region UUID</param>      
+        /// <param name="regionID">region UUID</param>
        void StoreTerrain(double[,] terrain, UUID regionID);
        
        /// <summary>
        /// Load the latest terrain revision from region storage
        /// </summary>
        /// <param name="regionID">the region UUID</param>
-        /// <returns>Heightfield data</returns>        
+        /// <returns>Heightfield data</returns>
        double[,] LoadTerrain(UUID regionID);
        void StoreLandObject(ILandObject Parcel);
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <item>delete from landaccesslist where LandUUID=globalID</item>
        /// </list>
        /// </summary>
-        /// <param name="globalID"></param>     
+        /// <param name="globalID"></param>
        void RemoveLandObject(UUID globalID);
        
        List<LandData> LoadLandObjects(UUID regionUUID);
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index bfd25d3..e7562a5 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -117,6 +117,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// </summary>
        /// <param name="grp"></param>
        /// <returns></returns>
-        string SerializeGroupToXml2(SceneObjectGroup grp);        
+        string SerializeGroupToXml2(SceneObjectGroup grp);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 3d803ee..379fabd 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -29,12 +29,12 @@ using System;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
-{       
+{
    public interface ISoundModule
    {
        void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags);
        
        void TriggerSound(
-            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle);        
+            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle);
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
index 344601f..403d542 100644
--- a/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
    public interface IVegetationModule : IEntityCreator
    {
        /// <summary>
@@ -44,6 +44,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="newTree"></param>
        /// <returns></returns>
        SceneObjectGroup AddTree(
-            UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree);        
+            UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree);
    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index a0b0888..de1bcd4 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -26,9 +26,9 @@
 */
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
    public interface IWorldMapModule
    {
-        void LazySaveGeneratedMaptile(byte[] data, bool temporary);        
+        void LazySaveGeneratedMaptile(byte[] data, bool temporary);
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 7ac1e7e..5b571c7 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Scenes
-{        
+{
    class DeleteToInventoryHolder
    {
        public DeRezAction action;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
    /// up the main client thread.
    /// </summary>
    public class AsyncSceneObjectGroupDeleter
-    {   
+    {
        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
@@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes
        /// </value>
        public bool Enabled;
        
-        private Timer m_inventoryTicker = new Timer(2000);       
+        private Timer m_inventoryTicker = new Timer(2000);
-        private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>();        
+        private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>();
-        private Scene m_scene;        
+        private Scene m_scene;
        
        public AsyncSceneObjectGroupDeleter(Scene scene)
        {
            m_scene = scene;
            
            m_inventoryTicker.AutoReset = false;
-            m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;            
+            m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
        }
        /// <summary>
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing...");
            }
-        }            
+        }
        /// <summary>
        /// Move the next object in the queue to inventory.  Then delete it properly from the scene.
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <returns></returns>
        public bool InventoryDeQueueAndDelete()
        {
-            DeleteToInventoryHolder x = null;            
+            DeleteToInventoryHolder x = null;
 
            try
            {
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes
                        
                        try
                        {
-                            m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);                            
+                            m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
                            if (x.permissionToDelete)
-                                m_scene.DeleteSceneObject(x.objectGroup, false);                            
+                                m_scene.DeleteSceneObject(x.objectGroup, false);
                        }
                        catch (Exception e)
                        {
@@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes
            m_log.Debug("[SCENE]: No objects left in inventory send queue.");
            return false;
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index 06b1d22..72d599a 100644
--- a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    if (nod.Attributes["name"] != null)
                    {
-                        string name = (string)nod.Attributes["name"].Value;                        
+                        string name = (string)nod.Attributes["name"].Value;
                        UUID id = (UUID)nod.InnerText;
                        string animState = (string)nod.Attributes["state"].Value;
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
index 1dd9613..5f2eb0d 100644
--- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
+++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes
        
        /// <summary>
-        /// Variable length strings seem to be null terminated in the animation asset..    but..   
+        /// Variable length strings seem to be null terminated in the animation asset..    but..
        /// use with caution, home grown.
        /// advances the index.
        /// </summary>
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes
                byte[] interm = new byte[endpos-i];
                for (; i<endpos; i++)
                {
-                    interm[i-startpos] = data[i];       
+                    interm[i-startpos] = data[i];
                }
                i++;  // advance past the null character
@@ -624,7 +624,7 @@ switch (jointname)
                    case "mWristLeft":
                    case "mWristRight":
                    case "mShoulderLeft":
-                    case "mShoulderRight":    
+                    case "mShoulderRight":
                        // ZYX->ZXY
                        t = y;
                        y = z;
diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 1488c5b..c6a6511 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -55,11 +55,11 @@ namespace OpenSim.Region.Framework.Scenes
        /// Creates a Border.  The line is perpendicular to the direction cardinal. 
        /// IE: if the direction cardinal is South, the line is West->East
        /// </summary>
-        /// <param name="lineStart">The starting point for the line of the border.  
+        /// <param name="lineStart">The starting point for the line of the border.
-        /// The position of an object must be greater then this for this border to trigger.  
+        /// The position of an object must be greater then this for this border to trigger.
        /// Perpendicular to the direction cardinal</param>
-        /// <param name="lineEnd">The ending point for the line of the border.  
+        /// <param name="lineEnd">The ending point for the line of the border.
-        /// The position of an object must be less then this for this border to trigger.  
+        /// The position of an object must be less then this for this border to trigger.
        /// Perpendicular to the direction cardinal</param>
        /// <param name="triggerCoordinate">The position that triggers border the border 
        /// cross parallel to the direction cardinal.  On the North cardinal, this 
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 00c99c5..27a0785 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes
            set { m_velocity = value; }
        }
-        protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f);
+        protected Quaternion m_rotation;
        public virtual Quaternion Rotation
        {
@@ -102,6 +102,14 @@ namespace OpenSim.Region.Framework.Scenes
            set { m_rotation = value; }
        }
+        protected Vector3 m_scale;
+        public virtual Vector3 Scale
+        {
+            get { return m_scale; }
+            set { m_scale = value; }
+        }
        protected uint m_localId;
        public virtual uint LocalId
@@ -115,13 +123,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public EntityBase()
        {
-            m_uuid = UUID.Zero;
+            m_rotation = Quaternion.Identity;
+            m_scale = Vector3.One;
-            m_pos = Vector3.Zero;
-            m_velocity = Vector3.Zero;
-            Rotation = Quaternion.Identity;
            m_name = "(basic entity)";
-            m_rotationalvelocity = Vector3.Zero;
        }
        /// <summary>
@@ -130,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
        public abstract void UpdateMovement();
        /// <summary>
-        /// Performs any updates that need to be done at each frame, as opposed to immediately.  
+        /// Performs any updates that need to be done at each frame, as opposed to immediately.
        /// These included scheduled updates and updates that occur due to physics processing.
        /// </summary>
        public abstract void Update();
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 504b90a..0ceef39 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    m_log.ErrorFormat("Remove Entity failed for {0}", localID, e);
                    return false;
-                }                
+                }
            }
        }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7424b24..753344d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -290,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// Guid.Empty is returned.
        /// </summary>
        public delegate void OarFileSaved(Guid guid, string message);
-        public event OarFileSaved OnOarFileSaved;        
+        public event OarFileSaved OnOarFileSaved;
        /// <summary>
        /// Called when the script compile queue becomes empty
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes
            handlerOarFileSaved = OnOarFileSaved;
            if (handlerOarFileSaved != null)
                handlerOarFileSaved(requestId, message);
-        }        
+        }
        public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)
        {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 1217f9b..d7e62a8 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                            m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
                            m_log.DebugFormat(
                                "[HGSceneCommService]: User {0} is going to another region, profile cache removed",
-                                avatar.UUID);                            
+                                avatar.UUID);
                        }
                    }
                    else
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 7c02f9a..73f918e 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes
    
                                      
    public class RegionStatsHandler : IStreamedRequestHandler
-    {        
+    {
        private string osRXStatsURI = String.Empty;
        private string osXStatsURI = String.Empty;
        //private string osSecret = String.Empty;
@@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes
        }
        public string Path
-        {   
+        {
            // This is for the region and is the regionSecret hashed
            get { return "/" + osRXStatsURI + "/"; }
        }
        
        private string Report()
-        {            
+        {
            OSDMap args = new OSDMap(30);
            //int time = Util.ToUnixTime(DateTime.Now);
            args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index eb397f6..a4460e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
                return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
            }
            else
-            {             
+            {
                InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId);
                if (agentItem == null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index fddba86..e561efb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes
                remoteClient.SendInventoryItemDetails(ownerID, item);
            }
            // else shouldn't we send an alert message?
-        }    
+        }
        
        /// <summary>
        /// Tell the client about the various child items and folders contained in the requested folder.
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Framework.Scenes
            // TODO: This code for looking in the folder for the library should be folded back into the
            // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
-            // can be handled transparently).            
+            // can be handled transparently).
            InventoryFolderImpl fold;
            if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
            {
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes
            return contents;
-        }        
+        }
        
        /// <summary>
        /// Handle an inventory folder creation request from the client.
@@ -535,7 +535,7 @@ namespace OpenSim.Region.Framework.Scenes
                     "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}",
                     remoteClient.Name, remoteClient.AgentId);
            }
-        }      
+        }
        /// <summary>
        /// Handle a client request to update the inventory folder
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
        /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
        /// and needs to be changed.
-        ///  
+        ///
        /// <param name="remoteClient"></param>
        /// <param name="folderID"></param>
        /// <param name="type"></param>
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes
                         remoteClient.Name, remoteClient.AgentId);
                }
            }
-        }        
+        }
        
        public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
        {
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID);
            }
-        }      
+        }
        /// <summary>
        /// This should delete all the items and folders in the given directory.
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message);
            }
-        }        
+        }
        private void PurgeFolderAsync(UUID userID, UUID folderID)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 226ec15..d01cef7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="invType"></param>
        /// <param name="objectID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID)
        {
            CreateObjectInventoryHandler handler = OnCreateObjectInventory;
@@ -856,7 +856,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        /// <param name="invType"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        public bool CanCreateUserInventory(int invType, UUID userID)
        {
            CreateUserInventoryHandler handler = OnCreateUserInventory;
@@ -877,7 +877,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        public bool CanEditUserInventory(UUID itemID, UUID userID)
        {
            EditUserInventoryHandler handler = OnEditUserInventory;
@@ -891,14 +891,14 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
            return true;
-        }         
+        }
        
        /// <summary>
        /// Check whether the specified user is allowed to copy the given inventory item from their own inventory.
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        public bool CanCopyUserInventory(UUID itemID, UUID userID)
        {
            CopyUserInventoryHandler handler = OnCopyUserInventory;
@@ -912,14 +912,14 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
            return true;
-        }         
+        }
        
        /// <summary>
        /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
        /// </summary>
        /// <param name="itemID"></param>
        /// <param name="userID"></param>
-        /// <returns></returns>         
+        /// <returns></returns>
        public bool CanDeleteUserInventory(UUID itemID, UUID userID)
        {
            DeleteUserInventoryHandler handler = OnDeleteUserInventory;
@@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
            return true;
-        }         
+        }
        
        public bool CanTeleport(UUID userID)
        {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 39f3007..0aa587e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes
                    // Loop it
                    if (m_frame == Int32.MaxValue)
-                        m_frame = 0;                   
+                        m_frame = 0;
                    otherMS = Environment.TickCount;
                    // run through all entities looking for updates (slow)
@@ -2023,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes
                                return true;
                        }
                        break;
-                    case Cardinals.W:                     
+                    case Cardinals.W:
                        foreach (Border b in WestBorders)
                        {
                            if (b.TestCross(position))
                                return true;
-                        }                       
+                        }
                        break;
                }
            }
@@ -2305,8 +2305,8 @@ namespace OpenSim.Region.Framework.Scenes
                                "to avatar {0} at position {1}",
                                sp.UUID.ToString(), grp.AbsolutePosition);
                        AttachObject(sp.ControllingClient,
-                                grp.LocalId, (uint)0,
+                                grp.LocalId, 0,
-                                grp.GroupRotation,
+                                grp.Rotation,
                                grp.AbsolutePosition, false);
                        RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                        grp.SendGroupFullUpdate();
@@ -3270,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes
                    m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
                                     agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
                    //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName);
-                    return false;    
+                    return false;
                }
            }
@@ -3419,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// We've got an update about an agent that sees into this region, 
        /// send it to ScenePresence for processing  It's the full data.
        /// </summary>
-        /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.  
+        /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
        /// Appearance, animations, position, etc.</param>
        /// <returns>true if we handled it.</returns>
        public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 2af98cc..0ac4ed4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <value>
        /// Registered classes that are capable of creating entities.
        /// </value>
-        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();                
+        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
        /// <summary>
        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes
            _primAllocateMutex.ReleaseMutex();
            return myID;
-        }        
+        }
        
        #region Module Methods
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
        /// </summary>
-        /// <param name="showParams">What to show</param>        
+        /// <param name="showParams">What to show</param>
        public virtual void Show(string[] showParams)
        {
            switch (showParams[0])
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                    break;
            }
-        }        
+        }
        public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
        {
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0c471aa..54ac792 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes
            ScenePresence sp;
            
            lock (ScenePresences)
-            {                
+            {
                ScenePresences.TryGetValue(agentID, out sp);
            }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 0019b23..1d4efd0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void SaveCurrentSceneToXml(string filename)
        {
            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                serialiser.SavePrimsToXml(CurrentOrFirstScene, filename);
        }
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset)
        {
            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset);
        }
@@ -216,14 +216,14 @@ namespace OpenSim.Region.Framework.Scenes
        public void SaveCurrentSceneToXml2(string filename)
        {
            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)            
+            if (serialiser != null)
                serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
        }
        public void SaveNamedPrimsToXml2(string primName, string filename)
        {
            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)               
+            if (serialiser != null)
                serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename);
        }
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void LoadCurrentSceneFromXml2(string filename)
        {
            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)              
+            if (serialiser != null)
                serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
        }
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void LoadArchiveToCurrentScene(string filename)
        {
            IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>();
-            if (archiver != null)            
+            if (archiver != null)
                archiver.DearchiveRegion(filename);
        }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ad5d56f..6807e1b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// Is this scene object acting as an attachment?
        /// 
        /// We return false if the group has already been deleted.
-        ///  
+        ///
        /// TODO: At the moment set must be done on the part itself.  There may be a case for doing it here since I
        /// presume either all or no parts in a linkset can be part of an attachment (in which
        /// case the value would get proprogated down into all the descendent parts).
@@ -204,9 +204,22 @@ namespace OpenSim.Region.Framework.Scenes
            get { return m_parts.Count; }
        }
-        public Quaternion GroupRotation
+        public override Quaternion Rotation
        {
            get { return m_rootPart.RotationOffset; }
+            set { m_rootPart.RotationOffset = value; }
+        }
+        public override Vector3 Scale
+        {
+            get { return m_rootPart.Scale; }
+            set { m_rootPart.Scale = value; }
+        }
+        public override Vector3 Velocity
+        {
+            get { return m_rootPart.Velocity; }
+            set { m_rootPart.Velocity = value; }
        }
        public UUID GroupID
@@ -263,7 +276,7 @@ namespace OpenSim.Region.Framework.Scenes
                if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
                    || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 
                    && !IsAttachmentCheckFull())
-                {                                       
+                {
                    m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
                }
@@ -454,7 +467,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="scene"></param>
        public void AttachToScene(Scene scene)
        {
-            m_scene = scene;                        
+            m_scene = scene;
            RegionHandle = m_scene.RegionInfo.RegionHandle;
            if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0)
@@ -479,9 +492,9 @@ namespace OpenSim.Region.Framework.Scenes
                //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
            }
            
-            ApplyPhysics(m_scene.m_physicalPrim);            
+            ApplyPhysics(m_scene.m_physicalPrim);
            
-            ScheduleGroupForFullUpdate();            
+            ScheduleGroupForFullUpdate();
        }
        public Vector3 GroupScale()
@@ -528,7 +541,7 @@ namespace OpenSim.Region.Framework.Scenes
                    // Temporary commented to stop compiler warning
                    //Vector3 partPosition =
                    //    new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z);
-                    Quaternion parentrotation = GroupRotation;
+                    Quaternion parentrotation = Rotation;
                    // Telling the prim to raytrace.
                    //EntityIntersection inter = part.TestIntersection(hRay, parentrotation);
@@ -1037,12 +1050,12 @@ namespace OpenSim.Region.Framework.Scenes
            m_rootPart = part;
            if (!IsAttachment)
                part.ParentID = 0;
-            part.LinkNum = 0;           
+            part.LinkNum = 0;
            
            // No locking required since the SOG should not be in the scene yet - one can't change root parts after
            // the scene object has been attached to the scene
            m_parts.Add(m_rootPart.UUID, m_rootPart);
-        }        
+        }
        /// <summary>
        /// Add a new part to this scene object.  The part must already be correctly configured.
@@ -1160,7 +1173,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Delete this group from its scene and tell all the scene presences about that deletion.
-        /// </summary>        
+        /// </summary>
        /// <param name="silent">Broadcast deletions to all clients.</param>
        public void DeleteGroup(bool silent)
        {
@@ -1267,11 +1280,11 @@ namespace OpenSim.Region.Framework.Scenes
                        if (part.LocalId != m_rootPart.LocalId)
                        {
                            part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
-                        }                                                  
+                        }
-                    }    
+                    }
                    
                    // Hack to get the physics scene geometries in the right spot
-                    ResetChildPrimPhysicsPositions();                     
+                    ResetChildPrimPhysicsPositions();
                }
                else
                {
@@ -1494,7 +1507,7 @@ namespace OpenSim.Region.Framework.Scenes
            List<SceneObjectPart> partList;
            lock (m_parts)
-            {                
+            {
                partList = new List<SceneObjectPart>(m_parts.Values);
            }
            
@@ -1744,7 +1757,7 @@ namespace OpenSim.Region.Framework.Scenes
                        rootpart.PhysActor.PIDHoverActive = false;
                    }
                }
-            }            
+            }
        }
        /// <summary>
@@ -1871,14 +1884,17 @@ namespace OpenSim.Region.Framework.Scenes
                checkAtTargets();
-                if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
+                Quaternion rot = Rotation;
-                    || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
-                    || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1)
+                if (UsePhysics &&
-                    || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)))
+                      ((Math.Abs(lastPhysGroupRot.W - rot.W) > 0.1f)
+                    || (Math.Abs(lastPhysGroupRot.X - rot.X) > 0.1f)
+                    || (Math.Abs(lastPhysGroupRot.Y - rot.Y) > 0.1f)
+                    || (Math.Abs(lastPhysGroupRot.Z - rot.Z) > 0.1f)))
                {
                    m_rootPart.UpdateFlag = 1;
-                    lastPhysGroupRot = GroupRotation;
+                    lastPhysGroupRot = rot;
                }
                foreach (SceneObjectPart part in m_parts.Values)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index cce45fe..ea6bc9c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
 namespace OpenSim.Region.Framework.Scenes
-{       
+{
    #region Enumerations
    [Flags]
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
        public UUID FromItemID = UUID.Zero;
               
        /// <value>
-        /// The UUID of the user inventory item from which this object was rezzed if this is a root part.  
+        /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
        /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item.
        /// </value>
        private UUID m_fromUserInventoryItemID = UUID.Zero;
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
        public IEntityInventory Inventory
        {
            get { return m_inventory; }
-        }       
+        }
        protected SceneObjectPartInventory m_inventory;
        [XmlIgnore]
@@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes
            RotationOffset = rotationOffset;
            Velocity = new Vector3(0, 0, 0);
            AngularVelocity = new Vector3(0, 0, 0);
-            Acceleration = new Vector3(0, 0, 0);          
+            Acceleration = new Vector3(0, 0, 0);
            m_TextureAnimation = new byte[0];
-            m_particleSystem = new byte[0];            
+            m_particleSystem = new byte[0];
            // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
            // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// A relic from when we we thought that prims contained folder objects. In 
-        /// reality, prim == folder  
+        /// reality, prim == folder
        /// Exposing this is not particularly good, but it's one of the least evils at the moment to see
        /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
        /// </summary>
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <value>
        /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes
-        /// </value>        
+        /// </value>
        public TaskInventoryDictionary TaskInventory
        {
            get { return m_inventory.Items; }
@@ -3386,7 +3386,7 @@ if (m_shape != null) {
                }
                else
                {
-                    IsPhantom = false;  
+                    IsPhantom = false;
                    // If volumedetect is active we don't want phantom to be applied.
                    // If this is a new call to VD out of the state "phantom"
                    // this will also cause the prim to be visible to physics
@@ -3484,7 +3484,7 @@ if (m_shape != null) {
                }
                else // it already has a physical representation
                {
-                    pa.IsPhysical = UsePhysics;                    
+                    pa.IsPhysical = UsePhysics;
                    DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
                    if (m_parentGroup != null)
@@ -3775,7 +3775,7 @@ if (m_shape != null) {
        public override string ToString()
        {
            return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup);
-        }        
+        }
        #endregion Public Methods
@@ -3823,11 +3823,11 @@ if (m_shape != null) {
            _everyoneMask &= _nextOwnerMask;
            Inventory.ApplyNextOwnerPermissions();
-        }        
+        }
        public bool CanBeDeleted()
        {
            return Inventory.CanBeDeleted();
        }
-    }        
+    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 76bcd7e..098e010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void ForceInventoryPersistence()
        {
            HasInventoryChanged = true;
-        }                
+        }
        /// <summary>
        /// Reset UUIDs for all the items in the prim's inventory.  This involves either generating
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Change every item in this inventory to a new group.
        /// </summary>
-        /// <param name="groupID"></param>        
+        /// <param name="groupID"></param>
        public void ChangeInventoryGroup(UUID groupID)
        {
            lock (Items)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 286b7ca..66fefa3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes
            // Moved this from SendInitialData to ensure that m_appearance is initialized
            // before the inventory is processed in MakeRootAgent. This fixes a race condition
            // related to the handling of attachments
-            //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);            
+            //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
            if (m_scene.TestBorderCross(pos, Cardinals.E))
            {
                Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes
            if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
            {
                StandUp();
-            }                       
+            }
            // Check if Client has camera in 'follow cam' or 'build' mode.
            Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
 //                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
 //                    m_log.DebugFormat(
-//                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);                    
+//                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
                    
                    AddNewMovement(agent_control_v3, q);
@@ -2306,14 +2306,14 @@ namespace OpenSim.Region.Framework.Scenes
        /// Rotate the avatar to the given rotation and apply a movement in the given relative vector
        /// </summary>
        /// <param name="vec">The vector in which to move.  This is relative to the rotation argument</param>
-        /// <param name="rotation">The direction in which this avatar should now face.        
+        /// <param name="rotation">The direction in which this avatar should now face.
        public void AddNewMovement(Vector3 vec, Quaternion rotation)
        {
            if (m_isChildAgent)
            {
                m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!");
-                // we have to reset the user's child agent connections.  
+                // we have to reset the user's child agent connections.
                // Likely, here they've lost the eventqueue for other regions so border 
                // crossings will fail at this point unless we reset them.
@@ -2649,7 +2649,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// Tell the client for this scene presence what items it should be wearing now
        /// </summary>
        public void SendWearables()
-        {   
+        {
            ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
        }
@@ -3175,7 +3175,7 @@ namespace OpenSim.Region.Framework.Scenes
                    else
                    {
                        wears[i++] = UUID.Zero;
-                        wears[i++] = UUID.Zero;                        
+                        wears[i++] = UUID.Zero;
                    }
                }
                cAgent.Wearables = wears;
@@ -3487,7 +3487,7 @@ namespace OpenSim.Region.Framework.Scenes
        public bool HasAttachments()
        {
-            return m_attachments.Count > 0;   
+            return m_attachments.Count > 0;
        }
        public bool HasScriptedAttachments()
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index fe74158..f7544ac 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                    "[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
                return null;
            }
-        }      
+        }
        /// <summary>
        /// Serialize a scene object to the original xml format
        /// </summary>
        /// <param name="sceneObject"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
        public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject)
        {
            using (StringWriter sw = new StringWriter())
@@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                return sw.ToString();
            }
-        }                
+        }
        /// <summary>
        /// Serialize a scene object to the original xml format
        /// </summary>
        /// <param name="sceneObject"></param>
-        /// <returns></returns>            
+        /// <returns></returns>
        public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer)
        {
            //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name);
@@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
                return null;
            }
-        }         
+        }
        /// <summary>
        /// Serialize a scene object to the 'xml2' format.
        /// </summary>
        /// <param name="sceneObject"></param>
-        /// <returns></returns>               
+        /// <returns></returns>
        public static string ToXml2Format(SceneObjectGroup sceneObject)
        {
            using (StringWriter sw = new StringWriter())
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
        /// Serialize a scene object to the 'xml2' format.
        /// </summary>
        /// <param name="sceneObject"></param>
-        /// <returns></returns>          
+        /// <returns></returns>
        public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer)
        {
            //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name);
@@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            writer.WriteEndElement(); // End of SceneObjectGroup
            //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time);
-        }   
+        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 7fa1b8c..cf0f345 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            }
            SavePrimListToXml2(primList, fileName);
-        }        
+        }
        public static void SavePrimListToXml2(List<EntityBase> entityList, string fileName)
        {
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 7f44bf1..ee288b3 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Framework.Scenes
        {
            addFrameMS(ms);
            addAgentMS(ms);
-        }        
+        }
        #endregion
    }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 3b0e77f..fc66c85 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 {
    [TestFixture, LongRunning]
    public class EntityManagerTests
-    {        
+    {
        static public Random random;
        SceneObjectGroup found;
        Scene scene = SceneSetupHelpers.SetupScene();
@@ -81,13 +81,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            Assert.That(entman.ContainsKey(obj1), Is.False);
            Assert.That(entman.ContainsKey(li1), Is.False);
-            Assert.That(entman.ContainsKey(obj2), Is.False);            
+            Assert.That(entman.ContainsKey(obj2), Is.False);
-            Assert.That(entman.ContainsKey(li2), Is.False);            
+            Assert.That(entman.ContainsKey(li2), Is.False);
        }
        [Test]
        public void T011_ThreadAddRemoveTest()
-        {   
+        {
            TestHelper.InMethod();
            // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
            
@@ -148,12 +148,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            int size = random.Next(40,80); 
            char ch ;
            for (int i=0; i<size; i++)
-            {       
+            {
                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
                name.Append(ch);
            }
            return name.ToString();
-        }        
+        }
    }
    public class NewTestThreads
@@ -179,4 +179,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            entman.Remove(sog.UUID);
        }
    }
-}    
-\ No newline at end of file
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 105446d..0ed00de 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -46,13 +46,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
    /// </summary>
    [TestFixture]
    public class SceneObjectBasicTests
-    {         
+    {
        /// <summary>
        /// Test adding an object to a scene.
        /// </summary>
        [Test, LongRunning]
        public void TestAddSceneObject()
-        {              
+        {
            TestHelper.InMethod();
            Scene scene = SceneSetupHelpers.SetupScene();
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            
            //m_log.Debug("retrievedPart : {0}", retrievedPart);
            // If the parts have the same UUID then we will consider them as one and the same
-            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));        
+            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
        }
        
        /// <summary>
@@ -72,11 +72,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        {
            TestHelper.InMethod();
            
-            TestScene scene = SceneSetupHelpers.SetupScene();         
+            TestScene scene = SceneSetupHelpers.SetupScene();
            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
            scene.DeleteSceneObject(part.ParentGroup, false);
            
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
            Assert.That(retrievedPart, Is.Null);
        }
        
@@ -115,19 +115,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        //[Test]
        //public void TestDeleteSceneObjectAsyncToUserInventory()
        //{
-        //    TestHelper.InMethod();            
+        //    TestHelper.InMethod();
-        //    //log4net.Config.XmlConfigurator.Configure();                  
+        //    //log4net.Config.XmlConfigurator.Configure();
            
        //    UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
        //    string myObjectName = "Fred";
            
-        //    TestScene scene = SceneSetupHelpers.SetupScene();                
+        //    TestScene scene = SceneSetupHelpers.SetupScene();
        //    SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName);
            
        //    Assert.That(
        //        scene.CommsManager.UserAdminService.AddUser(
        //            "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
-        //        Is.EqualTo(agentId));  
+        //        Is.EqualTo(agentId));
            
        //    IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
                                                
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index bf13607..e15dc84 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
    /// <summary>
    /// Linking tests
    /// </summary>
-    [TestFixture]    
+    [TestFixture]
    public class SceneObjectLinkingTests
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -174,13 +174,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            // Link grp4 to grp3.
            grp3.LinkToGroup(grp4);
            
-            // At this point we should have 4 parts total in two groups.            
+            // At this point we should have 4 parts total in two groups.
            Assert.That(grp1.Children.Count == 2);
            Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
-            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");            
+            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");
            Assert.That(grp3.Children.Count == 2);
            Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
-            Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");            
+            Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");
            
            if (debugtest)
            {
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
                m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
                m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
-            }            
+            }
            // Required for linking
            grp1.RootPart.UpdateFlag = 0;
@@ -253,6 +253,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
-        }        
+        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 1c9bce4..8a27b7b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
    public class SceneTests
    {
        private class FakeStorageManager : StorageManager
-        {            
+        {
            private class FakeRegionDataStore : IRegionDataStore
            {
                public void Initialise(string filename)
-                {                    
+                {
                }
                public void Dispose()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 751c1cd..b46eb8e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 {
    /// <summary>
    /// Teleport tests in a standalone OpenSim
-    /// </summary>    
+    /// </summary>
    [TestFixture]
    public class StandaloneTeleportTests
    {
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        /// </summary>
        /// Does not yet do what is says on the tin.
        /// Commenting for now
-        //[Test, LongRunning]        
+        //[Test, LongRunning]
        public void TestSimpleNotNeighboursTeleport()
        {
            TestHelper.InMethod();
diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 21cda09..213e954 100644
--- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
    {
        private Queue<SceneObjectPart> m_queue;
-        private List<UUID> m_ids;
+        private Dictionary<UUID, bool> m_ids;
        private object m_syncObject = new object();
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
        public UpdateQueue()
        {
            m_queue = new Queue<SceneObjectPart>();
-            m_ids = new List<UUID>();
+            m_ids = new Dictionary<UUID, bool>();
        }
        public void Clear()
@@ -66,9 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Types
        {
            lock (m_syncObject)
            {
-                if (!m_ids.Contains(part.UUID))
+                if (!m_ids.ContainsKey(part.UUID)) {
-                {
+                    m_ids.Add(part.UUID, true);
-                    m_ids.Add(part.UUID);
                    m_queue.Enqueue(part);
                }
            }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index f449e18..525a93a 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes
 {
    /// <summary>
    /// Gather uuids for a given entity.
-    /// </summary>        
+    /// </summary>
    ///
    /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts
    /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc.  Assets
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// 
        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
        /// <param name="assetType">The type of the asset for the uuid given</param>
-        /// <param name="assetUuids">The assets gathered</param>        
+        /// <param name="assetUuids">The assets gathered</param>
        public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, int> assetUuids)
        {
            assetUuids[assetUuid] = 1;
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
                    
                    // If the prim is a sculpt then preserve this information too
                    if (part.Shape.SculptTexture != UUID.Zero)
-                        assetUuids[part.Shape.SculptTexture] = 1;                    
+                        assetUuids[part.Shape.SculptTexture] = 1;
                    
                    TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
                    
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
        
        /// <summary>
        /// The callback made when we request the asset for an object from the asset service.
-        /// </summary>        
+        /// </summary>
        protected void AssetReceived(string id, Object sender, AssetBase asset)
        {
            lock (this)
@@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
            AssetBase assetBase = GetAsset(wearableAssetUuid);
            if (null != assetBase)
-            {            
+            {
                //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
                AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data);
                wearableAsset.Decode();
@@ -275,6 +275,6 @@ namespace OpenSim.Region.Framework.Scenes
                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
                GatherAssetUuids(sog, assetUuids);
            }
-        }       
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 4a2d7b5..605645b 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -601,7 +601,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
                if (names.Length > 1)
                    return names[1];
                return names[0];
-            }            
+            }
        }
        public IScene Scene
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index c49d942..773507c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
            {
                m_log.DebugFormat("[IRC-Region {0}] dropping message {1} on channel {2}", Region, msg, msg.Channel);
                return;
-            }                
+            }
            ScenePresence avatar = null;
            string fromName = msg.From;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
index 9ba09ed..46ad30f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
@@ -97,8 +97,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                   </document>", Context, Realm);
            }
             
-            return response;   
+            return response;
-        }    
+        }
    }
    
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index 5d90a8f..17cdf74 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     {
                         response = HandleRegister(Context, Realm, request);
                     } 
-                     else if (sipAuthMethod == "INVITE")  
+                     else if (sipAuthMethod == "INVITE")
                     {
                          response = HandleInvite(Context, Realm, request);
                     }
@@ -138,7 +138,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     response["str_response_string"] = "";
                 }
            }
-            return response;   
+            return response;
        }
        
        private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
@@ -309,17 +309,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                "</document>\r\n", 
                domain, Context); 
             
-            return response;    
+            return response;
-        }    
+        }
        
 //        private Hashtable HandleLoadNetworkLists(Hashtable request)
 //        {
 //            m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called");
-//            
+//
 //            // TODO the password we return needs to match that sent in the request, this is hard coded for now
 //            string domain = (string) request["domain"];
-//            
+//
 //            Hashtable response = new Hashtable();
 //            response["content_type"] = "text/xml";
 //            response["keepalive"] = false;
@@ -340,9 +340,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 //                    "</section>\r\n" +
 //                "</document>\r\n",
 //                domain); 
-//         
+//
-//             
+//
-//            return response;    
+//            return response;
-//        }       
+//        }
    }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index febb491..cb76200 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                m_log.DebugFormat("[VivoxVoice] plugin initialization failed: {0}", e.ToString());
                return;
            }
-        }   
+        }
        // Called to indicate that the module has been added to the region
@@ -1144,7 +1144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                // Otherwise prepare the request
                m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
-                HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);            
+                HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);
                HttpWebResponse rsp = null;
                // We are sending just parameters, no content
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index d5cbfd4..2e89a24 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -477,7 +477,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                            foreach (string key in binBucketOSD.Keys)
                            {
                                m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString());
-                            }                     
+                            }
                        }
   
                        // treat as if no attachment
@@ -1261,7 +1261,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
        {
            if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
-            // TODO: Probably isn't nessesary to update every client in every scene.  
+            // TODO: Probably isn't nessesary to update every client in every scene.
            // Need to examine client updates and do only what's nessesary.
            lock (m_sceneList)
            {
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
index b5da6f7..7202601 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
                m_log.ErrorFormat(
                    "[CONTENT MANAGEMENT]: Content management thread terminating with exception.  PLEASE REBOOT YOUR SIM - CONTENT MANAGEMENT WILL NOT BE AVAILABLE UNTIL YOU DO.  Exception is {0}", 
-                    e);                                   
+                    e);
            }
        }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 52c4e03..0dc78c0 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
            {
                if (m_MetaEntityCollection.Auras.ContainsKey(((SceneObjectPart)missingPart).UUID))
                    continue;
-                newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart));                
+                newList.Add(m_MetaEntityCollection.CreateAuraForNewlyCreatedEntity((SceneObjectPart)missingPart));
            }
            m_log.Info("Number of missing objects found: " + newList.Count);
            return newList;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index bf523dd..ce50f9e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        /// </exception>
        /// <returns>AppDomain with a restricted security policy</returns>
        /// <remarks>Substantial portions of this function from: http://blogs.msdn.com/shawnfa/archive/2004/10/25/247379.aspx
-        /// Valid permissionSetName values are:     
+        /// Valid permissionSetName values are:
        /// * FullTrust
        /// * SkipVerification
        /// * Execution
diff --git a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
index c539280..fc1c608 100644
--- a/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
        public void LoadRegion(Scene scene)
        {
            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
-            if (serialiser != null)   
+            if (serialiser != null)
            {
                serialiser.LoadPrimsFromXml2(
                    scene,
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index d4bba10..3044b17 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                this.m_maximum_scale = cp.m_maximum_scale;
                this.m_initial_scale = cp.m_initial_scale;
                this.m_rate = cp.m_rate;
-                this.m_planted = planted;  
+                this.m_planted = planted;
                this.m_trees = new List<UUID>();
            }
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index e0f856a..18d4bab 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -528,7 +528,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
        {
            // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless 
            // the values are checked, so checking below.
-            // Is there any reason that we don't do this in ScenePresence?   
+            // Is there any reason that we don't do this in ScenePresence?
            // The only physics engine that benefits from it in the physics plugin is this one
            if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize ||
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
            if (iPropertiesNotSupportedDefault == 0)
            {
-#if SPAM              
+#if SPAM
                m_log.Warn("NonMesh");
 #endif
                return false;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index ce52744..7130a3e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Manager
            plugHard = new ZeroMesherPlugin();
            _MeshPlugins.Add(plugHard.GetName(), plugHard);
            
-            m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName());            
+            m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName());
        }
        /// <summary>
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 8a07f71..6dd26bb 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -178,12 +178,12 @@ namespace OpenSim.Region.Physics.Manager
        }
        /// <summary>
-        /// Queue a raycast against the physics scene.  
+        /// Queue a raycast against the physics scene.
        /// The provided callback method will be called when the raycast is complete
        /// 
        /// Many physics engines don't support collision testing at the same time as 
        /// manipulating the physics scene, so we queue the request up and callback 
-        /// a custom method when the raycast is complete.  
+        /// a custom method when the raycast is complete.
        /// This allows physics engines that give an immediate result to callback immediately
        /// and ones that don't, to callback when it gets a result back.
        /// 
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
index 97f66d3..532e55e 100644
--- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs
+++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager
        BANKING_TIMESCALE = 40,
        REFERENCE_FRAME = 44
-    }   
+    }
    [Flags]
    public enum VehicleFlag
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index d9f4951..c8ae229 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                        mono [0x81d28b6]
                        mono [0x81ea2c6]
                        /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
-                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]             
+                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
             */
            // Exclude heightfield geom
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 94223d8..0769c90 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2536,7 +2536,7 @@ namespace OpenSim.Region.Physics.OdePlugin
            if (iPropertiesNotSupportedDefault == 0)
            {
-#if SPAM              
+#if SPAM
                m_log.Warn("NonMesh");
 #endif
                return false;
@@ -3334,7 +3334,7 @@ namespace OpenSim.Region.Physics.OdePlugin
        {
            // this._heightmap[i] = (double)heightMap[i];
            // dbm (danx0r) -- creating a buffer zone of one extra sample all around
-            //_origheightmap = heightMap;    
+            //_origheightmap = heightMap;
           
            float[] _heightmap;
@@ -3520,16 +3520,16 @@ namespace OpenSim.Region.Physics.OdePlugin
                                d.GeomDestroy(g);
                                //removingHeightField = new float[0];
-                            }                            
+                            }
                        }
                    }
                    else
                    {
                        m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine.  Region has inconsistant data.");
                    }
-                }                
+                }
            }
-        }       
+        }
        public override void SetWaterLevel(float baseheight)
        {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 569009e..0feb967 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
                m_log.ErrorFormat(
                    "[{0}]: Event queue thread terminating with exception.  PLEASE REBOOT YOUR SIM - SCRIPT EVENTS WILL NOT WORK UNTIL YOU DO.  Exception is {1}", 
-                    ScriptEngineName, e);                
+                    ScriptEngineName, e);
            }
        }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 8ad916c..3c91b29 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
        {
            InstanceData id = m_ScriptManager.GetScript(localID, itemID);
            if (id == null)
-                return;        
+                return;
            if (!id.Disabled)
                id.Running = true;
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
        {
            InstanceData id = m_ScriptManager.GetScript(localID, itemID);
            if (id == null)
-                return;        
+                return;
            
            id.Running = false;
        }
@@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
            InstanceData id = m_ScriptManager.GetScript(localID, itemID);
            if (id == null)
-                return;        
+                return;
            IEventQueue eq = World.RequestModuleInterface<IEventQueue>();
            if (eq == null)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 9c1cd4d..6ac209e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -520,13 +520,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                ExeStage = 5;           //        ;^) Ewe Loon, for debuging
            }
            catch (Exception e)         //        ;^) Ewe Loon, From here down tis fix
-            {                          
+            {
                if ((ExeStage == 3)&&(qParams.Length>0))
                    detparms.Remove(id);
                SceneObjectPart ob = m_scriptEngine.World.GetSceneObjectPart(localID);
                m_log.InfoFormat("[Script Error] ,{0},{1},@{2},{3},{4},{5}", ob.Name , FunctionName, ExeStage, e.Message, qParams.Length, detparms.Count);
                if (ExeStage != 2) throw e;
-            }            
+            }
        }
        public uint GetLocalID(UUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0bd6546..bf83a49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2007,10 +2007,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
                    }
                    else
-                        q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
+                        q = part.ParentGroup.Rotation; // Likely never get here but just in case
                }
                else
-                    q = part.ParentGroup.GroupRotation; // just the group rotation
+                    q = part.ParentGroup.Rotation; // just the group rotation
                return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
            }
            q = part.GetWorldRotation();
@@ -7181,10 +7181,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    else
                        q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
                else
-                    q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case
+                    q = m_host.ParentGroup.Rotation; // Likely never get here but just in case
            }
            else
-                q = m_host.ParentGroup.GroupRotation; // just the group rotation
+                q = m_host.ParentGroup.Rotation; // just the group rotation
            return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
        }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index d0df390..8dcb1f5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            return m_OSSL_Functions.osWindActiveModelPluginName();
        }
       
-// Not yet plugged in as available OSSL functions, so commented out        
+// Not yet plugged in as available OSSL functions, so commented out
 //        void osWindParamSet(string plugin, string param, float value)
 //        {
 //            m_OSSL_Functions.osWindParamSet(plugin, param, value);
@@ -329,7 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        
        public string osGetSimulatorVersion()
        {
-           return m_OSSL_Functions.osGetSimulatorVersion();    
+           return m_OSSL_Functions.osGetSimulatorVersion();
        }
        
        public Hashtable osParseJSON(string JSON)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 4855d64..84ccafe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -218,16 +218,14 @@ namespace OpenSim.Region.ScriptEngine.Shared
                }
            }
-            Position = new LSL_Types.Vector3(part.AbsolutePosition.X,
+            Vector3 absPos = part.AbsolutePosition;
-                                             part.AbsolutePosition.Y,
+            Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z);
-                                             part.AbsolutePosition.Z);
-            Quaternion wr = part.ParentGroup.GroupRotation;
+            Quaternion wr = part.ParentGroup.Rotation;
            Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
-            Velocity = new LSL_Types.Vector3(part.Velocity.X,
+            Vector3 vel = part.Velocity;
-                                             part.Velocity.Y,
+            Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z);
-                                             part.Velocity.Z);
        }
    }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 650d9fa..97166cf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                    "SecondLife.Script");
                //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);                
+                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
 //                lease.Register(this);
            }
            catch (Exception)
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                    permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
                    permsMask = part.TaskInventory[m_ItemID].PermsMask;
-                }                                        
+                }
                if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
                {
@@ -630,7 +630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
        /// <summary>
        /// Process the next event queued for this script
        /// </summary>
-        /// <returns></returns>        
+        /// <returns></returns>
        public object EventProcessor()
        {
            lock (m_Script)
@@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
        
        public override string ToString()
        {
-            return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName);   
+            return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName);
        }
        string FormatException(Exception e)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9a972c2..e695133 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -554,7 +554,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            // We must look for the part outside the m_Scripts lock because GetSceneObjectPart later triggers the
            // m_parts lock on SOG.  At the same time, a scene object that is being deleted will take the m_parts lock
-            // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript()            
+            // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript()
            SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
            if (part == null)
            {
@@ -562,7 +562,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
                m_ScriptFailCount++;
                return false;
-            }     
+            }
            TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
            if (item == null)
@@ -692,7 +692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                AppDomain.CreateDomain(
                                    m_Scene.RegionInfo.RegionID.ToString(),
                                    evidence, appSetup);
-/*                            
+/*
                            PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
                            AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
                            PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
@@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            return new XWorkItem(m_ThreadPool.QueueWorkItem(
                                     new WorkItemCallback(this.ProcessEventHandler),
                                     parms));
-        }     
+        }
        
        /// <summary>
        /// Process a previously posted script event.
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 519668a..a03cc4c 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics
            try
            {
                cnfg = config.Configs["WebStats"];
-                enabled = cnfg.GetBoolean("enabled", false);                              
+                enabled = cnfg.GetBoolean("enabled", false);
            } 
            catch (Exception)
            {
@@ -137,7 +137,7 @@ namespace OpenSim.Region.UserStatistics
                m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID));
                scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket;
-            }            
+            }
        }
        public void ReceiveClassicSimStatsPacket(SimStats stats)
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
index 2db9661..3d2d9d2 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/CILCompiler.cs
@@ -179,7 +179,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers
                }
            }
-            // TODO: Process errors         
+            // TODO: Process errors
            return OutFile;
        }
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
index 3259686..afa2300 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
@@ -36,7 +36,7 @@ using OpenSim.ScriptEngine.Shared;
 namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
 {
    public class BaseClassFactory
-    {        
+    {
        public static void MakeBaseClass(ScriptStructure script)
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
index f3b1496..3c20f20 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptLoader.cs
@@ -115,7 +115,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
            script.AppDomain = FreeAppDomain.CurrentAppDomain;
            // Create instance of script
-            ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript)               
+            ScriptAssemblies.IScript mbrt = (ScriptAssemblies.IScript)
                FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(
                               script.AssemblyFileName, "ScriptAssemblies.Script");
            //, true, BindingFlags.CreateInstance, null);
diff --git a/OpenSim/Server/Base/ProtocolVersions.cs b/OpenSim/Server/Base/ProtocolVersions.cs
index 6df27b7..8db5bb6 100644
--- a/OpenSim/Server/Base/ProtocolVersions.cs
+++ b/OpenSim/Server/Base/ProtocolVersions.cs
@@ -30,7 +30,7 @@ namespace OpenSim.Server.Base
    public class ProtocolVersions
    {
        /// <value>
-        /// This is the external protocol versions.  It is separate from the OpenSimulator project version.  
+        /// This is the external protocol versions.  It is separate from the OpenSimulator project version.
        /// 
        /// These version numbers should be increased by 1 every time a code
        /// change in the Service.Connectors and Server.Handlers, espectively, 
@@ -42,7 +42,7 @@ namespace OpenSim.Server.Base
        /// 
        /// Having this version number allows the grid service to reject connections from regions running a version
        /// of the code that is too old. 
-        ///   
+        ///
        /// </value>
        
        // The range of acceptable servers for client-side connectors
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 88a905c..ebfd47a 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Services.AssetService
            AssetBase asset = Get(args[2]);
            if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                MainConsole.Instance.Output("Asset not found");
                return;
            }
@@ -195,7 +195,7 @@ namespace OpenSim.Services.AssetService
            AssetBase asset = Get(args[2]);
            if (asset == null || asset.Data.Length == 0)
-            {   
+            {
                MainConsole.Instance.Output("Asset not found");
                return;
            }
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index 3167352..7926efb 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors
            message = response.Message;
            
            return response.IsAuthorized;
-        }      
+        }
    }
 }
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 46a7f09..2290530 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces
        /// <param name="regionID"></param>
        /// <returns></returns>
        /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
-        bool DeregisterRegion(UUID regionID);   
+        bool DeregisterRegion(UUID regionID);
        /// <summary>
        /// Get information about the regions neighbouring the given co-ordinates (in meters).
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index b98e256..70c55a5 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Services.InventoryService
            m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders in folder {2}", items.Count, folders.Count, folderID);
-            return invCollection;            
+            return invCollection;
        }
        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs
index 37cbbcd..9831ea8 100644
--- a/OpenSim/Tests/Common/LongRunningAttribute.cs
+++ b/OpenSim/Tests/Common/LongRunningAttribute.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
        }
        protected LongRunningAttribute(string category) : base(category)
-        {            
+        {
        }
    }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 3981fe9..20ea18f 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Tests.Common.Mock
    /// tests are single threaded.
    /// </summary>
    public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin
-    {        
+    {
        public string Version { get { return "0"; } }
        public string Name { get { return "TestAssetDataPlugin"; } }
@@ -59,6 +59,6 @@ namespace OpenSim.Tests.Common.Mock
            assets.Add(asset);
        }
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }        
+        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs
index 81f123a..317ec06 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
            if (Assets.ContainsKey(id))
                asset = Assets[id];
            else
-                asset = null;            
+                asset = null;
            
            return asset;
        }
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock
        }
        public bool Get(string id, object sender, AssetRetrieved handler)
-        {            
+        {
            handler(id, sender, Get(id));
            
            return true;
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index de73663..013462e 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common.Mock
        public TestCommunicationsManager(NetworkServersInfo serversInfo)
            : base(serversInfo, null)
-        {                        
+        {
            LocalUserServices lus = new LocalUserServices(991, 992, this);
            lus.AddPlugin(new TemporaryUserProfilePlugin());
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index daef38b..0c7ebca 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock
        //// <value>
        /// Inventory items
        /// </value>
-        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();        
+        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();
        /// <value>
        /// User root folders
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Common.Mock
            }
            return folders;
-        }        
+        }
        public InventoryFolderBase getInventoryFolder(UUID folderId)
        {
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Mock
        public InventoryItemBase queryInventoryItem(UUID item)
        {
            return null;
-        }        
+        }
        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
    }
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index f7eda68..01b5203 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Tests.Common.Mock
-{       
+{
    /// <summary>
    /// Land channel for test purposes
    /// </summary>
@@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common.Mock
        public List<ILandObject> ParcelsNearPoint(Vector3 position) { return null; }
        public List<ILandObject> AllParcels() { return null; }
        public ILandObject GetLandObject(int x, int y) { return null; }
-        public ILandObject GetLandObject(int localID) { return null; }        
+        public ILandObject GetLandObject(int localID) { return null; }
        public ILandObject GetLandObject(float x, float y) { return null; }
        public bool IsLandPrimCountTainted() { return false; }
        public bool IsForcefulBansAllowed() { return false; }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 3fc22ba..22cfa2c 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -35,9 +35,9 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Tests.Common.Mock
-{        
+{
    public class TestScene : Scene
-    {        
+    {
        public TestScene(
            RegionInfo regInfo, AgentCircuitManager authen,
            CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common.Mock
        {
            reason = String.Empty;
            return true;
-        }        
+        }
            
        public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
        {
diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
index 3528072..7e0c567 100644
--- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
@@ -31,10 +31,10 @@ using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 namespace OpenSim.Tests.Common
-{       
+{
    /// <summary>
    /// Utility functions for carrying out user inventory related tests.
-    /// </summary>        
+    /// </summary>
    public static class UserInventoryTestUtils
    {
        public static readonly string PATH_DELIMITER = "/";
@@ -78,7 +78,7 @@ namespace OpenSim.Tests.Common
        /// </param>
        /// <returns>
        /// The folder created.  If the path contains multiple folders then the last one created is returned.
-        /// </returns>        
+        /// </returns>
        public static InventoryFolderBase CreateInventoryFolder(
            IInventoryService inventoryService, InventoryFolderBase parentFolder, string path)
        {
@@ -91,7 +91,7 @@ namespace OpenSim.Tests.Common
            if (components.Length > 1)
                return CreateInventoryFolder(inventoryService, newFolder, components[1]);
            else
-                return newFolder;            
+                return newFolder;
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index 4ad9926..3ca44a1 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -31,12 +31,12 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 namespace OpenSim.Tests.Common.Setup
-{    
+{
    /// <summary>
    /// Utility functions for carrying out user profile related tests.
    /// </summary>
    public static class UserProfileTestUtils
-    {           
+    {
        /// <summary>
        /// Create a test user with a standard inventory
        /// </summary>
@@ -51,7 +51,7 @@ namespace OpenSim.Tests.Common.Setup
        {
            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
            return CreateUserWithInventory(commsManager, userId, callback);
-        }        
+        }
        
        /// <summary>
        /// Create a test user with a standard inventory
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Setup
        /// <returns></returns>
        public static CachedUserInfo CreateUserWithInventory(
            CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
-        {                                    
+        {
            return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
        }
@@ -84,8 +84,8 @@ namespace OpenSim.Tests.Common.Setup
        public static CachedUserInfo CreateUserWithInventory(
            CommunicationsManager commsManager, string firstName, string lastName, 
            UUID userId, OnInventoryReceivedDelegate callback)
-        {                        
+        {
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;           
+            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
            lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId);
            
            CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
@@ -93,6 +93,6 @@ namespace OpenSim.Tests.Common.Setup
            userInfo.FetchInventory();
            
            return userInfo;
-        }        
+        }
    }
 }