fix merge

author: UbitUmarov 2017-01-05 19:32:57 +0000
committer: UbitUmarov 2017-01-05 19:32:57 +0000
commit: 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch)
tree: 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ClientStack/Linden
parent: Merge branch 'master' into httptests (diff)
parent: Massive tab and trailing space cleanup (diff)
download: opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz
34 files changed, 495 insertions, 491 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index aabdb51..8f65a69 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
            {
                data = new AgentPrefs(agent);
            }
-                
            if (req.ContainsKey("access_prefs"))
            {
                OSDMap accessPrefs = (OSDMap)req["access_prefs"];  // We could check with ContainsKey...
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index bbadc55..e3c430c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ClientStack.Linden
    public class AvatarPickerSearchModule : INonSharedRegionModule
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        private Scene m_scene;
        private IPeople m_People;
        private bool m_Enabled = false;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 14a4873..8cb40e1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private ModelCost m_ModelCost;
        // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
-        
        // These are callbacks which will be setup by the scene so that we can update scene data when we
        // receive capability calls
        public NewInventoryItem AddNewInventoryItem = null;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory
                                                                    // may not be visible till relog
-        
        private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!!
        private UUID m_testAssetsCreatorID = UUID.Zero;
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack.Linden
            processUpload = 3
        }
        private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle;
-        
        public BunchOfCaps(Scene scene, UUID agentID, Caps caps)
        {
            m_Scene = scene;
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.Linden
            // create a model upload cost provider
            m_ModelCost = new ModelCost(scene);
-           
            m_PrimScaleMin = m_ModelCost.PrimScaleMin;
            IConfigSource config = m_Scene.Config;
@@ -216,7 +216,7 @@ namespace OpenSim.Region.ClientStack.Linden
        public string GetNewCapPath()
        {
-            return  "/CAPS/" + UUID.Random(); 
+            return  "/CAPS/" + UUID.Random();
        }
        /// <summary>
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null);
                    m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
                }
-                
                if(m_AllowCapGroupMemberData)
                {
                    IRequestHandler GroupMemberDataHandler = new RestStreamHandler(
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ClientStack.Linden
                IRequestHandler CopyInventoryFromNotecardHandler = new RestStreamHandler(
                        "POST",  GetNewCapPath(), CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null);
                m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", CopyInventoryFromNotecardHandler);
-             
            }
            catch (Exception e)
            {
@@ -568,8 +568,8 @@ namespace OpenSim.Region.ClientStack.Linden
                    {
                        string error;
                        int modelcost;
-                        
-                        
                        if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
                            meshcostdata, out error, ref warning))
                        {
@@ -639,7 +639,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        client.SendAgentAlertMessage(warning, true);
                }
            }
-            
            string assetDes = llsdRequest.description;
            UUID newAsset = UUID.Random();
            UUID newInvItem = UUID.Random();
@@ -813,7 +813,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    List<UUID> textures = new List<UUID>();
-                   
 //                    if (doTextInv)
                        m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
@@ -895,7 +895,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        meshAvatarSkeletons.Add(curAvSkeleton);
                        meshAvatarColliders.Add(curAvCollider);
-                        // test code 
+                        // test code
                        if (curAvSkeleton && client != null)
                        {
                            string name = assetName;
@@ -1054,7 +1054,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        prim.LastOwnerID = creatorID;
                        prim.RezzerID = creatorID;
                        prim.CreationDate = Util.UnixTimeSinceEpoch();
-                        
                        if (grp == null)
                            prim.Name = assetName;
                        else
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.ClientStack.Linden
        public string GetObjectCost(string request, string path,
                string param, IOSHttpRequest httpRequest,
                IOSHttpResponse httpResponse)
-        {          
+        {
            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
            OSDMap resp = new OSDMap();
@@ -1446,7 +1446,7 @@ namespace OpenSim.Region.ClientStack.Linden
            for (int i = 0; i < object_ids.Count; i++)
            {
                UUID uuid = object_ids[i].AsUUID();
-                                
                SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
                SceneObjectGroup grp = null;
                if (part != null)
@@ -1479,7 +1479,7 @@ namespace OpenSim.Region.ClientStack.Linden
                resp[UUID.Zero.ToString()] = object_data;
            }
            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
        }
        public string ResourceCostSelected(string request, string path,
@@ -1548,7 +1548,7 @@ namespace OpenSim.Region.ClientStack.Linden
            resp["selected"] = object_data;
 //            resp["transaction_id"] = "undef";
            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
        }
        public string UpdateAgentInformation(string request, string path,
@@ -1564,7 +1564,7 @@ namespace OpenSim.Region.ClientStack.Linden
            resp["access_prefs"] = accessPrefs;
            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
+            return response;
        }
        public bool OSDMapTOVector3(OSDMap map, out Vector3 v)
@@ -1598,19 +1598,19 @@ namespace OpenSim.Region.ClientStack.Linden
            IClientAPI client = null;
            ScenePresence sp;
-           
            while(true)
            {
                if(m_Scene.GridUserService == null)
                    break;
-                    
                if(m_Scene.UserManagementModule == null)
                    break;
                m_Scene.TryGetScenePresence(m_AgentID, out sp);
                if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit)
                    break;
-                
                client = sp.ControllingClient;
                if(!m_Scene.UserManagementModule.IsLocalGridUser(m_AgentID))
@@ -1637,7 +1637,7 @@ namespace OpenSim.Region.ClientStack.Linden
                ILandObject land = m_Scene.LandChannel.GetLandObject(pos);
                if(land == null)
                    break;
-                
                ulong gpowers = client.GetGroupPowers(land.LandData.GroupID);
                SceneObjectGroup telehub = null;
                if (m_Scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    !m_Scene.Permissions.IsGod(m_AgentID) &&
                    m_AgentID != land.LandData.OwnerID && // (b) land owners can set home
                    // (c) members of the land-associated group in roles that can set home
-                    ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) && 
+                    ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) &&
                    // (d) parcels with telehubs can be the home of anyone
                    (telehub == null || !land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
                {
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden
                break;
            }
-            
            string response;
            if(fail)
@@ -1728,11 +1728,11 @@ namespace OpenSim.Region.ClientStack.Linden
                m_GroupsModule = m_Scene.RequestModuleInterface<IGroupsModule>();
                if(m_GroupsModule == null)
                    break;
-                    
                m_Scene.TryGetScenePresence(m_AgentID, out sp);
                if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit)
                    break;
-                
                client = sp.ControllingClient;
                OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
@@ -1866,12 +1866,12 @@ namespace OpenSim.Region.ClientStack.Linden
                OSDMap osdname = new OSDMap();
                if(parts[0] == "Unknown")
                {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));
                    osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2));
                }
                else
                {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));        
+                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));
                    osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1));
                }
                osdname["display_name"] = OSD.FromString(kvp.Value);
@@ -1916,7 +1916,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private string m_assetType = String.Empty;
        private int m_cost;
        private string m_error = String.Empty;
-        
        private Timer m_timeoutTimer = new Timer();
        private UUID m_texturesFolder;
        private int m_nreqtextures;
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private int m_groupMask;
        private int m_everyoneMask;
-        
        public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
                                UUID parentFolderID, string invType, string assetType, string path,
                                IHttpServer httpServer, bool dumpAssetsToFile,
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index 5b4e0da..683c3d5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ClientStack.Linden
        {
        }
-        public void Close() { } 
+        public void Close() { }
        public void AddRegion(Scene scene)
        {
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.Linden
        }
        public void PostInitialise() { }
-        #endregion 
+        #endregion
        private void OnRegisterCaps(UUID agentID, Caps caps)
        {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index fb22694..eb1ab45 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ClientStack.Linden
 {
    public struct ModelPrimLimits
    {
-        
    }
    public class ModelCost
@@ -82,9 +82,9 @@ namespace OpenSim.Region.ClientStack.Linden
        const float lowestSizeWth = 2f; // 3x
        // favor potencially physical optimized meshs versus automatic decomposition
        const float physMeshSizeWth = 6f; // counts  7x
-        const float physHullSizeWth = 8f; // counts  9x      
+        const float physHullSizeWth = 8f; // counts  9x
-        // stream cost area factors 
+        // stream cost area factors
        // more or less like SL
        const float highLodFactor = 17.36f;
        const float midLodFactor = 277.78f;
@@ -108,7 +108,7 @@ namespace OpenSim.Region.ClientStack.Linden
            PrimScaleMin = scene.m_minNonphys;
            NonPhysicalPrimScaleMax = scene.m_maxNonphys;
            PhysicalPrimScaleMax = scene.m_maxPhys;
-            ObjectLinkedPartsMax = scene.m_linksetCapacity;                 
+            ObjectLinkedPartsMax = scene.m_linksetCapacity;
        }
        public void Econfig(IConfig EconomyConfig)
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack.Linden
            bytecost = EconomyConfig.GetFloat("ModelMeshByteCost", bytecost);
        }
-        // storage for a single mesh asset cost parameters       
+        // storage for a single mesh asset cost parameters
        private class ameshCostParam
        {
            // LOD sizes for size dependent streaming cost
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ClientStack.Linden
        // resources input LLSD request
        // basicCost input region assets upload cost
        // totalcost returns model total upload fee
-        // meshcostdata returns detailed costs for viewer 
+        // meshcostdata returns detailed costs for viewer
        // avatarSkeleton if mesh includes a avatar skeleton
        // useAvatarCollider if we should use physics mesh for avatar
        public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost,
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.Linden
            error = string.Empty;
            bool avatarSkeleton = false;
-            
            if (resources == null ||
                resources.instance_list == null ||
                resources.instance_list.Array.Count == 0)
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack.Linden
            if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0)
            {
                numberMeshs = resources.mesh_list.Array.Count;
-                
                for (int i = 0; i < numberMeshs; i++)
                {
                    ameshCostParam curCost = new ameshCostParam();
@@ -230,7 +230,7 @@ namespace OpenSim.Region.ClientStack.Linden
            }
            // instances (prims) cost
-            
            int mesh;
            int skipedSmall = 0;
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ClientStack.Linden
            // breakdown prices
            // don't seem to be in use so removed code for now
-            
            return true;
        }
@@ -404,7 +404,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    int sksize = tmpmap["size"].AsInteger();
                    if(sksize > 0)
                        skeleton = true;
-                }               
+                }
            }
            if (map.ContainsKey("physics_convex"))
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.Linden
            }
            submesh_offset = -1;
-            
            // only look for LOD meshs sizes
            if (map.ContainsKey("high_lod"))
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ClientStack.Linden
            cost.physicsCost = 0.04f * phys_hullsvertices;
            float sfee;
-            
            sfee = data.Length; // start with total compressed data size
            // penalize lod meshs that should be more builder optimized
@@ -535,7 +535,7 @@ namespace OpenSim.Region.ClientStack.Linden
            // bytes to money
            sfee *= bytecost;
-           
            cost.costFee = sfee;
            return true;
        }
@@ -675,7 +675,7 @@ namespace OpenSim.Region.ClientStack.Linden
            return true;
        }
-        // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length 
+        // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length
        private float streamingCost(ameshCostParam curCost, float sqdiam)
        {
            // compute efective areas
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 11e8075..aced734 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -74,12 +74,12 @@ namespace OpenSim.Region.ClientStack.Linden
        private const int SERVER_EQ_TIME_NO_EVENTS = VIEWER_TIMEOUT - (10 * 1000);
        protected Scene m_scene;
-        
        private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
        private Dictionary<UUID, Queue<OSD>> queues = new Dictionary<UUID, Queue<OSD>>();
        private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
-            
        #region INonSharedRegionModule methods
        public virtual void Initialise(IConfigSource config)
        {
@@ -170,7 +170,7 @@ namespace OpenSim.Region.ClientStack.Linden
                foreach (KeyValuePair<UUID, Queue<OSD>> kvp in queues)
                {
                    MainConsole.Instance.OutputFormat(
-                        "For agent {0} there are {1} messages queued for send.", 
+                        "For agent {0} there are {1} messages queued for send.",
                        kvp.Key, kvp.Value.Count);
                }
            }
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden
                {
                    if (DebugLevel > 0)
                        m_log.DebugFormat(
-                            "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
+                            "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}",
                            agentId, m_scene.RegionInfo.RegionName);
                    queues[agentId] = new Queue<OSD>();
@@ -238,13 +238,13 @@ namespace OpenSim.Region.ClientStack.Linden
                            "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}",
                            avatarID, evMap["message"], m_scene.Name);
                }
-            } 
+            }
            catch (NullReferenceException e)
            {
                m_log.Error("[EVENTQUEUE] Caught exception: " + e);
                return false;
            }
-            
            return true;
        }
@@ -309,10 +309,10 @@ namespace OpenSim.Region.ClientStack.Linden
                    // push markers to handle old responses still waiting
                    // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe 
+                    // even being a new queue better be safe
                    queue.Enqueue(null);
                    queue.Enqueue(null); // one should be enough
-                    
                    lock (m_AvatarQueueUUIDMapping)
                    {
                        eventQueueGetUUID = UUID.Random();
@@ -336,7 +336,7 @@ namespace OpenSim.Region.ClientStack.Linden
                {
                    // push markers to handle old responses still waiting
                    // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe 
+                    // even being a new queue better be safe
                    queue.Enqueue(null);
                    queue.Enqueue(null); // one should be enough
@@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden
        }
        public void Drop(UUID requestID, UUID pAgentId)
        {
-            // do nothing for now, hope client close will do it        
+            // do nothing for now, hope client close will do it
        }
        public Hashtable GetEvents(UUID requestID, UUID pAgentId)
@@ -437,7 +437,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    negativeID = true;
                    thisID = -thisID;
                }
-               
                while (queue.Count > 0)
                {
                    element = queue.Dequeue();
@@ -477,7 +477,7 @@ namespace OpenSim.Region.ClientStack.Linden
            // if there where no elements before a marker send a NoEvents
            if (array.Count == 0)
                return NoEvents(requestID, pAgentId);
-          
            Hashtable responsedata = new Hashtable();
            responsedata["int_response_code"] = 200;
            responsedata["content_type"] = "application/xml";
@@ -500,7 +500,7 @@ namespace OpenSim.Region.ClientStack.Linden
            responsedata["http_protocol_version"] = "HTTP/1.0";
            return responsedata;
        }
- 
        public void DisableSimulator(ulong handle, UUID avatarID)
        {
            OSD item = EventQueueHelper.DisableSimulator(handle);
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ClientStack.Linden
        }
        public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
-                                ulong regionHandle, int regionSizeX, int regionSizeY) 
+                                ulong regionHandle, int regionSizeX, int regionSizeY)
        {
            if (DebugLevel > 0)
                m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
@@ -528,9 +528,9 @@ namespace OpenSim.Region.ClientStack.Linden
            Enqueue(item, avatarID);
        }
-        public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+        public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess,
                                        IPEndPoint regionExternalEndPoint,
-                                        uint locationID, uint flags, string capsURL, 
+                                        uint locationID, uint flags, string capsURL,
                                        UUID avatarID, int regionSizeX, int regionSizeY)
        {
            if (DebugLevel > 0)
@@ -560,15 +560,15 @@ namespace OpenSim.Region.ClientStack.Linden
                                         uint timeStamp, bool offline, int parentEstateID, Vector3 position,
                                         uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket)
        {
-            OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, 
+            OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog,
-                                                             timeStamp, offline, parentEstateID, position, ttl, transactionID, 
+                                                             timeStamp, offline, parentEstateID, position, ttl, transactionID,
                                                             fromGroup, binaryBucket);
            Enqueue(item, toAgent);
            //m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item);
        }
-        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat,
                                                      bool isModerator, bool textMute, bool isEnterorLeave)
        {
            OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 5e0bd71..e1e88ae 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.Linden
            return BuildEvent("DisableSimulator", llsdBody);
        }
-        
        public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                                      IPEndPoint newRegionExternalEndPoint,
                                      string capsURL, UUID agentID, UUID sessionID,
@@ -194,13 +194,13 @@ namespace OpenSim.Region.ClientStack.Linden
            script.Add("ItemID", OSD.FromUUID(itemID));
            script.Add("Running", OSD.FromBoolean(running));
            script.Add("Mono", OSD.FromBoolean(mono));
-            
            OSDArray scriptArr = new OSDArray();
            scriptArr.Add(script);
-            
            OSDMap body = new OSDMap();
            body.Add("Script", scriptArr);
-            
            return BuildEvent("ScriptRunningReply", body);
        }
@@ -243,7 +243,7 @@ namespace OpenSim.Region.ClientStack.Linden
        {
            OSDMap messageParams = new OSDMap(15);
            messageParams.Add("type", new OSDInteger((int)dialog));
-            
            OSDArray positionArray = new OSDArray(3);
            positionArray.Add(OSD.FromReal(position.X));
            positionArray.Add(OSD.FromReal(position.Y));
@@ -423,7 +423,7 @@ namespace OpenSim.Region.ClientStack.Linden
                QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID));
                QueryDataMap.Add("ProductSku", OSD.FromInteger(0));
                QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price));
-                
                QueryData.Add(QueryDataMap);
            }
            body.Add("QueryData", QueryData);
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ClientStack.Linden
        public static OSD partPhysicsProperties(uint localID, byte physhapetype,
                        float density, float friction, float bounce, float gravmod)
        {
-            
            OSDMap physinfo = new OSDMap(6);
            physinfo["LocalID"] = localID;
            physinfo["Density"] = density;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 86aeae8..b23bffc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
            TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            UUID npcId 
+            UUID npcId
                = m_npcMod.CreateNPC(
                    "John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance());
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 06ecf97..cecef0d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
    {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        private Scene m_scene;
        private IAssetService m_AssetService;
        private bool m_Enabled = true;
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private string m_URL2;
        private string m_RedirectURL = null;
        private string m_RedirectURL2 = null;
-       
        struct aPollRequest
        {
            public PollServiceMeshEventArgs thepoll;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.Linden
                return;
            m_scene = pScene;
-            
            m_assetService = pScene.AssetService;
        }
@@ -371,7 +371,7 @@ namespace OpenSim.Region.ClientStack.Linden
            {
                string capUrl = "/CAPS/" + UUID.Random() + "/";
-                // Register this as a poll service           
+                // Register this as a poll service
                PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
                args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
            private readonly Scene m_scene;
            private ThrottleOutPacketType Throttle;
            private readonly UUID User;
-            
            public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
            {
                ThrottleBytes = pBytes;
@@ -450,7 +450,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    // Normal
                    if (BytesSent <= ThrottleBytes)
                    {
-                        BytesSent += response.bytes;                     
+                        BytesSent += response.bytes;
                        return true;
                    }
                    else
@@ -460,7 +460,7 @@ namespace OpenSim.Region.ClientStack.Linden
                }
                return haskey;
            }
-           
            public void ProcessTime()
            {
                PassTime();
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 15c0967..c9f3b7e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ClientStack.Linden
                new OpenMetaverse.BlockingQueue<aPollRequest>();
        private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
-   
        private string m_Url = "localhost";
        #region ISharedRegionModule Members
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ClientStack.Linden
        }
        private int ExtractImageThrottle(byte[] pthrottles)
        {
-       
            byte[] adjData;
            int pos = 0;
@@ -195,10 +195,10 @@ namespace OpenSim.Region.ClientStack.Linden
            if(m_NumberScenes <= 0 && m_workerThreads != null)
            {
                m_log.DebugFormat("[GetTextureModule] Closing");
-                
                foreach (Thread t in m_workerThreads)
                    Watchdog.AbortThread(t.ManagedThreadId);
-            
                m_queue.Clear();
            }
        }
@@ -269,7 +269,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    reqinfo.reqID = x;
                    reqinfo.request = y;
                    reqinfo.send503 = false;
-                    
                    lock (responses)
                    {
                        if (responses.Count > 0)
@@ -339,7 +339,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        Hashtable headers = new Hashtable();
                        headers["Retry-After"] = 30;
                        response["headers"] = headers;
-                   
                        responses[requestID] = new aPollResponse() {bytes = 0, response = response};
                        return;
@@ -355,13 +355,13 @@ namespace OpenSim.Region.ClientStack.Linden
                        response["content_type"] = "text/plain";
                        response["keepalive"] = false;
                        response["reusecontext"] = false;
-                    
                        responses[requestID] = new aPollResponse() {bytes = 0, response = response};
                        return;
                    }
                }
-                        
                response = m_getTextureHandler.Handle(requestinfo.request);
                lock (responses)
@@ -398,16 +398,16 @@ namespace OpenSim.Region.ClientStack.Linden
            {
                string capUrl = "/CAPS/" + UUID.Random() + "/";
-                // Register this as a poll service           
+                // Register this as a poll service
                PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
-                
                args.Type = PollServiceEventArgs.EventType.Texture;
                MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
                string hostName = m_scene.RegionInfo.ExternalHostName;
                uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
                string protocol = "http";
-                
                if (MainServer.Instance.UseSSL)
                {
                    hostName = MainServer.Instance.SSLCommonName;
@@ -513,5 +513,5 @@ namespace OpenSim.Region.ClientStack.Linden
            }
            public int ThrottleBytes;
        }
-    }   
+    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 1b68603..44bf1a5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.Linden
 //          data["username"] = sp.Firstname + "." + sp.Lastname;
 //          data["display_name_next_update"] = new OSDDate(DateTime.Now);
 //          data["legacy_first_name"] = sp.Firstname;
-            data["mesh_upload_status"] = "valid";
+            data["mesh_upload_status"] = "valid";
 //          data["display_name"] = sp.Firstname + " " + sp.Lastname;
 //          data["legacy_last_name"] = sp.Lastname;
 //          data["id"] = m_agentID;
@@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack.Linden
            //Send back data
            Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 200; 
+            responsedata["int_response_code"] = 200;
            responsedata["content_type"] = "text/plain";
            responsedata["keepalive"] = false;
            responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 94f8bc1..189fa36 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ClientStack.Linden
    {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        private Scene m_scene;
        #region INonSharedRegionModule Members
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.Linden
        }
        public void Close()
-        {            
+        {
        }
        public string Name
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 713125c..6874662 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden
                if (i == 0)
                {
                    rootpos = obj.Position;
-//                    rootrot = obj.Rotation;                    
+//                    rootrot = obj.Rotation;
                }
                // Combine the extraparams data into it's ugly blob again....
@@ -321,7 +321,7 @@ namespace OpenSim.Region.ClientStack.Linden
                pbs.TextureEntry = tmp.GetBytes();
                prim.Shape = pbs;
                prim.Scale = obj.Scale;
-                
                SceneObjectGroup grp = new SceneObjectGroup();
                grp.SetRootPart(prim);
@@ -329,21 +329,21 @@ namespace OpenSim.Region.ClientStack.Linden
                if (i == 0)
                {
                    rootGroup = grp;
-                   
                }
                grp.AttachToScene(m_scene);
                grp.AbsolutePosition = obj.Position;
                prim.RotationOffset = obj.Rotation;
-                
                // Required for linking
                grp.RootPart.ClearUpdateSchedule();
-                
                if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos))
                {
                    m_scene.AddSceneObject(grp);
                    grp.AbsolutePosition = obj.Position;
                }
-                
                allparts[i] = grp;
            }
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack.Linden
            pos
                = m_scene.GetNewRezLocation(
                    Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false);
-           
            responsedata["int_response_code"] = 200; //501; //410; //404;
            responsedata["content_type"] = "text/plain";
            responsedata["keepalive"] = false;
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden
            return responsedata;
        }
-        
        private string ConvertUintToBytes(uint val)
        {
            byte[] resultbytes = Utils.UIntToBytes(val);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
index 67272dd..f36826b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Region.ClientStack.LindenCaps")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index 5196368..b3e3ac3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden
    {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        private Scene m_scene;
        private IEventQueue m_eventQueue;
        private Commands m_commands = new Commands();
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.Linden
            SendConsoleOutput(agentID, reply);
        }
-        
        public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn)
        {
            m_commands.AddCommand(module, shared, command, help, longhelp, fn);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index f7259a6..39f5baf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.ClientStack.Linden
    /// This is required for uploading Mesh.
    /// Since is accepts an open-ended response, we also send more information
    /// for viewers that care to interpret it.
-    /// 
+    ///
    /// NOTE: Part of this code was adapted from the Aurora project, specifically
    /// the normal part of the response in the capability handler.
    /// </remarks>
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.Linden
            IConfig config = source.Configs["SimulatorFeatures"];
            if (config != null)
-            {  
+            {
                //
                // All this is obsolete since getting these features from the grid service!!
                // Will be removed after the next release
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.Linden
            //Send back data
            Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 200; 
+            responsedata["int_response_code"] = 200;
            responsedata["content_type"] = "text/plain";
            responsedata["keepalive"] = false;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
index db16ccb..6ffed4d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests
            OSDMap responseOsd = (OSDMap)OSDParser.DeserializeLLSDXml(context.ResponseBody);
            OSDArray foldersOsd = (OSDArray)responseOsd["folders"];
            OSDMap folderOsd = (OSDMap)foldersOsd[0];
-           
            // A sanity check that the response has the expected number of descendents for a default inventory
            // TODO: Need a more thorough check.
            Assert.That((int)folderOsd["descendents"], Is.EqualTo(16));
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 8fd8d1f..dfe097e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.Linden
        public void AddRegion(Scene s)
        {
            m_scene = s;
-           
        }
        public void RemoveRegion(Scene s)
@@ -94,14 +94,14 @@ namespace OpenSim.Region.ClientStack.Linden
            s.EventManager.OnRemovePresence -= DeRegisterPresence;
            m_BakedTextureModule = null;
            m_scene = null;
-        }     
+        }
        public void RegionLoaded(Scene s)
        {
            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
            m_scene.EventManager.OnNewPresence += RegisterNewPresence;
            m_scene.EventManager.OnRemovePresence += DeRegisterPresence;
-            
        }
        private void DeRegisterPresence(UUID agentId)
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        }
                    }
                    else
-                    {               
+                    {
                        for (int i = 0; i < maxCacheitemsLoop; i++)
                        {
                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        avatarhandler.UploadBakedTexture,
                        "UploadBakedTexture",
                        agentID.ToString()));
-                
            }
            else
            {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 0277a24..1ea0454 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -492,7 +492,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    catch (Exception e)
                    {
                        m_log.ErrorFormat(
-                            "[INVENTORY]: Failed to process queued inventory request {0} for {1}.  Exception {3}", 
+                            "[INVENTORY]: Failed to process queued inventory request {0} for {1}.  Exception {3}",
                            poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e);
                    }
                }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 15d6f7f..0a6785c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        /// <summary>
-        /// Sends packets for this texture to a client until packetsToSend is 
+        /// Sends packets for this texture to a client until packetsToSend is
        /// hit or the transfer completes
        /// </summary>
        /// <param name="client">Reference to the client that the packets are destined for</param>
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        m_currentPacket = m_stopPacket;
                        return;
                    }
-                    
                    if (DiscardLevel >= 0 || m_stopPacket == 0)
                    {
                        // This shouldn't happen, but if it does, we really can't proceed
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 55050d9..dba2872 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -434,7 +434,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// Entity update queues
        /// </summary>
        public PriorityQueue EntityUpdateQueue { get { return m_entityUpdates; } }
-        
        /// <summary>
        /// First name of the agent/avatar represented by the client
        /// </summary>
@@ -478,7 +478,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public List<uint> SelectedObjects {get; private set;}
        public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
-       
        #endregion Properties
@@ -554,7 +554,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // there is some unidentified connection problem, not where we have issues due to deadlock
                if (!IsActive && !force)
                {
-                    m_log.DebugFormat( "{0} Not attempting to close inactive client {1} in {2} since force flag is not set", 
+                    m_log.DebugFormat( "{0} Not attempting to close inactive client {1} in {2} since force flag is not set",
                        LogHeader, Name, m_scene.Name);
                    return;
@@ -713,13 +713,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="packetType"></param>
        /// <param name="handler"></param>
        /// <param name="doAsync">
-        /// If true, when the packet is received handle it on a different thread.  Whether this is given direct to 
+        /// If true, when the packet is received handle it on a different thread.  Whether this is given direct to
        /// a threadpool thread or placed in a queue depends on the inEngine parameter.
        /// </param>
        /// <param name="inEngine">
        /// If async is false then this parameter is ignored.
        /// If async is true and inEngine is false, then the packet is sent directly to a
-        /// threadpool thread. 
+        /// threadpool thread.
        /// If async is true and inEngine is true, then the packet is sent to the IncomingPacketAsyncHandlingEngine.
        /// This may result in slower handling but reduces the risk of overloading the simulator when there are many
        /// simultaneous async requests.
@@ -820,7 +820,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void ProcessSpecificPacketAsync(object state)
        {
            AsyncPacketProcess packetObject = (AsyncPacketProcess)state;
-            
            try
            {
                packetObject.result = packetObject.Method(packetObject.ClientView, packetObject.Pack);
@@ -830,7 +830,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // Make sure that we see any exception caused by the asynchronous operation.
                m_log.Error(
                    string.Format(
-                        "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}  ", packetObject.Pack, Name), 
+                        "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}  ", packetObject.Pack, Name),
                    e);
            }
        }
@@ -976,7 +976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (im.imSessionID == UUID.Zero.Guid)
                    msg.MessageBlock.ID = new UUID(im.fromAgentID) ^ new UUID(im.toAgentID);
                else
-                    msg.MessageBlock.ID = new UUID(im.imSessionID);                
+                    msg.MessageBlock.ID = new UUID(im.imSessionID);
                msg.MessageBlock.Offline = im.offline;
                msg.MessageBlock.ParentEstateID = im.ParentEstateID;
                msg.MessageBlock.Position = im.Position;
@@ -1301,7 +1301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        // Legacy form of invocation that passes around a bare data array.
        // Just ignore what was passed and use the real terrain info that is part of the scene.
-        // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI, 
+        // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI,
        //    there is a special form for specifying multiple terrain patches to send.
        //    The form is to pass 'px' as negative the number of patches to send and to
        //    pass the float array as pairs of patch X and Y coordinates. So, passing 'px'
@@ -1396,7 +1396,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public virtual void SendWindData(int version, Vector2[] windSpeeds)
        {
 //            Vector2[] windSpeeds = (Vector2[])o;
-          
            ulong handle = this.Scene.RegionInfo.RegionHandle;
            bool isNewData;
            lock(lastWindPackets)
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_entityUpdates.Remove(localIDs);
            KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
-            
            int perpacket = localIDs.Count;
            if(perpacket > 200)
                perpacket = 200;
@@ -2545,7 +2545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            for (int i = 0; i < buttonlabels.Length; i++)
            {
                buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24); 
+                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24);
            }
            dialog.Buttons = buttons;
@@ -2863,15 +2863,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
        {
 /* not in use
-            // udp part           
+            // udp part
-            ObjectPropertiesPacket packet = 
+            ObjectPropertiesPacket packet =
                (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
            ObjectPropertiesPacket.ObjectDataBlock[] ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[parts.Count];
            int i = 0;
            foreach(SceneObjectPart sop in parts)
                ObjectData[i++] = CreateObjectPropertiesBlock(sop);
-   
            packet.ObjectData = ObjectData;
            packet.Header.Zerocoded = true;
            // udp send splits this mega packets correctly
@@ -3003,13 +3003,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            isWearable = ((AssetType) req.AssetInf.Type ==
                     AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
-            
            //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable);
-           
-            
-            //if (isWearable) 
+            //if (isWearable)
            //    m_log.Debug((AssetType)req.AssetInf.Type);
-            
            TransferInfoPacket Transfer = new TransferInfoPacket();
            Transfer.TransferInfo.ChannelType = 2;
            Transfer.TransferInfo.Status = 0;
@@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            if(avatarID != AgentId)
                m_log.Debug("[CLIENT]: SendAgentGroupDataUpdate avatarID != AgentId");
-                 
            IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
            if(eq != null)
            {
@@ -3862,7 +3862,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count];
            AgentWearablesUpdatePacket.WearableDataBlock awb;
            int idx = 0;
-           
                    for (int i = 0; i < wearables.Length; i++)
                    {
                        for (int j = 0; j < wearables[i].Count; j++)
@@ -3878,7 +3878,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            //                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
                            //                                    awb.ItemID, awb.AssetID, i, Name);
                        }
-                    }    
+                    }
            OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
        }
@@ -3955,7 +3955,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
 //                avatar.Name, avatar.UUID, Name, AgentId);
-            
            ScenePresence presence = avatar as ScenePresence;
            if (presence == null)
                return;
@@ -3965,7 +3965,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            objupdate.RegionData.RegionHandle = presence.RegionHandle;
 //            objupdate.RegionData.TimeDilation = ushort.MaxValue;
-            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);    
+            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
@@ -4021,7 +4021,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Primitive Packet/Data Sending Methods
-        
        /// <summary>
        /// Generate one of the object update packets based on PrimUpdateFlags
        /// and broadcast the packet to clients
@@ -4054,18 +4054,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            uint priority = m_prioritizer.GetUpdatePriority(this, entity);
            lock (m_entityUpdates.SyncRoot)
-                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags)); 
+                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags));
        }
        /// <summary>
-        /// Requeue an EntityUpdate when it was not acknowledged by the client. 
+        /// Requeue an EntityUpdate when it was not acknowledged by the client.
-        /// We will update the priority and put it in the correct queue, merging update flags 
+        /// We will update the priority and put it in the correct queue, merging update flags
-        /// with any other updates that may be queued for the same entity. 
+        /// with any other updates that may be queued for the same entity.
        /// The original update time is used for the merged update.
        /// </summary>
        private void ResendPrimUpdate(EntityUpdate update)
-        {          
+        {
-            // If the update exists in priority queue, it will be updated.           
+            // If the update exists in priority queue, it will be updated.
            // If it does not exist then it will be added with the current (rather than its original) priority
            uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity);
@@ -4074,9 +4074,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        /// <summary>
-        /// Requeue a list of EntityUpdates when they were not acknowledged by the client. 
+        /// Requeue a list of EntityUpdates when they were not acknowledged by the client.
-        /// We will update the priority and put it in the correct queue, merging update flags 
+        /// We will update the priority and put it in the correct queue, merging update flags
-        /// with any other updates that may be queued for the same entity. 
+        /// with any other updates that may be queued for the same entity.
        /// The original update time is used for the merged update.
        /// </summary>
        private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
@@ -4140,7 +4140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                lock (m_entityUpdates.SyncRoot)
                    if (!m_entityUpdates.TryDequeue(out update, out timeinqueue))
                        break;
-                   
                PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
                if(updateFlags.HasFlag(PrimUpdateFlags.Kill))
@@ -4243,7 +4243,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            dpos = (float)Math.Sqrt(dpos) - bradius;
                            if(dpos > cullingrange)
                                continue;
- 
                            GroupsNeedFullUpdate.Add(grp);
                            continue;
                        }
@@ -4276,7 +4276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                bool canUseCompressed = true;
                bool canUseImproved = true;
-                
                // Compressed object updates only make sense for LL primitives
                if (!(update.Entity is SceneObjectPart))
                {
@@ -4316,14 +4316,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        canUseImproved = false;
                    }
                }
-    
                #endregion UpdateFlags to packet type conversion
                #region Block Construction
                // TODO: Remove this once we can build compressed updates
                canUseCompressed = false;
-              
                if (!canUseImproved && !canUseCompressed)
                {
                    ObjectUpdatePacket.ObjectDataBlock ablock;
@@ -4368,7 +4368,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            #region Packet Sending
-    
            ushort timeDilation;
            if(!IsActive)
@@ -4398,7 +4398,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
                packet.RegionData.TimeDilation = timeDilation;
                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[objectUpdateBlocks.Count];
-    
                for (int i = 0; i < objectUpdateBlocks.Count; i++)
                    packet.ObjectData[i] = objectUpdateBlocks[i];
@@ -4406,7 +4406,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
            }
-    
            if (compressedUpdateBlocks.Count > 0)
            {
                ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
@@ -4421,7 +4421,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
            }
-    
            if (terseUpdateBlocks.Count > 0)
            {
                ImprovedTerseObjectUpdatePacket packet
@@ -4430,7 +4430,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
                packet.RegionData.TimeDilation = timeDilation;
                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[terseUpdateBlocks.Count];
-    
                for (int i = 0; i < terseUpdateBlocks.Count; i++)
                    packet.ObjectData[i] = terseUpdateBlocks[i];
@@ -4484,11 +4484,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
 //            m_log.DebugFormat(
-//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}", 
+//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}",
 //                updatesThisCall, Name, SceneAgent.IsChildAgent ? "child" : "root", Scene.Name);
 //
        }
-        
        public void ReprioritizeUpdates()
        {
            lock (m_entityUpdates.SyncRoot)
@@ -4600,7 +4600,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    foreach(SceneObjectPart p in grp.Parts)
                        SendEntityUpdate(p,PrimUpdateFlags.CancelKill);
                }
-            }       
+            }
            CheckGroupsInViewBusy = false;
        }
@@ -4640,8 +4640,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
            {
-                int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);   
+                int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);
-                       
                if (m_entityUpdates.Count > 0)
                    ProcessEntityUpdates(maxUpdateBytes);
@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (m_entityUpdates.Count > 0)
                    return true;
                if (m_entityProps.Count > 0)
-                    return true;                   
+                    return true;
            }
            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
@@ -4775,7 +4775,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            internal bool SendFamilyProps;
            internal bool SendObjectProps;
-            
            public ObjectPropertyUpdate(ISceneEntity entity, uint flags, bool sendfam, bool sendobj)
                : base(entity,(PrimUpdateFlags)flags)
            {
@@ -4790,7 +4790,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                base.Update(update);
            }
        }
-        
        public void SendObjectPropertiesFamilyData(ISceneEntity entity, uint requestFlags)
        {
            uint priority = 0;  // time based ordering only
@@ -4824,7 +4824,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            foreach (ObjectPropertyUpdate update in updates)
                ResendPropertyUpdate(update);
        }
-        
        public void SendObjectPropertiesReply(ISceneEntity entity)
        {
            uint priority = 0;  // time based ordering only
@@ -4845,8 +4845,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
 //                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-           
-             
            EntityUpdate iupdate;
            Int32 timeinqueue; // this is just debugging code & can be dropped later
@@ -4882,7 +4882,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                }
            }
-           
            if (objectPropertiesBlocks.Count > 0)
            {
                ObjectPropertiesPacket packet = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
@@ -4890,7 +4890,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                for (int i = 0; i < objectPropertiesBlocks.Count; i++)
                    packet.ObjectData[i] = objectPropertiesBlocks[i];
-         
                objectPropertiesBlocks.Clear();
                packet.Header.Zerocoded = true;
@@ -4907,12 +4907,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // pbcnt += blocks.Count;
                // ppcnt++;
            }
-            
            // Int32 fpcnt = 0;
            // Int32 fbcnt = 0;
-            
            if (objectFamilyBlocks.Count > 0)
-            {               
+            {
                // one packet per object block... uggh...
                for (int i = 0; i < objectFamilyBlocks.Count; i++)
                {
@@ -4965,7 +4965,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 needPhysics.Clear();
            }
-            
            // m_log.WarnFormat("[PACKETCOUNTS] queued {0} property packets with {1} blocks",ppcnt,pbcnt);
            // m_log.WarnFormat("[PACKETCOUNTS] queued {0} family property packets with {1} blocks",fpcnt,fbcnt);
        }
@@ -4998,7 +4998,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return block;
        }
-    
        private ObjectPropertiesPacket.ObjectDataBlock CreateObjectPropertiesBlock(SceneObjectPart sop)
        {
            //ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
@@ -5024,7 +5024,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            block.FolderID = UUID.Zero; // sog.FromFolderID ??
            block.FromTaskID = UUID.Zero; // ???
            block.InventorySerial = (short)sop.InventorySerial;
-            
            SceneObjectPart root = sop.ParentGroup.RootPart;
            block.TouchName = Util.StringToBytes256(root.TouchName);
@@ -5036,7 +5036,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            {
 //                using (BinaryWriter binWriter = new BinaryWriter(memStream))
 //                {
-//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)
 //                    {
 //                        Primitive.TextureEntryFace teFace = sop.Shape.Textures.FaceTextures[i];
 //
@@ -5053,7 +5053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                    block.TextureID = memStream.ToArray();
 //                }
 //            }
-           
            block.TextureID = new byte[0]; // TextureID ???
            block.SitName = Util.StringToBytes256(root.SitName);
            block.OwnerMask = root.OwnerMask;
@@ -5202,7 +5202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendEstateCovenantInformation(UUID covenant)
        {
 //            m_log.DebugFormat("[LLCLIENTVIEW]: Sending estate covenant asset id of {0} to {1}", covenant, Name);
-            
            EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
            EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
            edata.CovenantID = covenant;
@@ -5219,7 +5219,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant);
-            
            EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
            packet.MethodData.Invoice = invoice;
            packet.AgentData.TransactionID = UUID.Random();
@@ -5282,13 +5282,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        public void SendLandProperties(
-             int sequence_id, bool snap_selection, int request_result, ILandObject lo, 
+             int sequence_id, bool snap_selection, int request_result, ILandObject lo,
             float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
        {
 //            m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name);
-            
            LandData landData = lo.LandData;
-            
            ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage();
            updateMessage.AABBMax = landData.AABBMax;
@@ -5301,7 +5301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            updateMessage.Category = landData.Category;
            updateMessage.ClaimDate = Util.ToDateTime(landData.ClaimDate);
            updateMessage.ClaimPrice = landData.ClaimPrice;
-            updateMessage.GroupID = landData.GroupID;            
+            updateMessage.GroupID = landData.GroupID;
            updateMessage.IsGroupOwned = landData.IsGroupOwned;
            updateMessage.LandingType = (LandingType) landData.LandingType;
            updateMessage.LocalID = landData.LocalID;
@@ -5322,7 +5322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            updateMessage.Name = landData.Name;
            updateMessage.OtherCleanTime = landData.OtherCleanTime;
            updateMessage.OtherCount = 0; //TODO: Unimplemented
-            updateMessage.OwnerID = landData.OwnerID;            
+            updateMessage.OwnerID = landData.OwnerID;
            updateMessage.ParcelFlags = (ParcelFlags) landData.Flags;
            updateMessage.ParcelPrimBonus = simObjectBonusFactor;
            updateMessage.PassHours = landData.PassHours;
@@ -5337,10 +5337,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            updateMessage.RentPrice = 0;
            updateMessage.RequestResult = (ParcelResult) request_result;
-            updateMessage.SalePrice = landData.SalePrice;            
+            updateMessage.SalePrice = landData.SalePrice;
            updateMessage.SelfCount = 0; //TODO: Unimplemented
            updateMessage.SequenceID = sequence_id;
-            
            if (landData.SimwideArea > 0)
            {
                updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount();
@@ -5349,7 +5349,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                updateMessage.SimWideMaxPrims = 0;
            }
-            
            updateMessage.SnapSelection = snap_selection;
            updateMessage.SnapshotID    = landData.SnapshotID;
            updateMessage.Status        = (ParcelStatus) landData.Status;
@@ -5367,11 +5367,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            updateMessage.SeeAVs        = landData.SeeAVs;
            updateMessage.AnyAVSounds   = landData.AnyAVSounds;
            updateMessage.GroupAVSounds = landData.GroupAVSounds;
-            
            IPrimCounts pc = lo.PrimCounts;
-            updateMessage.OwnerPrims        = pc.Owner;            
+            updateMessage.OwnerPrims        = pc.Owner;
            updateMessage.GroupPrims        = pc.Group;
-            updateMessage.OtherPrims        = pc.Others;            
+            updateMessage.OtherPrims        = pc.Others;
            updateMessage.SelectedPrims     = pc.Selected;
            updateMessage.TotalPrims        = pc.Total;
            updateMessage.SimWideTotalPrims = pc.Simulator;
@@ -5384,8 +5384,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (eq != null)
                {
                    eq.ParcelProperties(updateMessage, this.AgentId);
-                } 
+                }
-                else 
+                else
                {
                    m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
                }
@@ -5422,7 +5422,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendForceClientSelectObjects(List<uint> ObjectIDs)
        {
 //            m_log.DebugFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
-            
            bool firstCall = true;
            const int MAX_OBJECTS_PER_PACKET = 251;
            ForceObjectSelectPacket pack = (ForceObjectSelectPacket)PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect);
@@ -5634,7 +5634,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ImprovedTerseObjectUpdatePacket.ObjectDataBlock block
                = PacketPool.Instance.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            
            block.Data = data;
            if (textureEntry != null && textureEntry.Length > 0)
@@ -5661,7 +5661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Vector3 offsetPosition = data.OffsetPosition;
            Quaternion rotation = data.Rotation;
            uint parentID = data.ParentID;
-  
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending full update to {0} with pos {1}, vel {2} in {3}", Name, data.OffsetPosition, data.Velocity, m_scene.Name);
@@ -5752,7 +5752,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 /*
            if (data.ParentGroup.IsAttachment)
            {
-                update.NameValue 
+                update.NameValue
                    = Util.StringToBytes256(
                        string.Format("AttachItemID STRING RW SV {0}", data.ParentGroup.FromItemID));
@@ -5906,7 +5906,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                m_groupPowers.Clear();
                m_groupPowers = powers;
-            }       
+            }
        }
        public ulong GetGroupPowers(UUID groupID)
@@ -6193,7 +6193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            if(
                (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
-//                || ((x.ControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0 && 
+//                || ((x.ControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0 &&
 //                    (x.ControlFlags & 0x3f8dfff) != 0) // we need to rotate the av on fly
                || x.ControlFlags != (byte)AgentManager.ControlFlags.NONE// actually all movement controls need to pass
                || (x.Flags != m_thisAgentUpdateArgs.Flags)                 // significant if Flags changed
@@ -6208,7 +6208,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
           if(
                qdelta1 < QDELTABody // significant if body rotation above(below cos) threshold
                // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
-                // || qdelta2 < QDELTAHead // significant if head rotation above(below cos) threshold            
+                // || qdelta2 < QDELTAHead // significant if head rotation above(below cos) threshold
                )
                return true;
@@ -6257,7 +6257,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            TotalAgentUpdates++;
            // dont let ignored updates pollute this throttles
-            if(SceneAgent == null || SceneAgent.IsChildAgent || 
+            if(SceneAgent == null || SceneAgent.IsChildAgent ||
                    SceneAgent.IsInTransit || seq <= m_thisAgentUpdateArgs.lastpacketSequence )
            {
                // throttle reset is done at MoveAgentIntoRegion()
@@ -6476,7 +6476,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                }
            }
-            
            //m_log.Debug("[LLCLIENTVIEW]: Not handling GenericMessage with method-type of: " + method);
            return false;
        }
@@ -6922,7 +6922,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            //m_log.Info("[LAND]: LAND:" + modify.ToString());
            if (modify.ParcelData.Length > 0)
            {
-                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore, 
+                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore,
                // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit.
                if (OnModifyTerrain != null)
                {
@@ -6999,20 +6999,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    byte[] visualparams = new byte[appear.VisualParam.Length];
                    for (int i = 0; i < appear.VisualParam.Length; i++)
                        visualparams[i] = appear.VisualParam[i].ParamValue;
-                    //var b = appear.WearableData[0]; 
+                    //var b = appear.WearableData[0];
-                    
                    Primitive.TextureEntry te = null;
                    if (appear.ObjectData.TextureEntry.Length > 1)
                        te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
-                    
                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
                    for (int i=0; i<appear.WearableData.Length;i++)
                        cacheitems[i] = new WearableCacheItem(){
                            CacheId = appear.WearableData[i].CacheID,
-                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)                           
+                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)
                        };
-                    
                    handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
                }
@@ -7970,7 +7970,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    physdata.Bounce = phsblock.Restitution;
                    physdata.Density = phsblock.Density;
                    physdata.Friction = phsblock.Friction;
-                    physdata.GravitationModifier = phsblock.GravityMultiplier;                   
+                    physdata.GravitationModifier = phsblock.GravityMultiplier;
                }
                handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
@@ -8381,7 +8381,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                handlerObjectDuplicateOnRay = OnObjectDuplicateOnRay;
                if (handlerObjectDuplicateOnRay != null)
                {
-                
                    UUID rezGroupID = dupeOnRay.AgentData.GroupID;
                    if(!IsGroupMember(rezGroupID))
                        rezGroupID = UUID.Zero;
@@ -10198,7 +10198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                    {
                        int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
-                        
                        OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)));
                    }
@@ -10234,7 +10234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            Message = Utils.BytesToString(messagePacket.ParamList[1].Parameter);
                        }
                        else
-                        { 
+                        {
                            SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter));
                            SenderName = Utils.BytesToString(messagePacket.ParamList[3].Parameter);
                            Message = Utils.BytesToString(messagePacket.ParamList[4].Parameter);
@@ -10376,7 +10376,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
                case "kickestate":
-                   
                    if(((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                    {
                        UUID invoice = messagePacket.MethodData.Invoice;
@@ -10455,6 +10455,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool HandleRequestGodlikePowers(IClientAPI sender, Packet Pack)
        {
            RequestGodlikePowersPacket rglpPack = (RequestGodlikePowersPacket)Pack;
+            if (rglpPack.AgentData.SessionID != SessionId ||
+                    rglpPack.AgentData.AgentID != AgentId)
+                return true;
            RequestGodlikePowersPacket.RequestBlockBlock rblock = rglpPack.RequestBlock;
            UUID token = rblock.Token;
@@ -10464,7 +10469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (handlerReqGodlikePowers != null)
            {
-                handlerReqGodlikePowers(ablock.AgentID, ablock.SessionID, token, rblock.Godlike, this);
+                handlerReqGodlikePowers(ablock.AgentID, ablock.SessionID, token, rblock.Godlike);
            }
            return true;
@@ -10475,6 +10480,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            GodUpdateRegionInfoPacket GodUpdateRegionInfo =
                (GodUpdateRegionInfoPacket)Packet;
+            if (GodUpdateRegionInfo.AgentData.SessionID != SessionId ||
+                    GodUpdateRegionInfo.AgentData.AgentID != AgentId)
+                return true;
            GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdate;
            if (handlerGodUpdateRegionInfo != null)
            {
@@ -10508,6 +10517,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            GodlikeMessagePacket GodlikeMessage =
                (GodlikeMessagePacket)Packet;
+            if (GodlikeMessage.AgentData.SessionID != SessionId ||
+                    GodlikeMessage.AgentData.AgentID != AgentId)
+                return true;
            GodlikeMessage handlerGodlikeMessage = onGodlikeMessage;
            if (handlerGodlikeMessage != null)
            {
@@ -10524,6 +10537,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            StateSavePacket SaveStateMessage =
                (StateSavePacket)Packet;
+            if (SaveStateMessage.AgentData.SessionID != SessionId ||
+                    SaveStateMessage.AgentData.AgentID != AgentId)
+                return true;
            SaveStateHandler handlerSaveStatePacket = OnSaveState;
            if (handlerSaveStatePacket != null)
            {
@@ -10537,30 +10555,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            GodKickUserPacket gkupack = (GodKickUserPacket)Pack;
-            if (gkupack.UserInfo.GodSessionID == SessionId && AgentId == gkupack.UserInfo.GodID)
+            if (gkupack.UserInfo.GodSessionID != SessionId ||
-            {
+                    gkupack.UserInfo.GodID != AgentId)
-                GodKickUser handlerGodKickUser = OnGodKickUser;
+                return true;
-                if (handlerGodKickUser != null)
-                {
+            GodKickUser handlerGodKickUser = OnGodKickUser;
-                    handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID,
+            if (handlerGodKickUser != null)
-                                       gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason);
-                }
-            }
-            else
            {
-                SendAgentAlertMessage("Kick request denied", false);
+                handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason);
            }
-            //KickUserPacket kupack = new KickUserPacket();
-            //KickUserPacket.UserInfoBlock kupackib = kupack.UserInfo;
-            //kupack.UserInfo.AgentID = gkupack.UserInfo.AgentID;
-            //kupack.UserInfo.SessionID = gkupack.UserInfo.GodSessionID;
-            //kupack.TargetBlock.TargetIP = (uint)0;
-            //kupack.TargetBlock.TargetPort = (ushort)0;
-            //kupack.UserInfo.Reason = gkupack.UserInfo.Reason;
-            //OutPacket(kupack, ThrottleOutPacketType.Task);
            return true;
        }
        #endregion GodPackets
@@ -10971,7 +10975,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            return true;
        }
-        
        private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
        {
            CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
@@ -11008,7 +11012,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
-        
        private bool HandleInventoryDescendents(IClientAPI sender, Packet Pack)
        {
            return true;
@@ -11398,7 +11402,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            GroupProfileRequestPacket groupProfileRequest =
                       (GroupProfileRequestPacket)Pack;
-           
            #region Packet Session and User Check
            if (m_checkPackets)
            {
@@ -11460,7 +11464,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
-                        
            if(grpID == lastGroupProfileRequestID)
                lastGroupProfileRequestTS = Util.GetTimeStampMS() - 7000;
@@ -12394,10 +12398,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ScenePresence sp = (ScenePresence)SceneAgent;
            if(sp != null && !sp.IsDeleted && !sp.IsInTransit)
            {
-                UUID objectID = pkt.Data.ObjectID;   
+                UUID objectID = pkt.Data.ObjectID;
-                uint permissions = pkt.Data.ObjectPermissions;        
+                uint permissions = pkt.Data.ObjectPermissions;
-                sp.HandleRevokePermissions(objectID , permissions);        
+                sp.HandleRevokePermissions(objectID , permissions);
            }
            return true;
        }
@@ -12433,7 +12437,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            scriptQuestion.Data.Questions = question;
            scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName);
            scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName);
-            
            OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
        }
@@ -12625,7 +12629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             * 0x01 position
                             * 0x02 rotation
                             * 0x04 scale
-  
                             * 0x08 LINK_SET
                             * 0x10 UNIFORM for scale
                             */
@@ -12664,7 +12668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                    updatehandler(localId, udata, this);
                                    break;
-                                case 0x14: // uniform scale sp 
+                                case 0x14: // uniform scale sp
                                    udata.scale = new Vector3(block.Data, 0);
                                    udata.change = ObjectChangeType.primUS;
@@ -12934,7 +12938,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
                    logPacket = false;
-                
                if (DebugPacketLevel <= 50
                    && (packet.Type == PacketType.ImprovedTerseObjectUpdate || packet.Type == PacketType.ObjectUpdate))
                    logPacket = false;
@@ -12947,7 +12951,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        "[CLIENT]: PACKET OUT to   {0} ({1}) in {2} - {3}",
                        Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type);
            }
-            
            m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method);
        }
@@ -13194,9 +13198,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    GroupMembershipData[] GroupMembership =
                        m_GroupsModule.GetMembershipData(AgentId);
-                    
                    m_groupPowers.Clear();
-                        
                    if (GroupMembership != null)
                    {
                        for (int i = 0; i < GroupMembership.Length; i++)
@@ -13216,7 +13220,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            m_activeGroupName = activeMembership.GroupName;
                            m_activeGroupPowers = ActiveGroupPowers;
                        }
-                    }    
+                    }
                }
                if(activeMembership == null)
@@ -13233,7 +13237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            lock(m_groupPowers)
            {
                m_groupPowers.Clear();
-                       
                if (data != null)
                {
                    for (int i = 0; i < data.Length; i++)
@@ -13518,7 +13522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (p is ScenePresence)
            {
 //                m_log.DebugFormat(
-//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", 
+//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}",
 //                    p.Name, Name, Scene.Name);
                // It turns out to get the agent to stop flying, you have to feed it stop flying velocities
@@ -13555,7 +13559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                PlacesReplyData[] data)
        {
            PlacesReplyPacket reply = null;
-            PlacesReplyPacket.QueryDataBlock[] dataBlocks = 
+            PlacesReplyPacket.QueryDataBlock[] dataBlocks =
                    new PlacesReplyPacket.QueryDataBlock[0];
            for (int i = 0 ; i < data.Length ; i++)
@@ -13733,7 +13737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            foreach (InventoryItemBase item in items)
            {
                OSDMap ItemDataMap = new OSDMap();
-                
                ItemDataMap.Add("ItemID", OSD.FromUUID(item.ID));
                ItemDataMap.Add("FolderID", OSD.FromUUID(item.Folder));
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 41dd4d1..deefd40 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (pAssetCache != null)
                m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
-            
            if (m_missingImage == null)
                m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index dc8ac3c..439621a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
    /// are waiting on ACKs for</param>
    public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
    /// <summary>
-    /// Fired when the queue for one or more packet categories is empty. This 
+    /// Fired when the queue for one or more packet categories is empty. This
    /// event can be hooked to put more data on the empty queues
    /// </summary>
    /// <param name="category">Categories of the packet queues that are empty</param>
@@ -86,8 +86,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// Controls whether information is logged about each outbound packet immediately before it is sent.  For debug purposes.
        /// </summary>
        /// <remarks>Any level above 0 will turn on logging.</remarks>
-        public int ThrottleDebugLevel 
+        public int ThrottleDebugLevel
-        { 
+        {
            get
            {
                return m_throttleDebugLevel;
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Number of packets sent to this client</summary>
        public int PacketsSent;
        /// <summary>Number of packets resent to this client</summary>
-        public int PacketsResent;        
+        public int PacketsResent;
        /// <summary>Total byte count of unacked packets sent to this client</summary>
        public int UnackedBytes;
@@ -215,7 +215,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// textures are now generally handled through http.
        /// </summary>
        private double m_cannibalrate = 0.0;
-        
        private ClientInfo m_info = new ClientInfo();
        /// <summary>
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // Initialize this to a sane value to prevent early disconnects
            TickLastPacketReceived = Environment.TickCount & Int32.MaxValue;
-            m_pingMS = (int)(3.0 * server.TickCountResolution); // so filter doesnt start at 0; 
+            m_pingMS = (int)(3.0 * server.TickCountResolution); // so filter doesnt start at 0;
        }
        /// <summary>
@@ -370,7 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return string.Format(
                "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}",
                Util.EnvironmentTickCountSubtract(TickLastPacketReceived),
-                PacketsReceived,                                 
+                PacketsReceived,
                PacketsSent,
                PacketsResent,
                UnackedBytes,
@@ -540,7 +540,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return data;
        }
-       
        public int GetCatBytesCanSend(ThrottleOutPacketType cat, int timeMS)
        {
            int icat = (int)cat;
@@ -559,7 +559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="packet"></param>
        /// <param name="forceQueue">Always queue the packet if at all possible.</param>
        /// <returns>
-        /// true if the packet has been queued, 
+        /// true if the packet has been queued,
        /// false if the packet has not been queued and should be sent immediately.
        /// </returns>
        public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue)
@@ -589,7 +589,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    queue.Enqueue(packet, highPriority);
                    return true;
                }
-                                  
                if (!forceQueue && bucket.CheckTokens(packet.Buffer.DataLength))
                {
                    // enough tokens so it can be sent imediatly by caller
@@ -608,24 +608,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // We don't have a token bucket for this category, so it will not be queued
                return false;
            }
-  
        }
        /// <summary>
        /// Loops through all of the packet queues for this client and tries to send
        /// an outgoing packet from each, obeying the throttling bucket limits
        /// </summary>
-        /// 
+        ///
        /// <remarks>
-        /// Packet queues are inspected in ascending numerical order starting from 0.  Therefore, queues with a lower 
+        /// Packet queues are inspected in ascending numerical order starting from 0.  Therefore, queues with a lower
        /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have
        /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the
        /// wind queue).
-        /// 
+        ///
        /// This function is only called from a synchronous loop in the
        /// UDPServer so we don't need to bother making this thread safe
        /// </remarks>
-        /// 
+        ///
        /// <returns>True if any packets were sent, otherwise false</returns>
        public bool DequeueOutgoing()
        {
@@ -791,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                double start = Util.GetTimeStampMS();
                if (start < m_nextOnQueueEmpty)
                    return;
-            
                m_isQueueEmptyRunning = true;
                m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
@@ -803,7 +803,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
        }
-       
        /// <summary>
        /// Fires the OnQueueEmpty callback and sets the minimum time that it
@@ -820,7 +820,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (callback != null)
            {
                // if (m_udpServer.IsRunningOutbound)
-                // {                
+                // {
                try { callback(categories); }
                catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
                // }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index cedb9b4..ec51e28 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    StatType.Pull,
                    MeasuresOfInterest.None,
                    stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod,
-//                    stat => 
+//                    stat =>
 //                        stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod, 7),
                    StatVerbosity.Debug));
        }
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>The measured resolution of Environment.TickCount</summary>
        public readonly float TickCountResolution;
-        /// <summary>Number of prim updates to put on the queue each time the 
+        /// <summary>Number of prim updates to put on the queue each time the
        /// OnQueueEmpty event is triggered for updates</summary>
        public readonly int PrimUpdatesPerCallback;
@@ -289,7 +289,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Bandwidth throttle for this UDP server</summary>
        public TokenBucket Throttle { get; protected set; }
-        
        /// <summary>Per client throttle rates enforced by this server</summary>
        /// <remarks>
        /// If the total rate is non-zero, then this is the maximum total throttle setting that any client can ever have.
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// do get changed immediately).  They do not need to sum to the total.
        /// </remarks>
        public ThrottleRates ThrottleRates { get; protected set; }
-        
        /// <summary>Manages authentication for agent circuits</summary>
        protected AgentCircuitManager m_circuitManager;
@@ -436,8 +436,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            #region Environment.TickCount Measurement
-                        // Update the port with the one we actually got
+            // Update the port with the one we actually got
-                        port = (uint)Port;
+            port = (uint)Port;
            // Measure the resolution of Environment.TickCount
            TickCountResolution = 0f;
@@ -696,15 +696,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Scene = (Scene)scene;
            m_location = new Location(Scene.RegionInfo.RegionHandle);
-                        
-            IpahEngine 
+            IpahEngine
                = new JobEngine(
-                    string.Format("Incoming Packet Async Handling Engine ({0})", Scene.Name), 
+                    string.Format("Incoming Packet Async Handling Engine ({0})", Scene.Name),
                    "INCOMING PACKET ASYNC HANDLING ENGINE");
-            OqrEngine 
+            OqrEngine
                = new JobEngine(
-                    string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name), 
+                    string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name),
                    "OUTGOING QUEUE REFILL ENGINE");
            StatsManager.RegisterStat(
@@ -730,9 +730,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    "clientstack",
                    Scene.Name,
                    StatType.Pull,
-                    stat => 
+                    stat =>
-                        { PercentageStat pstat = (PercentageStat)stat; 
+                        { PercentageStat pstat = (PercentageStat)stat;
-                          pstat.Consequent = PacketPool.Instance.PacketsRequested; 
+                          pstat.Consequent = PacketPool.Instance.PacketsRequested;
                          pstat.Antecedent = PacketPool.Instance.PacketsReused; },
                    StatVerbosity.Debug));
@@ -745,8 +745,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    Scene.Name,
                    StatType.Pull,
                    stat =>
-                        { PercentageStat pstat = (PercentageStat)stat; 
+                        { PercentageStat pstat = (PercentageStat)stat;
-                          pstat.Consequent = PacketPool.Instance.BlocksRequested; 
+                          pstat.Consequent = PacketPool.Instance.BlocksRequested;
                          pstat.Antecedent = PacketPool.Instance.BlocksReused; },
                    StatVerbosity.Debug));
@@ -799,7 +799,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    MeasuresOfInterest.None,
                    stat => stat.Value = IpahEngine.JobsWaiting,
                    StatVerbosity.Debug));
-                        
            StatsManager.RegisterStat(
                new Stat(
                    "OQRERequestsWaiting",
@@ -812,7 +812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    MeasuresOfInterest.None,
                    stat => stat.Value = OqrEngine.JobsWaiting,
                    StatVerbosity.Debug));
-        
            // We delay enabling pool stats to AddScene() instead of Initialize() so that we can distinguish pool stats by
            // scene name
            if (UsePools)
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if ((outgoingPacket.Buffer.Data[0] & Helpers.MSG_RELIABLE) != 0)
                outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
-            // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will 
+            // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will
            // continue to display the deleted object until relog.  Therefore, we need to always queue a kill object
            // packet so that it isn't sent before a queued update packet.
@@ -1242,7 +1242,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if ((IncomingMalformedPacketCount % 10000) == 0)
                m_log.WarnFormat(
-                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}", 
+                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}",
                    IncomingMalformedPacketCount, endPoint);
        }
@@ -1391,7 +1391,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if ((IncomingOrphanedPacketCount % 10000) == 0)
                    m_log.WarnFormat(
-                        "[LLUDPSERVER]: Received {0} orphaned packets so far.  Last was from {1}", 
+                        "[LLUDPSERVER]: Received {0} orphaned packets so far.  Last was from {1}",
                        IncomingOrphanedPacketCount, endPoint);
                return;
@@ -1482,7 +1482,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                if (packet.Header.Resent)
                    m_log.DebugFormat(
-                        "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}", 
+                        "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}",
                        packet.Header.Sequence, packet.Type, client.Name);
                 else
                    m_log.WarnFormat(
@@ -1512,7 +1512,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // We don't need to do anything else with ping checks
                StartPingCheckPacket startPing = (StartPingCheckPacket)packet;
                CompletePing(udpClient, startPing.PingID.PingID);
-                
                if ((Environment.TickCount - m_elapsedMSSinceLastStatReport) >= 3000)
                {
                    udpClient.SendPacketStats();
@@ -1677,7 +1677,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_log.DebugFormat(
                    "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}",
                    uccp.CircuitCode.Code, Scene.RegionInfo.RegionName, endPoint);
-    
                AuthenticateResponse sessionInfo;
                if (IsClientAuthorized(uccp, out sessionInfo))
                {
@@ -1752,10 +1752,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    lock (m_pendingCache)
                        m_pendingCache.Remove(endPoint);
-                }    
+                }
                //            m_log.DebugFormat(
-    //                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
+    //                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
    //                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
            }
@@ -1787,9 +1787,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // Determine which agent this packet came from
                // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
-                // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode 
+                // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode
                // and then CompleteAgentMovement immediately without waiting for an ack.  As we are now handling these
-                // packets asynchronously, we need to account for this thread proceeding more quickly than the 
+                // packets asynchronously, we need to account for this thread proceeding more quickly than the
                // UseCircuitCode thread.
                int count = 40;
                while (count-- > 0)
@@ -1811,7 +1811,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            // manager but the SceneAgent has not yet been set in Scene.AddNewAgent().  If we are too
                            // eager, then the new ScenePresence may not have registered a listener for this messsage
                            // before we try to process it.
-                            // XXX: A better long term fix may be to add the SceneAgent before the client is added to 
+                            // XXX: A better long term fix may be to add the SceneAgent before the client is added to
                            // the client manager
                            m_log.DebugFormat(
                                "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client SceneAgent not set yet.  Waiting.",
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    else
                    {
                        m_log.DebugFormat(
-                            "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.", 
+                            "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.",
                            endPoint, Scene.Name);
                    }
@@ -1962,13 +1962,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, Throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
-    
                    client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                    client.OnLogout += LogoutHandler;
                    client.DebugPacketLevel = DefaultClientPacketDebugLevel;
-    
                    ((LLClientView)client).DisableFacelights = m_disableFacelights;
-    
                    client.Start();
                }
            }
@@ -1988,7 +1988,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
        {
            lock (client.CloseSyncLock)
-            {    
+            {
                ClientLogoutsDueToNoReceives++;
                if (client.SceneAgent != null)
@@ -1996,7 +1996,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    m_log.WarnFormat(
                        "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
                        client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, Scene.Name);
-    
                    if (!client.SceneAgent.IsChildAgent)
                         client.Kick("Simulator logged you out due to connection timeout.");
                }
@@ -2020,11 +2020,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                try
                {
                    incomingPacket = packetInbox.Dequeue(250);
-                    
                    if (incomingPacket != null && IsRunningInbound)
                    {
                        ProcessInPacket(incomingPacket);
-                        
                        if (UsePools)
                        {
                            incomingPacket.Client = null;
@@ -2192,7 +2192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public long IncomingPacketsProcessed { get; protected set; }
-        #endregion 
+        #endregion
        protected void ProcessInPacket(IncomingPacket incomingPacket)
        {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index 6e6a2d1..012a57d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                "Comms", false, "show server throttles",
                "show server throttles",
                "Show information about server throttles",
-                HandleShowServerThrottlesCommand); 
+                HandleShowServerThrottlesCommand);
            m_console.Commands.AddCommand(
                "Debug", false, "debug lludp packet",
@@ -207,8 +207,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                HandleClientGetCommand);
            m_console.Commands.AddCommand(
-                "Debug", 
+                "Debug",
-                false, 
+                false,
                "debug lludp client set",
                "debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]",
                "Set a debug parameter for a particular client.  If no name is given then the value is set on all clients.",
@@ -228,22 +228,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate;
            cdl.AddRow(
-                "Max scene throttle", 
+                "Max scene throttle",
                maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
            int maxClientDripRate = m_udpServer.ThrottleRates.Total;
            cdl.AddRow(
-                "Max new client throttle", 
+                "Max new client throttle",
                maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
            m_console.Output(cdl.ToString());
            m_console.OutputFormat("{0}\n", GetServerThrottlesReport(m_udpServer));
        }
-                
        private string GetServerThrottlesReport(LLUDPServer udpServer)
        {
-            StringBuilder report = new StringBuilder();     
+            StringBuilder report = new StringBuilder();
            report.AppendFormat(
                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
@@ -254,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                "Cloud",
                "Task",
                "Texture",
-                "Asset");          
+                "Asset");
            report.AppendFormat(
                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                "kb/s",
                "kb/s",
                "kb/s",
-                "kb/s");     
+                "kb/s");
            ThrottleRates throttleRates = udpServer.ThrottleRates;
            report.AppendFormat(
@@ -277,16 +277,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                (throttleRates.Cloud * 8) / 1000,
                (throttleRates.Task * 8) / 1000,
                (throttleRates.Texture  * 8) / 1000,
-                (throttleRates.Asset  * 8) / 1000);  
+                (throttleRates.Asset  * 8) / 1000);
            return report.ToString();
        }
        protected string GetColumnEntry(string entry, int maxLength, int columnPadding)
-        {                       
+        {
            return string.Format(
-                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}", 
+                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}",
-                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 
+                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry,
                "");
        }
@@ -375,7 +375,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                MainConsole.Instance.OutputFormat(
                    "Usage: debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]");
                return;
-            }           
+            }
            string param = args[4];
            string rawValue = args[5];
@@ -467,7 +467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                MainConsole.Instance.OutputFormat(
                    "Usage: debug lludp throttles get [<avatar-first-name> <avatar-last-name>]");
                return;
-            }           
+            }
            string firstName = null;
            string lastName = null;
@@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    ConsoleDisplayList cdl = new ConsoleDisplayList();
                    cdl.AddRow("adaptive", udpClient.FlowThrottle.AdaptiveEnabled);
                    cdl.AddRow("current", string.Format("{0} kbps", udpClient.FlowThrottle.DripRate * 8 / 1000));
-                    cdl.AddRow("request", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));  
+                    cdl.AddRow("request", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));
                    cdl.AddRow("max", string.Format("{0} kbps", udpClient.FlowThrottle.MaxDripRate * 8 / 1000));
                    m_console.Output(cdl.ToString());
@@ -509,12 +509,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate;
            cdl.AddRow(
-                "max-scene-throttle", 
+                "max-scene-throttle",
                maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
            int maxClientDripRate = m_udpServer.ThrottleRates.Total;
            cdl.AddRow(
-                "max-new-client-throttle", 
+                "max-new-client-throttle",
                maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
            m_console.Output(cdl.ToString());
@@ -529,7 +529,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                MainConsole.Instance.OutputFormat("Usage: debug lludp set <param> <value>");
                return;
-            }           
+            }
            string param = args[3];
            string rawValue = args[4];
@@ -552,7 +552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else
            {
-                return; 
+                return;
            }
            m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
@@ -598,7 +598,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                MainConsole.Instance.OutputFormat("Usage: debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]");
                return;
-            }        
+            }
            string param = args[4];
            string rawValue = args[5];
@@ -697,12 +697,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            string direction = args[3];
            string subCommand = args[4];
-            string packetName = args[5];           
+            string packetName = args[5];
            if (subCommand == "add")
            {
                MainConsole.Instance.OutputFormat(
-                    "Adding packet {0} to {1} drop list for all connections in {2}", 
+                    "Adding packet {0} to {1} drop list for all connections in {2}",
                    direction, packetName, m_udpServer.Scene.Name);
                m_udpServer.Scene.ForEachScenePresence(
@@ -720,7 +720,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            else if (subCommand == "remove")
            {
                MainConsole.Instance.OutputFormat(
-                    "Removing packet {0} from {1} drop list for all connections in {2}", 
+                    "Removing packet {0} from {1} drop list for all connections in {2}",
                    direction, packetName, m_udpServer.Scene.Name);
                m_udpServer.Scene.ForEachScenePresence(
@@ -868,10 +868,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                MainConsole.Instance.OutputFormat("OQRE in {0}", m_udpServer.Scene.Name);
                MainConsole.Instance.OutputFormat("Running: {0}", m_udpServer.OqrEngine.IsRunning);
                MainConsole.Instance.OutputFormat(
-                    "Requests waiting: {0}", 
+                    "Requests waiting: {0}",
                    m_udpServer.OqrEngine.IsRunning ? m_udpServer.OqrEngine.JobsWaiting.ToString() : "n/a");
            }
-            else 
+            else
            {
                MainConsole.Instance.OutputFormat("Unrecognized OQRE subcommand {0}", subCommand);
            }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 831381e..35a0711 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -3,25 +3,25 @@
 * Original Author: Jeff Cesnik
 * All rights reserved.
 *
- * - Redistribution and use in source and binary forms, with or without 
+ * - Redistribution and use in source and binary forms, with or without
 *   modification, are permitted provided that the following conditions are met:
 *
 * - Redistributions of source code must retain the above copyright notice, this
 *   list of conditions and the following disclaimer.
- * - Neither the name of the openmetaverse.org nor the names 
+ * - Neither the name of the openmetaverse.org nor the names
 *   of its contributors may be used to endorse or promote products derived from
 *   this software without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
@@ -107,10 +107,10 @@ namespace OpenMetaverse
        /// </summary>
        public float AverageReceiveTicksForLastSamplePeriod { get; private set; }
-                public int Port
+        public int Port
-                {
+        {
-                        get { return m_udpPort; }
+            get { return m_udpPort; }
-                }
+        }
        #region PacketDropDebugging
        /// <summary>
@@ -118,7 +118,7 @@ namespace OpenMetaverse
        /// outbound packets.
        /// </summary>
        private Random m_dropRandomGenerator = new Random();
-        
        /// <summary>
        /// For debugging purposes only... parameters for a simplified
        /// model of packet loss with bursts, overall drop rate should
@@ -137,7 +137,7 @@ namespace OpenMetaverse
        /// </summary>
        private int m_dropLastTick = 0;
        private int m_dropResetTicks = 500;
-        
        /// <summary>
        /// Debugging code used to simulate dropped packets with bursts
        /// </summary>
@@ -187,13 +187,13 @@ namespace OpenMetaverse
        ~OpenSimUDPBase()
        {
            if(m_udpSocket !=null)
-                try { m_udpSocket.Close(); } catch { }               
+                try { m_udpSocket.Close(); } catch { }
        }
        /// <summary>
        /// Start inbound UDP packet handling.
        /// </summary>
-        /// <param name="recvBufferSize">The size of the receive buffer for 
+        /// <param name="recvBufferSize">The size of the receive buffer for
-        /// the UDP socket. This value is passed up to the operating system 
+        /// the UDP socket. This value is passed up to the operating system
        /// and used in the system networking stack. Use zero to leave this
        /// value as the default</param>
        /// <param name="asyncPacketHandling">Set this to true to start
@@ -235,7 +235,7 @@ namespace OpenMetaverse
                }
                try
                {
-                    // This udp socket flag is not supported under mono, 
+                    // This udp socket flag is not supported under mono,
                    // so we'll catch the exception and continue
                    m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
                    m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set");
@@ -249,12 +249,12 @@ namespace OpenMetaverse
                // we never want two regions to listen on the same port as they cannot demultiplex each other's messages,
                // leading to a confusing bug.
                // By default, Windows does not allow two sockets to bind to the same port.
-                                //
+                //
-                                // Unfortunately, this also causes a crashed sim to leave the socket in a state
+                // Unfortunately, this also causes a crashed sim to leave the socket in a state
-                                // where it appears to be in use but is really just hung from the old process
+                // where it appears to be in use but is really just hung from the old process
-                                // crashing rather than closing it. While this protects agains misconfiguration,
+                // crashing rather than closing it. While this protects agains misconfiguration,
-                                // allowing crashed sims to be started up again right away, rather than having to
+                // allowing crashed sims to be started up again right away, rather than having to
-                                // wait 2 minutes for the socket to clear is more valuable. Commented 12/13/2016
+                // wait 2 minutes for the socket to clear is more valuable. Commented 12/13/2016
                // m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
                if (recvBufferSize != 0)
@@ -262,8 +262,8 @@ namespace OpenMetaverse
                m_udpSocket.Bind(ipep);
-                                if (m_udpPort == 0)
+                if (m_udpPort == 0)
-                                        m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port;
+                    m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port;
                IsRunningInbound = true;
@@ -334,7 +334,7 @@ namespace OpenMetaverse
        {
            UDPPacketBuffer buf;
-            // FIXME: Disabled for now as this causes issues with reused packet objects interfering with each other 
+            // FIXME: Disabled for now as this causes issues with reused packet objects interfering with each other
            // on Windows with m_asyncPacketHandling = true, though this has not been seen on Linux.
            // Possibly some unexpected issue with fetching UDP data concurrently with multiple threads.  Requires more investigation.
 //            if (UsePools)
@@ -387,8 +387,8 @@ namespace OpenMetaverse
                        m_log.Warn("[UDPBASE]: Salvaged the UDP listener on port " + m_udpPort);
                    }
                }
-                catch (ObjectDisposedException e) 
+                catch (ObjectDisposedException e)
-                { 
+                {
                    m_log.Error(
                        string.Format("[UDPBASE]: Error processing UDP begin receive {0}.  Exception  ", UdpReceives), e);
                }
@@ -434,7 +434,7 @@ namespace OpenMetaverse
                    // since this should be rare and  won't cause a runtime problem.
                    if (m_currentReceiveTimeSamples >= s_receiveTimeSamples)
                    {
-                        AverageReceiveTicksForLastSamplePeriod 
+                        AverageReceiveTicksForLastSamplePeriod
                            = (float)m_receiveTicksInCurrentSamplePeriod / s_receiveTimeSamples;
                        m_receiveTicksInCurrentSamplePeriod = 0;
@@ -446,16 +446,16 @@ namespace OpenMetaverse
                        m_currentReceiveTimeSamples++;
                    }
                }
-                catch (SocketException se) 
+                catch (SocketException se)
-                { 
+                {
                    m_log.Error(
                        string.Format(
-                            "[UDPBASE]: Error processing UDP end receive {0}, socket error code {1}.  Exception  ", 
+                            "[UDPBASE]: Error processing UDP end receive {0}, socket error code {1}.  Exception  ",
-                            UdpReceives, se.ErrorCode), 
+                            UdpReceives, se.ErrorCode),
                        se);
                }
-                catch (ObjectDisposedException e) 
+                catch (ObjectDisposedException e)
-                { 
+                {
                    m_log.Error(
                        string.Format("[UDPBASE]: Error processing UDP end receive {0}.  Exception  ", UdpReceives), e);
                }
@@ -486,7 +486,7 @@ namespace OpenMetaverse
                // packets when testing throttles & retransmission code
                // if (DropOutgoingPacket())
                //     return;
-            
                try
                {
                    m_udpSocket.BeginSendTo(
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
index 5a2bcee..f585bea 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public int PacketsPooled
        {
-            get 
+            get
            {
                lock (pool)
                    return pool.Count;
@@ -74,9 +74,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public int BlocksPooled
        {
-            get 
+            get
            {
-                lock (DataBlocks) 
+                lock (DataBlocks)
                    return DataBlocks.Count;
            }
        }
@@ -248,7 +248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            }
                        }
                        break;
-                    
                    // Other packets wont pool
                    default:
                        return;
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    DataBlocks[typeof(T)] = new Stack<Object>();
                }
-                
                return new T();
            }
        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
index 1443477..4a8f16d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Mono.Addins;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Region.ClientStack.LindenUDP")]
@@ -15,8 +15,8 @@ using Mono.Addins;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -26,7 +26,7 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a935dd2..0e1a9e3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            m_scene = new SceneHelpers().SetupScene();
            StatsManager.SimExtraStats = new SimExtraStatsCollector();
        }
-        
 //        /// <summary>
 //        /// Build an object name packet for test purposes
 //        /// </summary>
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            odb.Name = Utils.StringToBytes(objectName);
 //            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
 //            onp.Header.Zerocoded = false;
-//            
+//
 //            return onp;
 //        }
 //
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            config.Set("AckTimeout", -1);
            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics);
-            ScenePresence sp 
+            ScenePresence sp
                = ClientStackHelpers.AddChildClient(
                    m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -175,21 +175,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            uint myCircuitCode = 123457;
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
-//            
+//
 //            // Check that removing a non-existent circuit doesn't have any bad effects
 //            testLLUDPServer.RemoveClientCircuit(101);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
 //        }
-//        
+//
 //        /// <summary>
 //        /// Make sure that the client stack reacts okay to malformed packets
 //        /// </summary>
@@ -200,8 +200,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //
 //            uint myCircuitCode = 123458;
 //            EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001);
-//            MockScene scene = new MockScene(); 
+//            MockScene scene = new MockScene();
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
@@ -213,24 +213,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            // Send two garbled 'packets' in succession
 //            testLLUDPServer.LoadReceive(data, testEp);
 //            testLLUDPServer.LoadReceive(data, testEp);
-//            testLLUDPServer.ReceiveData(null); 
+//            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            // Check that we are still here
 //            Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode));
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(0));
-//            
+//
 //            // Check that sending a valid packet to same circuit still succeeds
 //            Assert.That(scene.ObjectNameCallsReceived, Is.EqualTo(0));
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
 //        }
-//        
+//
 //        /// <summary>
-//        /// Test that the stack continues to work even if some client has caused a 
+//        /// Test that the stack continues to work even if some client has caused a
 //        /// SocketException on Socket.BeginReceive()
 //        /// </summary>
 //        [Test]
@@ -239,32 +239,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            MockScene scene = new MockScene();
-//            
+//
 //            uint circuitCodeA = 130000;
 //            EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300);
 //            UUID agentIdA   = UUID.Parse("00000000-0000-0000-0000-000000001300");
 //            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");
-//            
+//
 //            uint circuitCodeB = 130001;
 //            EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301);
 //            UUID agentIdB   = UUID.Parse("00000000-0000-0000-0000-000000001301");
 //            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm);
 //            AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet1"), epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet2"), epB);
 //            testLLUDPServer.LoadReceiveWithBeginException(epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
-//         
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
 //        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
index 92f1fc3..1731aa9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            agent.InventoryFolder = UUID.Zero;
 //            agent.startpos = Vector3.Zero;
 //            agent.CapsPath = "http://wibble.com";
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
 //
 //            TestClient testClient = new TestClient(agent, scene);
-//            
+//
 //            LLPacketHandler packetHandler
 //                = new LLPacketHandler(testClient, testLLPacketServer, new ClientStackUserSettings());
 //
@@ -87,14 +87,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //        /// <param name="testPacketServer"></param>
 //        /// <param name="acm">Agent circuit manager used in setting up the stack</param>
 //        protected void SetupStack(
-//            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, 
+//            IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer,
 //            out AgentCircuitManager acm)
 //        {
 //            IConfigSource configSource = new IniConfigSource();
 //            ClientStackUserSettings userSettings = new ClientStackUserSettings();
 //            testLLUDPServer = new TestLLUDPServer();
 //            acm = new AgentCircuitManager();
-//                                    
+//
 //            uint port = 666;
 //            testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm);
 //            testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
index 5e41dbd..873b1e5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            Scene scene = new SceneHelpers().SetupScene();
            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
-            ScenePresence sp 
+            ScenePresence sp
                = ClientStackHelpers.AddChildClient(
                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            udpServer.Throttle.DebugLevel = 1;
            udpClient.ThrottleDebugLevel = 1;
-            
            int resendBytes = 1000;
            int landBytes = 2000;
            int windBytes = 3000;
@@ -161,8 +161,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            int totalBytes = LLUDPServer.MTU + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes;
            AssertThrottles(
-                udpClient, 
+                udpClient,
-                LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes, 
+                LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes,
                textureBytes, assetBytes, totalBytes, 0, 0);
        }
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene, ics);
-            ScenePresence sp 
+            ScenePresence sp
                = ClientStackHelpers.AddChildClient(
                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -207,7 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            double commitRatio = 32000.0 / totalBytes;
            AssertThrottles(
-                udpClient, 
+                udpClient,
                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
@@ -217,7 +217,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            commitRatio = (32000.0 + 20.0 * LLUDPServer.MTU) / totalBytes;
            AssertThrottles(
-                udpClient, 
+                udpClient,
                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
@@ -227,7 +227,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes;
            AssertThrottles(
-                udpClient, 
+                udpClient,
                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
        }
@@ -248,14 +248,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            int taskBytes = 14000;
            int textureBytes = 16000;
            int assetBytes = 18000;
-            int totalBytes 
+            int totalBytes
                = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
            Scene scene = new SceneHelpers().SetupScene();
            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
            udpServer.Throttle.RequestedDripRate = totalBytes;
-            ScenePresence sp1 
+            ScenePresence sp1
                = ClientStackHelpers.AddChildClient(
                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -265,8 +265,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
            AssertThrottles(
-                udpClient1, 
+                udpClient1,
-                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2,
                textureBytes / 2, assetBytes / 2, totalBytes, 0, 0);
            // Test: Now add another client
@@ -281,13 +281,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
            AssertThrottles(
-                udpClient1, 
+                udpClient1,
-                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4,
                textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
            AssertThrottles(
-                udpClient2, 
+                udpClient2,
-                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4,
                textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
        }
@@ -307,14 +307,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            int taskBytes = 12000;
            int textureBytes = 14000;
            int assetBytes = 16000;
-            int totalBytes 
+            int totalBytes
                = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
            Scene scene = new SceneHelpers().SetupScene();
            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
            udpServer.ThrottleRates.Total = totalBytes;
-            ScenePresence sp 
+            ScenePresence sp
                = ClientStackHelpers.AddChildClient(
                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -325,8 +325,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
            AssertThrottles(
-                udpClient, 
+                udpClient,
-                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2,
                textureBytes / 2, assetBytes / 2, totalBytes, 0, totalBytes);
        }
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            udpServer.ThrottleRates.Total = (int)(totalBytes * 1.1);
            udpServer.Throttle.RequestedDripRate = (int)(totalBytes * 1.5);
-            ScenePresence sp1 
+            ScenePresence sp1
                = ClientStackHelpers.AddChildClient(
                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
@@ -363,8 +363,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
            AssertThrottles(
-                udpClient1, 
+                udpClient1,
-                resendBytes, landBytes, windBytes, cloudBytes, taskBytes, 
+                resendBytes, landBytes, windBytes, cloudBytes, taskBytes,
                textureBytes, assetBytes, totalBytes, 0, totalBytes * 1.1);
            // Now add another client
@@ -379,25 +379,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
                udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
            AssertThrottles(
-                udpClient1, 
+                udpClient1,
-                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75,
                textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
            AssertThrottles(
-                udpClient2, 
+                udpClient2,
-                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75,
                textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
        }
        private void AssertThrottles(
-            LLUDPClient udpClient, 
+            LLUDPClient udpClient,
            double resendBytes, double landBytes, double windBytes, double cloudBytes, double taskBytes, double textureBytes, double assetBytes,
            double totalBytes, double targetBytes, double maxBytes)
        {
            ClientInfo ci = udpClient.GetClientInfo();
 //                            Console.WriteLine(
-//                                "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}", 
+//                                "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}",
 //                                ci.resendThrottle, ci.landThrottle, ci.windThrottle, ci.cloudThrottle, ci.taskThrottle, ci.textureThrottle, ci.assetThrottle, ci.totalThrottle);
            Assert.AreEqual((int)resendBytes, ci.resendThrottle, "Resend");
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 6278e36..f8ec97a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -58,14 +58,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Flag used to enable adaptive throttles</summary>
        public bool AdaptiveThrottlesEnabled;
- 
        /// <summary>
        /// Set the minimum rate that the adaptive throttles can set. The viewer
        /// can still throttle lower than this, but the adaptive throttles will
        /// never decrease rates below this no matter how many packets are dropped
        /// </summary>
        public Int64 MinimumAdaptiveThrottleRate;
- 
        /// <summary>Amount of the texture throttle to steal for the task throttle</summary>
        public double CannibalizeTextureRate;
@@ -109,7 +109,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
 //                CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
                CannibalizeTextureRate = 0f;
-    
            }
            catch (Exception) { }
        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
index cac57b2..1daf091 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
@@ -44,24 +44,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static Int32 m_counter = 0;
-        
-//        private Int32 m_identifier;      
+//        private Int32 m_identifier;
-  
        protected const float m_timeScale = 1e-3f;
        /// <summary>
-        /// This is the number of m_minimumDripRate bytes 
+        /// This is the number of m_minimumDripRate bytes
        /// allowed in a burst
        /// roughtly, with this settings, the maximum time system will take
        /// to recheck a bucket in ms
-        /// 
+        ///
        /// </summary>
        protected const float m_quantumsPerBurst = 5;
-                
        /// <summary>
        /// </summary>
        protected const float m_minimumDripRate = 1500;
-        
        /// <summary>Time of the last drip</summary>
        protected double m_lastDrip;
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        protected Dictionary<TokenBucket, float> m_children = new Dictionary<TokenBucket, float>();
-        
 #region Properties
        /// <summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        /// <summary>
        /// This is the maximum number
-        /// of tokens that can accumulate in the bucket at any one time. This 
+        /// of tokens that can accumulate in the bucket at any one time. This
        /// also sets the total request for leaf nodes
        /// </summary>
        protected float m_burst;
@@ -127,14 +127,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                return (float)rate;
            }
        }
-               
        /// <summary>
        /// The requested drip rate for this particular bucket.
        /// </summary>
        /// <remarks>
        /// 0 then TotalDripRequest is used instead.
        /// Can never be above MaxDripRate.
-        /// Tokens are added to the bucket at any time 
+        /// Tokens are added to the bucket at any time
        /// <seealso cref="RemoveTokens"/> is called, at the granularity of
        /// the system tick interval (typically around 15-22ms)</remarks>
        protected float m_dripRate;
@@ -170,12 +170,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// The current total of the requested maximum burst rates of children buckets.
        /// </summary>
        protected float m_totalDripRequest;
-        public float TotalDripRequest 
+        public float TotalDripRequest
        {
            get { return m_totalDripRequest; }
            set { m_totalDripRequest = value; }
        }
-        
 #endregion Properties
 #region Constructor
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// zero if this bucket has no maximum capacity</param>
        /// <param name="dripRate">Rate that the bucket fills, in bytes per
        /// second. If zero, the bucket always remains full</param>
-        public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst) 
+        public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst)
        {
            m_counter++;
@@ -240,7 +240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                foreach (KeyValuePair<TokenBucket, float> cref in m_children)
                    m_totalDripRequest += cref.Value;
            }
-            
            // Pass the new values up to the parent
            if (m_parent != null)
                m_parent.RegisterRequest(this, Math.Min(RequestedDripRate, TotalDripRequest));
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (Parent != null)
                Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
        }
-        
        /// <summary>
        /// Remove a given number of tokens from the bucket
        /// </summary>
@@ -302,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Add tokens to the bucket over time. The number of tokens added each
-        /// call depends on the length of time that has passed since the last 
+        /// call depends on the length of time that has passed since the last
        /// call to Drip
        /// </summary>
        /// <returns>True if tokens were added to the bucket, otherwise false</returns>
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0 for {0}", m_counter);
                return;
            }
-            
            double now = Util.GetTimeStampMS();
            double deltaMS = now - m_lastDrip;
            m_lastDrip = now;
@@ -333,13 +333,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
    public class AdaptiveTokenBucket : TokenBucket
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);               
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public bool AdaptiveEnabled { get; set; }
        /// <summary>
        /// The minimum rate for flow control. Minimum drip rate is one
-        /// packet per second. 
+        /// packet per second.
        /// </summary>
        protected const float m_minimumFlow = 50000;
@@ -361,7 +361,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool m_enabled = false;
        // <summary>
-        // Adjust drip rate in response to network conditions. 
+        // Adjust drip rate in response to network conditions.
        // </summary>
        public float AdjustedDripRate
        {
@@ -374,10 +374,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    m_parent.RegisterRequest(this, m_dripRate);
            }
        }
-                
-   
        // <summary>
-        // 
+        //
        // </summary>
        public AdaptiveTokenBucket(TokenBucket parent, float maxDripRate, float maxBurst, bool enabled)
            : base(parent, maxDripRate, maxBurst)
@@ -393,7 +393,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (m_parent != null)
                m_parent.RegisterRequest(this, m_dripRate);
        }
-                
        /// <summary>
        /// Reliable packets sent to the client for which we never received an ack adjust the drip rate down.
        /// <param name="packets">Number of packets that expired without successful delivery</param>
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        // <summary>
-        // 
+        //
        // </summary>
        public void AcknowledgePackets(Int32 count)
        {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
index c9d5697..76f4c6f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_packets.Clear();
            m_pendingAdds = null;
            m_pendingAcknowledgements = null;
-            m_pendingRemoves = null;           
+            m_pendingRemoves = null;
        }
        /// <summary>
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void Add(OutgoingPacket packet)
        {
            m_pendingAdds.Enqueue(packet);
-            Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);            
+            Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);
        }
        /// <summary>
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Marks a packet as no longer needing acknowledgement without a received acknowledgement.
        /// This method is called when a packet expires and we no longer need an acknowledgement.
-        /// When some reliable packet types expire, they are handled in a way other than simply 
+        /// When some reliable packet types expire, they are handled in a way other than simply
        /// resending them. The only effect of removal this way is to update unacked byte count.
        /// </summary>
        /// <param name="sequenceNumber">Sequence number of the packet to
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                foreach (OutgoingPacket packet in m_packets.Values)
                {
-                    // TickCount of zero means a packet is in the resend queue 
+                    // TickCount of zero means a packet is in the resend queue
                    // but hasn't actually been sent over the wire yet
                    if (packet.TickCount == 0)
                        continue;
@@ -172,7 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        // As with other network applications, assume that an expired packet is
                        // an indication of some network problem, slow transmission
                        packet.Client.FlowThrottle.ExpirePackets(1);
-                        
                        expiredPackets.Add(packet);
                    }
                }
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            while (m_pendingAdds.TryDequeue(out pendingAdd))
                if (pendingAdd != null)
                    m_packets[pendingAdd.SequenceNumber] = pendingAdd;
-            
            // Process all the pending removes, including updating statistics and round-trip times
            PendingAck pendingAcknowledgement;
            while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                else
                {
                    // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack",
-                    //                  pendingAcknowledgement.SequenceNumber);                    
+                    //                  pendingAcknowledgement.SequenceNumber);
                }
            }
author	UbitUmarov	2017-01-05 19:32:57 +0000
committer	UbitUmarov	2017-01-05 19:32:57 +0000
commit	254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch)
tree	8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ClientStack/Linden
parent	Merge branch 'master' into httptests (diff)
parent	Massive tab and trailing space cleanup (diff)
download	opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz