15 files changed, 3109 insertions, 2330 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 4d0568d..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
@@ -234,6 +234,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            m_stopPacket = TexturePacketCount();
                        }
+                        //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
+                        if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
                        m_currentPacket = StartPacket;
                    }
                }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index b17b822..2ff6ced 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
    /// Handles new client connections
    /// Constructor takes a single Packet and authenticates everything
    /// </summary>
-    public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IStatsCollector
+    public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IStatsCollector, IClientIPEndpoint
    {
        /// <value>
        /// Debug packet level.  See OpenSim.RegisterConsoleCommands() for more details.
@@ -80,6 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event ChatMessage OnChatFromClient;
        public event RezObject OnRezObject;
        public event DeRezObject OnDeRezObject;
+        public event RezRestoreToWorld OnRezRestoreToWorld;
        public event ModifyTerrain OnModifyTerrain;
        public event Action<IClientAPI> OnRegionHandShakeReply;
        public event GenericCall1 OnRequestWearables;
@@ -100,6 +101,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event AvatarPickerRequest OnAvatarPickerRequest;
        public event StartAnim OnStartAnim;
        public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
        public event Action<IClientAPI> OnRequestAvatarsData;
        public event LinkObjects OnLinkObjects;
        public event DelinkObjects OnDelinkObjects;
@@ -127,6 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
        public event UpdatePrimFlags OnUpdatePrimFlags;
        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event ClientChangeObject onClientChangeObject;
        public event UpdateVector OnUpdatePrimGroupPosition;
        public event UpdateVector OnUpdatePrimSinglePosition;
        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -156,6 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event RequestTaskInventory OnRequestTaskInventory;
        public event UpdateInventoryItem OnUpdateInventoryItem;
        public event CopyInventoryItem OnCopyInventoryItem;
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
        public event MoveInventoryItem OnMoveInventoryItem;
        public event RemoveInventoryItem OnRemoveInventoryItem;
        public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -250,7 +254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event ClassifiedInfoRequest OnClassifiedInfoRequest;
        public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
        public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
        public event EventNotificationAddRequest OnEventNotificationAddRequest;
        public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
        public event EventGodDelete OnEventGodDelete;
@@ -281,10 +285,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
        public event SimWideDeletesDelegate OnSimWideDeletes;
        public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
        public event MuteListEntryUpdate OnUpdateMuteListEntry;
        public event MuteListEntryRemove OnRemoveMuteListEntry;
        public event GodlikeMessage onGodlikeMessage;
        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
+        public event GenericCall2 OnUpdateThrottles;
 #pragma warning disable 0067
        public event GenericMessage OnGenericMessage;
@@ -319,6 +325,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public LLImageManager ImageManager { get; private set; }
+        public JobEngine m_asyncPacketProcess;
        private readonly LLUDPServer m_udpServer;
        private readonly LLUDPClient m_udpClient;
        private readonly UUID m_sessionId;
@@ -333,26 +340,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private PriorityQueue m_entityProps;
        private Prioritizer m_prioritizer;
        private bool m_disableFacelights = false;
-        private volatile bool m_justEditedTerrain = false;
-        /// <value>
+        // needs optimazation
-        /// List used in construction of data blocks for an object update packet.  This is to stop us having to
+        private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>();
-        /// continually recreate it.
-        /// </value>
+        private bool m_VelocityInterpolate = false;
-        protected List<ObjectUpdatePacket.ObjectDataBlock> m_fullUpdateDataBlocksBuilder;
+        private const uint MaxTransferBytesPerPacket = 600;
        /// <value>
        /// Maintain a record of all the objects killed.  This allows us to stop an update being sent from the
        /// thread servicing the m_primFullUpdates queue after a kill.  If this happens the object persists as an
        /// ownerless phantom.
        ///
-        /// All manipulation of this set has to occur under a lock
+        /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
        ///
        /// </value>
-        protected HashSet<uint> m_killRecord;
+        protected List<uint> m_killRecord;
 //        protected HashSet<uint> m_attachmentsSent;
-        private int m_animationSequenceNumber = 1;
+        private bool m_deliverPackets = true;
        private bool m_SendLogoutPacketWhenClosing = true;
        /// <summary>
@@ -371,7 +379,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected Scene m_scene;
        protected string m_firstName;
        protected string m_lastName;
-        protected Thread m_clientThread;
        protected Vector3 m_startpos;
        protected UUID m_activeGroupID;
        protected string m_activeGroupName = String.Empty;
@@ -398,18 +405,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            get { return m_startpos; }
            set { m_startpos = value; }
        }
+        public bool DeliverPackets
+        {
+            get { return m_deliverPackets; }
+            set {
+                m_deliverPackets = value;
+                m_udpClient.m_deliverPackets = value;
+            }
+        }
        public UUID AgentId { get { return m_agentId; } }
        public ISceneAgent SceneAgent { get; set; }
-        public UUID ActiveGroupId { get { return m_activeGroupID; } private set { m_activeGroupID = value; } }
+        public UUID ActiveGroupId { get { return m_activeGroupID; } set { m_activeGroupID = value; } }
-        public string ActiveGroupName { get { return m_activeGroupName; } private set { m_activeGroupName = value; } }
+        public string ActiveGroupName { get { return m_activeGroupName; } set { m_activeGroupName = value; } }
-        public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } private set { m_activeGroupPowers = value; } }
+        public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } set { m_activeGroupPowers = value; } }
        public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); }
+        public int PingTimeMS
+        {
+            get
+            {
+                if (UDPClient != null)
+                    return UDPClient.PingTimeMS;
+                return 0;
+            }
+        }
        /// <summary>
        /// Entity update queues
        /// </summary>
        public PriorityQueue EntityUpdateQueue { get { return m_entityUpdates; } }
-        
        /// <summary>
        /// First name of the agent/avatar represented by the client
        /// </summary>
@@ -426,7 +451,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public string Name { get { return FirstName + " " + LastName; } }
        public uint CircuitCode { get { return m_circuitCode; } }
-        public int NextAnimationSequenceNumber { get { return m_animationSequenceNumber++; } }
+        public int NextAnimationSequenceNumber
+        {
+            get { return m_udpServer.NextAnimationSequenceNumber; }
+        }
        /// <summary>
        /// As well as it's function in IClientAPI, in LLClientView we are locking on this property in order to
@@ -447,8 +475,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            set { m_disableFacelights = value; }
        }
+        public List<uint> SelectedObjects {get; private set;}
        public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
        #endregion Properties
 //        ~LLClientView()
@@ -465,6 +496,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            DebugPacketLevel = 1;
            CloseSyncLock = new Object();
+            SelectedObjects = new List<uint>();
            RegisterInterface<IClientIM>(this);
            RegisterInterface<IClientInventory>(this);
@@ -473,8 +505,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_scene = scene;
            m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
            m_entityProps = new PriorityQueue(m_scene.Entities.Count);
-            m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
+            m_killRecord = new List<uint>();
-            m_killRecord = new HashSet<uint>();
 //            m_attachmentsSent = new HashSet<uint>();
            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -498,18 +529,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_prioritizer = new Prioritizer(m_scene);
            RegisterLocalPacketHandlers();
+            string name = string.Format("AsyncInUDP-{0}",m_agentId.ToString());
+            m_asyncPacketProcess = new JobEngine(name, name, 10000);
            IsActive = true;
        }
        #region Client Methods
+        /// <summary>
+        /// Close down the client view
+        /// </summary>
        public void Close()
        {
-            Close(false);
+            Close(true, false);
        }
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
        {
            // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
            // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
@@ -519,14 +555,14 @@ 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;
                }
                IsActive = false;
-                CloseWithoutChecks();
+                CloseWithoutChecks(sendStop);
            }
        }
@@ -539,19 +575,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        ///
        /// Callers must lock ClosingSyncLock before calling.
        /// </remarks>
-        public void CloseWithoutChecks()
+        public void CloseWithoutChecks(bool sendStop)
        {
            m_log.DebugFormat(
                "[CLIENT]: Close has been called for {0} attached to scene {1}",
                Name, m_scene.RegionInfo.RegionName);
-            // Shutdown the image manager
+            if (sendStop)
-            ImageManager.Close();
+            {
+                // Send the STOP packet
+                DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
+                OutPacket(disable, ThrottleOutPacketType.Unknown);
+            }
            // Fire the callback for this connection closing
            if (OnConnectionClosed != null)
                OnConnectionClosed(this);
+            m_asyncPacketProcess.Stop();
            // Flush all of the packets out of the UDP server for this client
            if (m_udpServer != null)
                m_udpServer.Flush(m_udpClient);
@@ -565,11 +608,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            //m_scene.CloseAllAgents(CircuitCode);
            // Disable UDP handling for this client
+            m_udpClient.OnQueueEmpty -= HandleQueueEmpty;
+            m_udpClient.HasUpdates -= HandleHasUpdates;
+            m_udpClient.OnPacketStats -= PopulateStats;
            m_udpClient.Shutdown();
-            //m_log.InfoFormat("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
+            // Shutdown the image manager
-            //GC.Collect();
+            ImageManager.Close();
-            //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
+            ImageManager = null;
+            m_entityUpdates = new PriorityQueue(1);
+            m_entityProps = new PriorityQueue(1);
+            m_killRecord.Clear();
+            GroupsInView.Clear();
+            if(m_scene.GetNumberOfClients() == 0)
+            {
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+                GC.Collect();
+            }
        }
        public void Kick(string message)
@@ -648,36 +706,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <returns>true if the handler was added.  This is currently always the case.</returns>
        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler, bool doAsync)
        {
-            return AddLocalPacketHandler(packetType, handler, doAsync, false);
-        }
-        /// <summary>
-        /// Add a handler for the given packet type.
-        /// </summary>
-        /// <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 
-        /// 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. 
-        /// 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.
-        /// </param>
-        /// <returns>true if the handler was added.  This is currently always the case.</returns>
-        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler, bool doAsync, bool inEngine)
-        {
            bool result = false;
            lock (m_packetHandlers)
            {
                if (!m_packetHandlers.ContainsKey(packetType))
                {
                    m_packetHandlers.Add(
-                        packetType, new PacketProcessor() { method = handler, Async = doAsync, InEngine = inEngine });
+                        packetType, new PacketProcessor() { method = handler, Async = doAsync});
                    result = true;
                }
            }
@@ -712,30 +747,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            PacketProcessor pprocessor;
            if (m_packetHandlers.TryGetValue(packet.Type, out pprocessor))
            {
-                ClientInfo cinfo = UDPClient.GetClientInfo();
                //there is a local handler for this packet type
                if (pprocessor.Async)
                {
-                    if (!cinfo.AsyncRequests.ContainsKey(packet.Type.ToString()))
-                        cinfo.AsyncRequests[packet.Type.ToString()] = 0;
-                    cinfo.AsyncRequests[packet.Type.ToString()]++;
                    object obj = new AsyncPacketProcess(this, pprocessor.method, packet);
+                    m_asyncPacketProcess.QueueJob(packet.Type.ToString(), () => ProcessSpecificPacketAsync(obj));
-                    if (pprocessor.InEngine)
-                        m_udpServer.IpahEngine.QueueJob(packet.Type.ToString(), () => ProcessSpecificPacketAsync(obj));
-                    else
-                        Util.FireAndForget(ProcessSpecificPacketAsync, obj, packet.Type.ToString());
                    result = true;
                }
                else
                {
-                    if (!cinfo.SyncRequests.ContainsKey(packet.Type.ToString()))
-                        cinfo.SyncRequests[packet.Type.ToString()] = 0;
-                    cinfo.SyncRequests[packet.Type.ToString()]++;
                    result = pprocessor.method(this, packet);
                }
            }
@@ -750,11 +771,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                }
                if (found)
                {
-                    ClientInfo cinfo = UDPClient.GetClientInfo();
-                    if (!cinfo.GenericRequests.ContainsKey(packet.Type.ToString()))
-                        cinfo.GenericRequests[packet.Type.ToString()] = 0;
-                    cinfo.GenericRequests[packet.Type.ToString()]++;
                    result = method(this, packet);
                }
            }
@@ -774,7 +790,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);
            }
        }
@@ -785,9 +801,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public virtual void Start()
        {
+            m_asyncPacketProcess.Start();
            m_scene.AddNewAgent(this, PresenceType.User);
-            RefreshGroupMembership();
+//            RefreshGroupMembership();
        }
        # endregion
@@ -858,6 +875,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
        {
+            m_thisAgentUpdateArgs.CameraAtAxis.X = float.MinValue;
+//            m_thisAgentUpdateArgs.ControlFlags = uint.MaxValue;
+            m_thisAgentUpdateArgs.ControlFlags = 0;
            AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
            mov.SimData.ChannelVersion = m_channelVersion;
            mov.AgentData.SessionID = m_sessionId;
@@ -893,14 +914,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            reply.ChatData.OwnerID = ownerID;
            reply.ChatData.SourceID = fromAgentID;
-            OutPacket(reply, ThrottleOutPacketType.Task);
+            OutPacket(reply, ThrottleOutPacketType.Unknown);
        }
        /// <summary>
        /// Send an instant message to this client
        /// </summary>
        //
-        // Don't remove transaction ID! Groups and item gives need to set it!
        public void SendInstantMessage(GridInstantMessage im)
        {
            if (((Scene)(m_scene)).Permissions.CanInstantMessage(new UUID(im.fromAgentID), new UUID(im.toAgentID)))
@@ -913,6 +933,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName);
                msg.MessageBlock.Dialog = im.dialog;
                msg.MessageBlock.FromGroup = im.fromGroup;
+                // this is odd
                if (im.imSessionID == UUID.Zero.Guid)
                    msg.MessageBlock.ID = new UUID(im.fromAgentID) ^ new UUID(im.toAgentID);
                else
@@ -926,32 +947,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                msg.MessageBlock.Message = Util.StringToBytes1024(im.message);
                msg.MessageBlock.BinaryBucket = im.binaryBucket;
-                if (im.message.StartsWith("[grouptest]"))
+                OutPacket(msg, ThrottleOutPacketType.Task);
-                { // this block is test code for implementing group IM - delete when group IM is finished
-                    IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
-                    if (eq != null)
-                    {
-                        im.dialog = 17;
-                        //eq.ChatterboxInvitation(
-                        //    new UUID("00000000-68f9-1111-024e-222222111123"),
-                        //    "OpenSimulator Testing", im.fromAgentID, im.message, im.toAgentID, im.fromAgentName, im.dialog, 0,
-                        //    false, 0, new Vector3(), 1, im.imSessionID, im.fromGroup, im.binaryBucket);
-                        eq.ChatterboxInvitation(
-                            new UUID("00000000-68f9-1111-024e-222222111123"),
-                            "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0,
-                            false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing"));
-                        eq.ChatterBoxSessionAgentListUpdates(
-                            new UUID("00000000-68f9-1111-024e-222222111123"),
-                            new UUID(im.fromAgentID), new UUID(im.toAgentID), false, false, false);
-                    }
-                    Console.WriteLine("SendInstantMessage: " + msg);
-                }
-                else
-                    OutPacket(msg, ThrottleOutPacketType.Task);
            }
        }
@@ -1182,6 +1178,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(GATRP, ThrottleOutPacketType.Task);
        }
+        public virtual bool CanSendLayerData()
+        {
+            int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land);
+            if ( n > 128)
+                return false;
+            return true;
+        }
        /// <summary>
        ///  Send the region heightmap to the client
        ///  This method is only called when not doing intellegent terrain patch sending and
@@ -1192,6 +1197,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public virtual void SendLayerData(float[] map)
        {
            Util.FireAndForget(DoSendLayerData, m_scene.Heightmap.GetTerrainData(), "LLClientView.DoSendLayerData");
+            // Send it sync, and async. It's not that much data
+            // and it improves user experience just so much!
+//            DoSendLayerData(map);
        }
        /// <summary>
@@ -1214,7 +1223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                //}
                // Send LayerData in a spiral pattern. Fun!
-                SendLayerTopRight(map, 0, 0, map.SizeX/Constants.TerrainPatchSize-1, map.SizeY/Constants.TerrainPatchSize-1);
+                SendLayerTopRight(map, 0, 0, map.SizeX / Constants.TerrainPatchSize - 1, map.SizeY / Constants.TerrainPatchSize - 1);
            }
            catch (Exception e)
            {
@@ -1250,27 +1259,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
        }
-        /// <summary>
-        /// Sends a set of four patches (x, x+1, ..., x+3) to the client
-        /// </summary>
-        /// <param name="map">heightmap</param>
-        /// <param name="px">X coordinate for patches 0..12</param>
-        /// <param name="py">Y coordinate for patches 0..15</param>
-        // private void SendLayerPacket(float[] map, int y, int x)
-        // {
-        //     int[] patches = new int[4];
-        //     patches[0] = x + 0 + y * 16;
-        //     patches[1] = x + 1 + y * 16;
-        //     patches[2] = x + 2 + y * 16;
-        //     patches[3] = x + 3 + y * 16;
-        //     Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
-        //     OutPacket(layerpack, ThrottleOutPacketType.Land);
-        // }
        // 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'
@@ -1316,6 +1308,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        /// <summary>
        /// Sends a terrain packet for the point specified.
        /// This is a legacy call that has refarbed the terrain into a flat map of floats.
        /// We just use the terrain from the region we know about.
@@ -1334,32 +1327,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            try
            {
-                /* test code using the terrain compressor in libOpenMetaverse
+                byte landPacketType;
-                int[] patchInd = new int[1];
+                if (terrData.SizeX > Constants.RegionSize || terrData.SizeY > Constants.RegionSize)
-                patchInd[0] = px + (py * Constants.TerrainPatchSize);
+                    landPacketType = (byte)TerrainPatch.LayerType.LandExtended;
-                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(terrData.GetFloatsSerialized(), patchInd);
+                else
-                 */
+                    landPacketType = (byte)TerrainPatch.LayerType.Land;
-                // Many, many patches could have been passed to us. Since the patches will be compressed
-                //   into variable sized blocks, we cannot pre-compute how many will fit into one
-                //   packet. While some fancy packing algorithm is possible, 4 seems to always fit.
-                int PatchesAssumedToFit = 4;
-                for (int pcnt = 0; pcnt < px.Length; pcnt += PatchesAssumedToFit)
-                {
-                    int remaining = Math.Min(px.Length - pcnt, PatchesAssumedToFit);
-                    int[] xPatches = new int[remaining];
-                    int[] yPatches = new int[remaining];
-                    for (int ii = 0; ii < remaining; ii++)
-                    {
-                        xPatches[ii] = px[pcnt + ii];
-                        yPatches[ii] = py[pcnt + ii];
-                    }
-                    LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, xPatches, yPatches);
-                    // DebugSendingPatches("SendLayerDataInternal", xPatches, yPatches);
-                    SendTheLayerPacket(layerpack);
-                }
-                // LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, px, py);
+                List<LayerDataPacket> packets = OpenSimTerrainCompressor.CreateLayerDataPackets(terrData, px, py, landPacketType);
+                foreach(LayerDataPacket pkt in packets)
+                    OutPacket(pkt, ThrottleOutPacketType.Land);
            }
            catch (Exception e)
            {
@@ -1367,110 +1343,125 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
        }
-        // When a user edits the terrain, so much data is sent, the data queues up fast and presents a
-        // sub optimal editing experience. To alleviate this issue, when the user edits the terrain, we
-        // start skipping the queues until they're done editing the terrain. We also make them
-        // unreliable because it's extremely likely that multiple packets will be sent for a terrain patch
-        // area invalidating previous packets for that area.
-        // It's possible for an editing user to flood themselves with edited packets but the majority
+        // wind caching
-        // of use cases are such that only a tiny percentage of users will be editing the terrain.
+        private static Dictionary<ulong,int> lastWindVersion = new Dictionary<ulong,int>();
-        // Other, non-editing users will see the edits much slower.
+        private static Dictionary<ulong,List<LayerDataPacket>> lastWindPackets =
-        
+                 new Dictionary<ulong,List<LayerDataPacket>>();
-        // One last note on this topic, by the time users are going to be editing the terrain, it's
-        // extremely likely that the sim will have rezzed already and therefore this is not likely going
-        // to cause any additional issues with lost packets, objects or terrain patches.
-        // m_justEditedTerrain is volatile, so test once and duplicate two affected statements so we
-        //    only have one cache miss.
-        private void SendTheLayerPacket(LayerDataPacket layerpack)
-        {
-            if (m_justEditedTerrain)
-            {
-                layerpack.Header.Reliable = false;
-                OutPacket(layerpack, ThrottleOutPacketType.Unknown );
-            }
-            else
-            {
-                layerpack.Header.Reliable = true;
-                OutPacket(layerpack, ThrottleOutPacketType.Land);
-            }
-        }
        /// <summary>
        ///  Send the wind matrix to the client
        /// </summary>
        /// <param name="windSpeeds">16x16 array of wind speeds</param>
-        public virtual void SendWindData(Vector2[] windSpeeds)
+        public virtual void SendWindData(int version, Vector2[] windSpeeds)
-        {
-            Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData");
-        }
-        /// <summary>
-        ///  Send the cloud matrix to the client
-        /// </summary>
-        /// <param name="windSpeeds">16x16 array of cloud densities</param>
-        public virtual void SendCloudData(float[] cloudDensity)
-        {
-            Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData");
-        }
-        /// <summary>
-        /// Send wind layer information to the client.
-        /// </summary>
-        /// <param name="o"></param>
-        private void DoSendWindData(object o)
        {
-            Vector2[] windSpeeds = (Vector2[])o;
+//            Vector2[] windSpeeds = (Vector2[])o;
-            TerrainPatch[] patches = new TerrainPatch[2];
-            patches[0] = new TerrainPatch { Data = new float[16 * 16] };
-            patches[1] = new TerrainPatch { Data = new float[16 * 16] };
-            for (int x = 0; x < 16 * 16; x++)
+            ulong handle = this.Scene.RegionInfo.RegionHandle;
+            bool isNewData;
+            lock(lastWindPackets)
            {
-                patches[0].Data[x] = windSpeeds[x].X;
+                if(!lastWindVersion.ContainsKey(handle) ||
-                patches[1].Data[x] = windSpeeds[x].Y;
+                    !lastWindPackets.ContainsKey(handle))
+                {
+                    lastWindVersion[handle] = 0;
+                    lastWindPackets[handle] = new List<LayerDataPacket>();
+                    isNewData = true;
+                }
+                else
+                    isNewData = lastWindVersion[handle] != version;
            }
-            byte layerType = (byte)TerrainPatch.LayerType.Wind;
+            if(isNewData)
-            if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize)
+            {
-                layerType = (byte)TerrainPatch.LayerType.WindExtended;
+                TerrainPatch[] patches = new TerrainPatch[2];
+                patches[0] = new TerrainPatch { Data = new float[16 * 16] };
+                patches[1] = new TerrainPatch { Data = new float[16 * 16] };
+                for (int x = 0; x < 16 * 16; x++)
+                {
+                    patches[0].Data[x] = windSpeeds[x].X;
+                    patches[1].Data[x] = windSpeeds[x].Y;
+                }
+                // neither we or viewers have extended wind
+                byte layerType = (byte)TerrainPatch.LayerType.Wind;
+                LayerDataPacket layerpack =
+                     OpenSimTerrainCompressor.CreateLayerDataPacketStandardSize(
+                        patches, layerType);
+                layerpack.Header.Zerocoded = true;
+                lock(lastWindPackets)
+                {
+                    lastWindPackets[handle].Clear();
+                    lastWindPackets[handle].Add(layerpack);
+                    lastWindVersion[handle] = version;
+                }
+            }
-            // LayerDataPacket layerpack = TerrainCompressor.CreateLayerDataPacket(patches, (TerrainPatch.LayerType)layerType);
+            lock(lastWindPackets)
-            LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType,
+                foreach(LayerDataPacket pkt in lastWindPackets[handle])
-                                (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY);
+                    OutPacket(pkt, ThrottleOutPacketType.Wind);
-            layerpack.Header.Zerocoded = true;
-            OutPacket(layerpack, ThrottleOutPacketType.Wind);
        }
+        // cloud caching
+        private static Dictionary<ulong,int> lastCloudVersion = new Dictionary<ulong,int>();
+        private static Dictionary<ulong,List<LayerDataPacket>> lastCloudPackets =
+                 new Dictionary<ulong,List<LayerDataPacket>>();
        /// <summary>
-        /// Send cloud layer information to the client.
+        ///  Send the cloud matrix to the client
        /// </summary>
-        /// <param name="o"></param>
+        /// <param name="windSpeeds">16x16 array of cloud densities</param>
-        private void DoSendCloudData(object o)
+        public virtual void SendCloudData(int version, float[] cloudDensity)
        {
-            float[] cloudCover = (float[])o;
+            ulong handle = this.Scene.RegionInfo.RegionHandle;
-            TerrainPatch[] patches = new TerrainPatch[1];
+            bool isNewData;
-            patches[0] = new TerrainPatch();
+            lock(lastWindPackets)
-            patches[0].Data = new float[16 * 16];
-            for (int y = 0; y < 16; y++)
            {
-                for (int x = 0; x < 16; x++)
+                if(!lastCloudVersion.ContainsKey(handle) ||
+                    !lastCloudPackets.ContainsKey(handle))
                {
-                    patches[0].Data[y * 16 + x] = cloudCover[y * 16 + x];
+                    lastCloudVersion[handle] = 0;
+                    lastCloudPackets[handle] = new List<LayerDataPacket>();
+                    isNewData = true;
                }
+                else
+                    isNewData = lastCloudVersion[handle] != version;
            }
-            byte layerType = (byte)TerrainPatch.LayerType.Cloud;
+            if(isNewData)
-            if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize)
+            {
-                layerType = (byte)TerrainPatch.LayerType.CloudExtended;
+                TerrainPatch[] patches = new TerrainPatch[1];
+                patches[0] = new TerrainPatch();
+                patches[0].Data = new float[16 * 16];
+                for (int y = 0; y < 16; y++)
+                {
+                    for (int x = 0; x < 16; x++)
+                    {
+                        patches[0].Data[y * 16 + x] = cloudDensity[y * 16 + x];
+                    }
+                }
+                // neither we or viewers have extended clouds
+                byte layerType = (byte)TerrainPatch.LayerType.Cloud;
+                LayerDataPacket layerpack =
+                    OpenSimTerrainCompressor.CreateLayerDataPacketStandardSize(
+                        patches, layerType);
+                layerpack.Header.Zerocoded = true;
+                lock(lastCloudPackets)
+                {
+                    lastCloudPackets[handle].Clear();
+                    lastCloudPackets[handle].Add(layerpack);
+                    lastCloudVersion[handle] = version;
+                }
+            }
-            // LayerDataPacket layerpack = TerrainCompressor.CreateLayerDataPacket(patches, (TerrainPatch.LayerType)layerType);
+            lock(lastCloudPackets)
-            LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType,
+                foreach(LayerDataPacket pkt in lastCloudPackets[handle])
-                                (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY);
+                    OutPacket(pkt, ThrottleOutPacketType.Cloud);
-            layerpack.Header.Zerocoded = true;
-            OutPacket(layerpack, ThrottleOutPacketType.Cloud);
        }
        /// <summary>
@@ -1735,45 +1726,59 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pc.PingID.OldestUnacked = 0;
            OutPacket(pc, ThrottleOutPacketType.Unknown);
+            UDPClient.m_lastStartpingTimeMS = Util.EnvironmentTickCount();
        }
        public void SendKillObject(List<uint> localIDs)
        {
-//            m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
+            //            foreach (uint id in localIDs)
+            //                m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
+            // remove pending entities to reduce looping chances.
+            lock (m_entityProps.SyncRoot)
+                m_entityProps.Remove(localIDs);
+            lock (m_entityUpdates.SyncRoot)
+                m_entityUpdates.Remove(localIDs);
            KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
-            // TODO: don't create new blocks if recycling an old packet
-            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count];
+            int perpacket = localIDs.Count;
+            if(perpacket > 200)
+                perpacket = 200;
+            int nsent = 0;
+            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[perpacket];
            for (int i = 0 ; i < localIDs.Count ; i++ )
            {
-                kill.ObjectData[i] = new KillObjectPacket.ObjectDataBlock();
+                kill.ObjectData[nsent] = new KillObjectPacket.ObjectDataBlock();
-                kill.ObjectData[i].ID = localIDs[i];
+                kill.ObjectData[nsent].ID = localIDs[i];
-            }
-            kill.Header.Reliable = true;
-            kill.Header.Zerocoded = true;
-            if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null)
+                if(++nsent >= 200)
-            {
-                OutPacket(kill, ThrottleOutPacketType.Task);
-            }
-            else
-            {
-                // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
-                // condition where a kill can be processed before an out-of-date update for the same object.
-                // ProcessEntityUpdates() also takes the m_killRecord lock.
-                lock (m_killRecord)
                {
-                    foreach (uint localID in localIDs)
+                    kill.Header.Reliable = true;
-                        m_killRecord.Add(localID);
+                    kill.Header.Zerocoded = true;
-                    // The throttle queue used here must match that being used for updates.  Otherwise, there is a
-                    // chance that a kill packet put on a separate queue will be sent to the client before an existing
-                    // update packet on another queue.  Receiving updates after kills results in unowned and undeletable
-                    // scene objects in a viewer until that viewer is relogged in.
                    OutPacket(kill, ThrottleOutPacketType.Task);
+                    perpacket = localIDs.Count - i - 1;
+                    if(perpacket == 0)
+                        break;
+                    if(perpacket > 200)
+                        perpacket = 200;
+                    kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
+                    kill.ObjectData = new KillObjectPacket.ObjectDataBlock[perpacket];
+                    nsent = 0;
                }
            }
-        }
+            if(nsent != 0)
+            {
+                kill.Header.Reliable = true;
+                kill.Header.Zerocoded = true;
+                OutPacket(kill, ThrottleOutPacketType.Task);
+            }
+         }
        /// <summary>
        /// Send information about the items contained in a folder to the client.
@@ -1895,7 +1900,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            newBlock.CreationDate = item.CreationDate;
            newBlock.SalePrice = item.SalePrice;
            newBlock.SaleType = item.SaleType;
-            newBlock.Flags = item.Flags;
+            newBlock.Flags = item.Flags & 0x2000ff;
            newBlock.CRC =
                Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType,
@@ -2151,7 +2156,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            itemBlock.GroupID = item.GroupID;
            itemBlock.GroupOwned = item.GroupOwned;
            itemBlock.GroupMask = item.GroupPermissions;
-            itemBlock.Flags = item.Flags;
+            itemBlock.Flags = item.Flags & 0x2000ff;
            itemBlock.SalePrice = item.SalePrice;
            itemBlock.SaleType = item.SaleType;
            itemBlock.CreationDate = item.CreationDate;
@@ -2218,7 +2223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            bulkUpdate.ItemData[0].GroupID = item.GroupID;
            bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned;
            bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions;
-            bulkUpdate.ItemData[0].Flags = item.Flags;
+            bulkUpdate.ItemData[0].Flags = item.Flags & 0x2000ff;
            bulkUpdate.ItemData[0].SalePrice = item.SalePrice;
            bulkUpdate.ItemData[0].SaleType = item.SaleType;
@@ -2234,9 +2239,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
        }
-        /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
        {
+            SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
+        }
+        /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
            const uint FULL_MASK_PERMISSIONS = (uint)0x7fffffff;
            UpdateCreateInventoryItemPacket InventoryReply
@@ -2246,6 +2256,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // TODO: don't create new blocks if recycling an old packet
            InventoryReply.AgentData.AgentID = AgentId;
            InventoryReply.AgentData.SimApproved = true;
+            InventoryReply.AgentData.TransactionID = transactionID;
            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
            InventoryReply.InventoryData[0].ItemID = Item.ID;
@@ -2266,7 +2277,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            InventoryReply.InventoryData[0].GroupID = Item.GroupID;
            InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
            InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions;
-            InventoryReply.InventoryData[0].Flags = Item.Flags;
+            InventoryReply.InventoryData[0].Flags = Item.Flags & 0x2000ff;
            InventoryReply.InventoryData[0].SalePrice = Item.SalePrice;
            InventoryReply.InventoryData[0].SaleType = Item.SaleType;
            InventoryReply.InventoryData[0].CreationDate = Item.CreationDate;
@@ -2296,11 +2307,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(remove, ThrottleOutPacketType.Asset);
        }
+/*
+        private uint adjustControls(int input)
+        {
+            uint ret = (uint)input;
+            uint masked = ret & 0x0f;
+            masked <<= 19;
+            ret |= masked;
+            return ret;
+        }
+*/
        public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
        {
            ScriptControlChangePacket scriptcontrol = (ScriptControlChangePacket)PacketPool.Instance.GetPacket(PacketType.ScriptControlChange);
            ScriptControlChangePacket.DataBlock[] data = new ScriptControlChangePacket.DataBlock[1];
            ScriptControlChangePacket.DataBlock ddata = new ScriptControlChangePacket.DataBlock();
+//            ddata.Controls = adjustControls(controls);
            ddata.Controls = (uint)controls;
            ddata.PassToAgent = passToAgent;
            ddata.TakeControls = TakeControls;
@@ -2315,16 +2338,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            replytask.InventoryData.TaskID = taskID;
            replytask.InventoryData.Serial = serial;
            replytask.InventoryData.Filename = fileName;
+//            OutPacket(replytask, ThrottleOutPacketType.Task);
            OutPacket(replytask, ThrottleOutPacketType.Asset);
        }
-        public void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
        {
+            ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
+//            if (isTaskInventory)
+//                type = ThrottleOutPacketType.Task;
            SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
            sendXfer.XferID.ID = xferID;
            sendXfer.XferID.Packet = packet;
            sendXfer.DataPacket.Data = data;
-            OutPacket(sendXfer, ThrottleOutPacketType.Asset);
+            OutPacket(sendXfer, type);
        }
        public void SendAbortXferPacket(ulong xferID)
@@ -2415,6 +2443,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(alertPack, ThrottleOutPacketType.Task);
        }
+        public void SendAlertMessage(string message, string info)
+        {
+            AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage);
+            alertPack.AlertData = new AlertMessagePacket.AlertDataBlock();
+            alertPack.AlertData.Message = Util.StringToBytes256(message);
+            alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1];
+            alertPack.AlertInfo[0] = new AlertMessagePacket.AlertInfoBlock();
+            alertPack.AlertInfo[0].Message = Util.StringToBytes256(info);
+            alertPack.AlertInfo[0].ExtraParams = new Byte[0];
+            OutPacket(alertPack, ThrottleOutPacketType.Task);
+        }
        /// <summary>
        /// Send an agent alert message to the client.
        /// </summary>
@@ -2471,14 +2511,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // this is the username of the *owner*
            dialog.Data.FirstName = Util.StringToBytes256(ownerFirstName);
            dialog.Data.LastName = Util.StringToBytes256(ownerLastName);
-            dialog.Data.Message = Util.StringToBytes1024(msg);
+            dialog.Data.Message = Util.StringToBytes(msg,512);
            dialog.Data.ImageID = textureID;
            dialog.Data.ChatChannel = ch;
            ScriptDialogPacket.ButtonsBlock[] buttons = new ScriptDialogPacket.ButtonsBlock[buttonlabels.Length];
            for (int i = 0; i < buttonlabels.Length; i++)
            {
                buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
+                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24);
            }
            dialog.Buttons = buttons;
@@ -2514,6 +2554,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(sound, ThrottleOutPacketType.Task);
        }
+        public void SendTransferAbort(TransferRequestPacket transferRequest)
+        {
+            TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
+            abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
+            abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
+            m_log.Debug("[Assets] Aborting transfer; asset request failed");
+            OutPacket(abort, ThrottleOutPacketType.Task);
+        }
        public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
        {
            SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2632,7 +2681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(packet, ThrottleOutPacketType.Task);
        }
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
                                         string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
                                         UUID partnerID)
        {
@@ -2644,7 +2693,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            else
                avatarReply.PropertiesData.AboutText = Utils.EmptyBytes;
            avatarReply.PropertiesData.BornOn = Util.StringToBytes256(bornOn);
-            avatarReply.PropertiesData.CharterMember = charterMember;
+            avatarReply.PropertiesData.CharterMember = membershipType;
            if (flAbout != null)
                avatarReply.PropertiesData.FLAboutText = Util.StringToBytes256(flAbout);
            else
@@ -2730,8 +2779,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(offp, ThrottleOutPacketType.Task);
        }
-        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
+        public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
-                                        Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
+        {
+            FindAgentPacket fap = new FindAgentPacket();
+            fap.AgentBlock.Hunter = HunterID;
+            fap.AgentBlock.Prey = PreyID;
+            fap.AgentBlock.SpaceIP = 0;
+            fap.LocationBlock = new FindAgentPacket.LocationBlockBlock[1];
+            fap.LocationBlock[0] = new FindAgentPacket.LocationBlockBlock();
+            fap.LocationBlock[0].GlobalX = GlobalX;
+            fap.LocationBlock[0].GlobalY = GlobalY;
+            OutPacket(fap, ThrottleOutPacketType.Task);
+         }
+        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
+                Quaternion SitOrientation, bool autopilot,
+                Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
        {
            AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
            avatarSitResponse.SitObject.ID = TargetID;
@@ -2763,46 +2828,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendGroupMembership(GroupMembershipData[] GroupMembership)
        {
-            m_groupPowers.Clear();
-            AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket();
+            UpdateGroupMembership(GroupMembership);
-            AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[GroupMembership.Length];
+            SendAgentGroupDataUpdate(AgentId,GroupMembership);
-            for (int i = 0; i < GroupMembership.Length; i++)
+        }
-            {
-                m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
-                AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
+        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
-                Group.AcceptNotices = GroupMembership[i].AcceptNotices;
+        {
-                Group.Contribution = GroupMembership[i].Contribution;
+/* not in use
-                Group.GroupID = GroupMembership[i].GroupID;
+            // udp part
-                Group.GroupInsigniaID = GroupMembership[i].GroupPicture;
+            ObjectPropertiesPacket packet =
-                Group.GroupName = Util.StringToBytes256(GroupMembership[i].GroupName);
+                (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
-                Group.GroupPowers = GroupMembership[i].GroupPowers;
+            ObjectPropertiesPacket.ObjectDataBlock[] ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[parts.Count];
-                Groups[i] = Group;
+            int i = 0;
+            foreach(SceneObjectPart sop in parts)
+                ObjectData[i++] = CreateObjectPropertiesBlock(sop);
-            }
+            packet.ObjectData = ObjectData;
-            Groupupdate.GroupData = Groups;
+            packet.Header.Zerocoded = true;
-            Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock();
+            // udp send splits this mega packets correctly
-            Groupupdate.AgentData.AgentID = AgentId;
+            // mb later will avoid that to reduce gc stress
-            OutPacket(Groupupdate, ThrottleOutPacketType.Task);
+            OutPacket(packet, ThrottleOutPacketType.Task, true);
-            try
+            // caps physics part
-            {
+            IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
-                IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
+            if(eq == null)
-                if (eq != null)
+                return;
-                {
-                    eq.GroupMembership(Groupupdate, this.AgentId);
+            OSDArray array = new OSDArray();
-                }
+            foreach(SceneObjectPart sop in parts)
-            }
-            catch (Exception ex)
            {
-                m_log.Error("Unable to send group membership data via eventqueue - exception: " + ex.ToString());
+                OSDMap physinfo = new OSDMap(6);
-                m_log.Warn("sending group membership data via UDP");
+                physinfo["LocalID"] = sop.LocalId;
-                OutPacket(Groupupdate, ThrottleOutPacketType.Task);
+                physinfo["Density"] = sop.Density;
+                physinfo["Friction"] = sop.Friction;
+                physinfo["GravityMultiplier"] = sop.GravityModifier;
+                physinfo["Restitution"] = sop.Restitution;
+                physinfo["PhysicsShapeType"] = (int)sop.PhysicsShapeType;
+                array.Add(physinfo);
            }
+            OSDMap llsdBody = new OSDMap(1);
+            llsdBody.Add("ObjectData", array);
+            eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),AgentId);
+*/
        }
        public void SendPartPhysicsProprieties(ISceneEntity entity)
        {
            SceneObjectPart part = (SceneObjectPart)entity;
@@ -2819,6 +2893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        float friction = part.Friction;
                        float bounce = part.Restitution;
                        float gravmod = part.GravityModifier;
                        eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
                    }
                }
@@ -2826,7 +2901,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
                }
-                part.UpdatePhysRequired = false;
            }
        }
@@ -2883,6 +2957,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendAsset(AssetRequestToClient req)
        {
+            if (req.AssetInf == null)
+            {
+                m_log.ErrorFormat("{0} Cannot send asset {1} ({2}), asset is null",
+                                LogHeader);
+                return;
+            }
            if (req.AssetInf.Data == null)
            {
                m_log.ErrorFormat("{0} Cannot send asset {1} ({2}), asset data is null",
@@ -2890,7 +2971,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                return;
            }
-            //m_log.Debug("sending asset " + req.RequestAssetID);
+            bool isWearable = false;
+            isWearable = ((AssetType) req.AssetInf.Type ==
+                     AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
+            //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable);
+            //if (isWearable)
+            //    m_log.Debug((AssetType)req.AssetInf.Type);
            TransferInfoPacket Transfer = new TransferInfoPacket();
            Transfer.TransferInfo.ChannelType = 2;
            Transfer.TransferInfo.Status = 0;
@@ -2912,7 +3004,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Transfer.TransferInfo.Size = req.AssetInf.Data.Length;
            Transfer.TransferInfo.TransferID = req.TransferRequestID;
            Transfer.Header.Zerocoded = true;
-            OutPacket(Transfer, ThrottleOutPacketType.Asset);
+            OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
            if (req.NumPackets == 1)
            {
@@ -2923,12 +3015,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                TransferPacket.TransferData.Data = req.AssetInf.Data;
                TransferPacket.TransferData.Status = 1;
                TransferPacket.Header.Zerocoded = true;
-                OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
+                OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
            }
            else
            {
                int processedLength = 0;
-                int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
+//                int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
+                int maxChunkSize = (int) MaxTransferBytesPerPacket;
                int packetNumber = 0;
                while (processedLength < req.AssetInf.Data.Length)
@@ -2954,7 +3048,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        TransferPacket.TransferData.Status = 1;
                    }
                    TransferPacket.Header.Zerocoded = true;
-                    OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
+                    OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
                    processedLength += chunkSize;
                    packetNumber++;
@@ -2990,23 +3084,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
        {
-            float dwell = 0.0f;
-            IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
-            if (dwellModule != null)
-                dwell = dwellModule.GetDwell(land.GlobalID);
            ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply);
            reply.AgentData.AgentID = m_agentId;
            reply.Data.ParcelID = parcelID;
            reply.Data.OwnerID = land.OwnerID;
            reply.Data.Name = Utils.StringToBytes(land.Name);
-            reply.Data.Desc = Utils.StringToBytes(land.Description);
+            if (land.Description != null && land.Description != String.Empty)
+                reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
+            else
+                reply.Data.Desc = new Byte[0];
            reply.Data.ActualArea = land.Area;
            reply.Data.BillableArea = land.Area; // TODO: what is this?
-            // Bit 0: Mature, bit 7: on sale, other bits: no idea
+            reply.Data.Flags = (byte)Util.ConvertAccessLevelToMaturity((byte)info.AccessLevel);
-            reply.Data.Flags = (byte)(
+            if((land.Flags & (uint)ParcelFlags.ForSale) != 0)
-                (info.AccessLevel > 13 ? (1 << 0) : 0) +
+                reply.Data.Flags |= (byte)((1 << 7));
-                ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0));
            Vector3 pos = land.UserLocation;
            if (pos.Equals(Vector3.Zero))
@@ -3018,7 +3110,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            reply.Data.GlobalZ = pos.Z;
            reply.Data.SimName = Utils.StringToBytes(info.RegionName);
            reply.Data.SnapshotID = land.SnapshotID;
-            reply.Data.Dwell = dwell;
+            reply.Data.Dwell = land.Dwell;
            reply.Data.SalePrice = land.SalePrice;
            reply.Data.AuctionID = (int)land.AuctionID;
@@ -3385,7 +3477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AgentData.Add(AgentDataMap);
             llsd.Add("AgentData", AgentData);
             OSDArray GroupData = new OSDArray(data.Length);
-             OSDArray NewGroupData = new OSDArray(data.Length);
+//             OSDArray NewGroupData = new OSDArray(data.Length);
             foreach (GroupMembershipData m in data)
             {
                 OSDMap GroupDataMap = new OSDMap(6);
@@ -3396,12 +3488,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID));
                 GroupDataMap.Add("GroupName", OSD.FromString(m.GroupName));
                 GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(m.GroupPicture));
-                 NewGroupDataMap.Add("ListInProfile", OSD.FromBoolean(m.ListInProfile));
+//                 NewGroupDataMap.Add("ListInProfile", OSD.FromBoolean(m.ListInProfile));
                 GroupData.Add(GroupDataMap);
-                 NewGroupData.Add(NewGroupDataMap);
+//                 NewGroupData.Add(NewGroupDataMap);
             }
             llsd.Add("GroupData", GroupData);
-             llsd.Add("NewGroupData", NewGroupData);
+ //            llsd.Add("NewGroupData", NewGroupData);
             IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
             if (eq != null)
@@ -3410,6 +3502,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
        }
+        public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
+        {
+            if(avatarID != AgentId)
+                m_log.Debug("[CLIENT]: SendAgentGroupDataUpdate avatarID != AgentId");
+            IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
+            if(eq != null)
+            {
+                eq.GroupMembershipData(avatarID,data);
+            }
+            else
+            {
+                // use UDP if no caps
+                AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket();
+                AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[data.Length];
+                for (int i = 0; i < data.Length; i++)
+                {
+                    AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
+                    Group.AcceptNotices = data[i].AcceptNotices;
+                    Group.Contribution = data[i].Contribution;
+                    Group.GroupID = data[i].GroupID;
+                    Group.GroupInsigniaID = data[i].GroupPicture;
+                    Group.GroupName = Util.StringToBytes256(data[i].GroupName);
+                    Group.GroupPowers = data[i].GroupPowers;
+                    Groups[i] = Group;
+                }
+                Groupupdate.GroupData = Groups;
+                Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock();
+                Groupupdate.AgentData.AgentID = avatarID;
+                OutPacket(Groupupdate, ThrottleOutPacketType.Task);
+            }
+        }
        public void SendJoinGroupReply(UUID groupID, bool success)
        {
            JoinGroupReplyPacket p = (JoinGroupReplyPacket)PacketPool.Instance.GetPacket(PacketType.JoinGroupReply);
@@ -3649,6 +3774,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(useCachedMuteList, ThrottleOutPacketType.Task);
        }
+       public void SendEmpytMuteList()
+        {
+            GenericMessagePacket gmp = new GenericMessagePacket();
+            gmp.AgentData.AgentID = AgentId;
+            gmp.AgentData.SessionID = m_sessionId;
+            gmp.AgentData.TransactionID = UUID.Zero;
+            gmp.MethodData.Method = Util.StringToBytes256("emptymutelist");
+            gmp.ParamList = new GenericMessagePacket.ParamListBlock[1];
+            gmp.ParamList[0] = new GenericMessagePacket.ParamListBlock();
+            gmp.ParamList[0].Parameter = new byte[0];
+            OutPacket(gmp, ThrottleOutPacketType.Task);
+        }
        public void SendMuteListUpdate(string filename)
        {
            MuteListUpdatePacket muteListUpdate = (MuteListUpdatePacket)PacketPool.Instance.GetPacket(PacketType.MuteListUpdate);
@@ -3706,24 +3847,25 @@ 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++)
-                {
-                    awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                    awb.WearableType = (byte)i;
-                    awb.AssetID = wearables[i][j].AssetID;
-                    awb.ItemID = wearables[i][j].ItemID;
-                    aw.WearableData[idx] = awb;
-                    idx++;
-//                                m_log.DebugFormat(
+                    for (int i = 0; i < wearables.Length; i++)
-//                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
+                    {
-//                                    awb.ItemID, awb.AssetID, i, Name);
+                        for (int j = 0; j < wearables[i].Count; j++)
-                }
+                        {
-            }
+                            awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+                            awb.WearableType = (byte) i;
+                            awb.AssetID = wearables[i][j].AssetID;
+                            awb.ItemID = wearables[i][j].ItemID;
+                            aw.WearableData[idx] = awb;
+                            idx++;
+                            //                                m_log.DebugFormat(
+                            //                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
+                            //                                    awb.ItemID, awb.AssetID, i, Name);
+                        }
+                    }
-            OutPacket(aw, ThrottleOutPacketType.Task);
+            OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
        }
        public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
@@ -3749,8 +3891,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            avp.Sender.ID = agentID;
            avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
            avp.AppearanceHover = new AvatarAppearancePacket.AppearanceHoverBlock[0];
+// this need be use in future ?
+//           avp.AppearanceData[0].AppearanceVersion = 0;
+//           avp.AppearanceData[0].CofVersion = 0;
            //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
-            OutPacket(avp, ThrottleOutPacketType.Task);
+            OutPacket(avp, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
        }
        public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
@@ -3778,7 +3925,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    ani.AnimationSourceList[i].ObjectID = objectIDs[i];
            }
            ani.Header.Reliable = false;
-            OutPacket(ani, ThrottleOutPacketType.Task);
+            OutPacket(ani, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
        }
        #endregion
@@ -3788,26 +3935,70 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Send an ObjectUpdate packet with information about an avatar
        /// </summary>
-        public void SendAvatarDataImmediate(ISceneEntity avatar)
+        public void SendEntityFullUpdateImmediate(ISceneEntity ent)
        {
 //            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 (ent == null)
-            if (presence == null)
                return;
            ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
            objupdate.Header.Zerocoded = true;
-            objupdate.RegionData.RegionHandle = presence.RegionHandle;
+            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
-            objupdate.RegionData.TimeDilation = ushort.MaxValue;
-            
            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
-            OutPacket(objupdate, ThrottleOutPacketType.Task);
+            if(ent is ScenePresence)
+            {
+                ScenePresence presence = ent as ScenePresence;
+                objupdate.RegionData.RegionHandle = presence.RegionHandle;
+                objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
+            }
+            else if(ent is SceneObjectPart)
+            {
+                SceneObjectPart part = ent  as SceneObjectPart;
+                objupdate.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                objupdate.ObjectData[0] = CreatePrimUpdateBlock(part,  (ScenePresence)SceneAgent);
+            }
+            OutPacket(objupdate, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
+            // We need to record the avatar local id since the root prim of an attachment points to this.
+//            m_attachmentsSent.Add(avatar.LocalId);
+        }
+        public void SendEntityTerseUpdateImmediate(ISceneEntity ent)
+        {
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
+//                avatar.Name, avatar.UUID, Name, AgentId);
+            if (ent == null)
+                return;
+            ImprovedTerseObjectUpdatePacket objupdate =
+                (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            objupdate.Header.Zerocoded = true;
+            objupdate.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
+            objupdate.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+            if(ent is ScenePresence)
+            {
+                ScenePresence presence = ent as ScenePresence;
+                objupdate.RegionData.RegionHandle = presence.RegionHandle;
+                objupdate.ObjectData[0] = CreateImprovedTerseBlock(ent, false);
+            }
+            else if(ent is SceneObjectPart)
+            {
+                SceneObjectPart part = ent  as SceneObjectPart;
+                objupdate.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                objupdate.ObjectData[0] = CreateImprovedTerseBlock(ent, false);
+            }
+            OutPacket(objupdate, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
            // We need to record the avatar local id since the root prim of an attachment points to this.
 //            m_attachmentsSent.Add(avatar.LocalId);
@@ -3859,13 +4050,13 @@ 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
        /// </summary>
        public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
        {
+/*
            if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
            {
                ImprovedTerseObjectUpdatePacket packet
@@ -3876,21 +4067,38 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
                packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false);
                OutPacket(packet, ThrottleOutPacketType.Unknown, true);
+                return;
            }
-            else
+*/
+            if (entity is SceneObjectPart)
            {
-                //double priority = m_prioritizer.GetUpdatePriority(this, entity);
+                SceneObjectPart p = (SceneObjectPart)entity;
-                uint priority = m_prioritizer.GetUpdatePriority(this, entity);
+                SceneObjectGroup g = p.ParentGroup;
+                if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId)
-                lock (m_entityUpdates.SyncRoot)
+                    return; // Don't send updates for other people's HUDs
-                    m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation));
+                
+                if((updateFlags ^ PrimUpdateFlags.SendInTransit) == 0)
+                {
+                    List<uint> partIDs = (new List<uint> {p.LocalId});
+                    lock (m_entityProps.SyncRoot)
+                        m_entityProps.Remove(partIDs);
+                    lock (m_entityUpdates.SyncRoot)
+                        m_entityUpdates.Remove(partIDs);
+                    return;
+                }
            }
+            //double priority = m_prioritizer.GetUpdatePriority(this, entity);
+            uint priority = m_prioritizer.GetUpdatePriority(this, entity);
+            lock (m_entityUpdates.SyncRoot)
+                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)
@@ -3904,9 +4112,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)
@@ -3919,7 +4127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
            // Count this as a resent packet since we are going to requeue all of the updates contained in it
-            Interlocked.Increment(ref m_udpClient.PacketsResent);           
+            Interlocked.Increment(ref m_udpClient.PacketsResent);
            // We're not going to worry about interlock yet since its not currently critical that this total count
            // is 100% correct
@@ -3929,335 +4137,515 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                ResendPrimUpdate(update);
        }
-//        OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+        private List<ObjectUpdatePacket.ObjectDataBlock> objectUpdateBlocks = new List<ObjectUpdatePacket.ObjectDataBlock>();
-//        OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+        private List<ObjectUpdateCompressedPacket.ObjectDataBlock> compressedUpdateBlocks = new List<ObjectUpdateCompressedPacket.ObjectDataBlock>();
-//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> terseUpdateBlocks = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseAgentUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> terseAgentUpdateBlocks = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-//
-//        OpenSim.Framework.Lazy<List<EntityUpdate>> objectUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-//        OpenSim.Framework.Lazy<List<EntityUpdate>> compressedUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-        private void ProcessEntityUpdates(int maxUpdates)
+        private void ProcessEntityUpdates(int maxUpdatesBytes)
        {
-            OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
-            OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
-            OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
-            OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseAgentUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
            OpenSim.Framework.Lazy<List<EntityUpdate>> objectUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
            OpenSim.Framework.Lazy<List<EntityUpdate>> compressedUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
            OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
            OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-//            objectUpdateBlocks.Value.Clear();
-//            compressedUpdateBlocks.Value.Clear();
-//            terseUpdateBlocks.Value.Clear();
-//            terseAgentUpdateBlocks.Value.Clear();
-//            objectUpdates.Value.Clear();
-//            compressedUpdates.Value.Clear();
-//            terseUpdates.Value.Clear();
-//            terseAgentUpdates.Value.Clear();
            // Check to see if this is a flush
-            if (maxUpdates <= 0)
+            if (maxUpdatesBytes <= 0)
            {
-                maxUpdates = Int32.MaxValue;
+                maxUpdatesBytes = Int32.MaxValue;
            }
-            int updatesThisCall = 0;
+            EntityUpdate update;
+            Int32 timeinqueue; // this is just debugging code & can be dropped later
+            bool doCulling = m_scene.ObjectsCullingByDistance;
+            float cullingrange = 64.0f;
+            HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
+//            Vector3 mycamera = Vector3.Zero;
+            Vector3 mypos = Vector3.Zero;
+            ScenePresence mysp = (ScenePresence)SceneAgent;
+            bool orderedDequeue = m_scene.UpdatePrioritizationScheme  == UpdatePrioritizationSchemes.SimpleAngularDistance;
+            // we should have a presence
+            if(mysp == null)
+                return;
-            // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
+            if(doCulling)
-            // condition where a kill can be processed before an out-of-date update for the same object.                        
-            lock (m_killRecord)
            {
-                float avgTimeDilation = 1.0f;
+                cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
-                IEntityUpdate iupdate;
+//                mycamera = mysp.CameraPosition;
-                Int32 timeinqueue; // this is just debugging code & can be dropped later
+                mypos = mysp.AbsolutePosition;
+            }
-                while (updatesThisCall < maxUpdates)
+            while (maxUpdatesBytes > 0)
+            {
+                lock (m_entityUpdates.SyncRoot)
                {
-                    lock (m_entityUpdates.SyncRoot)
+                    if(orderedDequeue)
-                        if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
+                    {
+                        if (!m_entityUpdates.TryOrderedDequeue(out update, out timeinqueue))
                            break;
+                    }
+                    else
+                    {
+                        if (!m_entityUpdates.TryDequeue(out update, out timeinqueue))
+                            break;
+                    }
+                }
-                    EntityUpdate update = (EntityUpdate)iupdate;
+                PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
-                    
-                    avgTimeDilation += update.TimeDilation;
-                    avgTimeDilation *= 0.5f;
-                    if (update.Entity is SceneObjectPart)
+                if(updateFlags.HasFlag(PrimUpdateFlags.Kill))
+                {
+                    m_killRecord.Add(update.Entity.LocalId);
+                    maxUpdatesBytes -= 30;
+                    continue;
+                }
+                if (update.Entity is SceneObjectPart)
+                {
+                    SceneObjectPart part = (SceneObjectPart)update.Entity;
+                    SceneObjectGroup grp = part.ParentGroup;
+                    if (grp.inTransit && !update.Flags.HasFlag(PrimUpdateFlags.SendInTransit))
+                        continue;
+/* debug
+                    if (update.Flags.HasFlag(PrimUpdateFlags.SendInTransit))
+                    {
+                    }
+*/
+                    if (grp.IsDeleted)
                    {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
+                        // Don't send updates for objects that have been marked deleted.
-    
+                        // Instead send another kill object, because the first one may have gotten
-                        // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
+                        // into a race condition
-                        // will never receive an update after a prim kill.  Even then, keeping the kill record may be a good
+                        if (part == grp.RootPart && !m_killRecord.Contains(grp.LocalId))
-                        // safety measure.
-                        //
-                        // If a Linden Lab 1.23.5 client (and possibly later and earlier) receives an object update
-                        // after a kill, it will keep displaying the deleted object until relog.  OpenSim currently performs
-                        // updates and kills on different threads with different scheduling strategies, hence this protection.
-                        // 
-                        // This doesn't appear to apply to child prims - a client will happily ignore these updates
-                        // after the root prim has been deleted.
-                        if (m_killRecord.Contains(part.LocalId))
                        {
-        //                        m_log.WarnFormat(
+                            m_killRecord.Add(grp.LocalId);
-        //                            "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted",
+                            maxUpdatesBytes -= 30;
-        //                            part.LocalId, Name);
+                        }
+                        continue;
+                    }
+                    if (grp.IsAttachment)
+                    {   // Someone else's HUD, why are we getting these?
+                        if (grp.OwnerID != AgentId && grp.HasPrivateAttachmentPoint)
+                            continue;
+                        ScenePresence sp;
+                        // Owner is not in the sim, don't update it to
+                        // anyone
+                        if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
                            continue;
-                        }                        
-                            
+                        List<SceneObjectGroup> atts = sp.GetAttachments();
-                        if (part.ParentGroup.IsAttachment && m_disableFacelights)
+                        bool found = false;
+                        foreach (SceneObjectGroup att in atts)
                        {
-                            if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
+                            if (att == grp)
-                                part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
                            {
-                                part.Shape.LightEntry = false;
+                                found = true;
+                                break;
                            }
                        }
-                        if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh))
+                        // It's an attachment of a valid avatar, but
-                        {
+                        // doesn't seem to be attached, skip
-                            // Ensure that mesh has at least 8 valid faces
+                        if (!found)
-                            part.Shape.ProfileBegin = 12500;
+                            continue;
-                            part.Shape.ProfileEnd = 0;
-                            part.Shape.ProfileHollow = 27500;
+                        // On vehicle crossing, the attachments are received
-                        }
+                        // while the avatar is still a child. Don't send
-                    }
+                        // updates here because the LocalId has not yet
-    
+                        // been updated and the viewer will derender the
-                    #region UpdateFlags to packet type conversion
+                        // attachments until the avatar becomes root.
-    
+                        if (sp.IsChildAgent)
-                    PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
+                            continue;
-    
-                    bool canUseCompressed = true;
-                    bool canUseImproved = true;
-    
-                    // Compressed object updates only make sense for LL primitives
-                    if (!(update.Entity is SceneObjectPart))
-                    {
-                        canUseCompressed = false;
-                    }
-    
-                    if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
-                    {
-                        canUseCompressed = false;
-                        canUseImproved = false;
                    }
-                    else
+                    if (grp.IsAttachment && m_disableFacelights)
                    {
-                        if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                        if (grp.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
-                            updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
+                            grp.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
-                            updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
-                        {
-                            canUseCompressed = false;
-                        }
-    
-                        if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Text) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Material) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
                        {
-                            canUseImproved = false;
+                            part.Shape.LightEntry = false;
                        }
                    }
-    
-                    #endregion UpdateFlags to packet type conversion
+                    if(doCulling && !grp.IsAttachment)
-    
-                    #region Block Construction
-    
-                    // TODO: Remove this once we can build compressed updates
-                    canUseCompressed = false;
-    
-                    if (!canUseImproved && !canUseCompressed)
                    {
-                        ObjectUpdatePacket.ObjectDataBlock updateBlock;
+                        if(GroupsNeedFullUpdate.Contains(grp))
+                            continue;
-                        if (update.Entity is ScenePresence)
+                        bool inview = false;
-                        {
+                        lock(GroupsInView)
-                            updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
+                            inview = GroupsInView.Contains(grp);
-                        }
-                        else
+                        if(!inview)
                        {
-                            SceneObjectPart part = (SceneObjectPart)update.Entity;
+                            float bradius = grp.GetBoundsRadius();
-                            updateBlock = CreatePrimUpdateBlock(part, AgentId);
+                            Vector3 partpos = grp.AbsolutePosition + grp.getBoundsCenter();
+//                            float dcam = (partpos - mycamera).LengthSquared();
-                            // If the part has become a private hud since the update was scheduled then we do not
+                            float dpos = (partpos - mypos).LengthSquared();
-                            // want to send it to other avatars.
+//                            if(dcam < dpos)
-                            if (part.ParentGroup.IsAttachment
+//                                dpos = dcam;
-                                && part.ParentGroup.HasPrivateAttachmentPoint
+                            dpos = (float)Math.Sqrt(dpos) - bradius;
-                                && part.ParentGroup.AttachedAvatar != AgentId)
+                            if(dpos > cullingrange)
                                continue;
-                            // If the part has since been deleted, then drop the update.  In the case of attachments,
+                            GroupsNeedFullUpdate.Add(grp);
-                            // this is to avoid spurious updates to other viewers since post-processing of attachments
+                            continue;
-                            // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                            // of the test above).
-                            //
-                            // Actual deletions (kills) happen in another method.
-                            if (part.ParentGroup.IsDeleted)
-                                continue;
                        }
+                    }
+                }
+                else if (update.Entity is ScenePresence)
+                {
+                    ScenePresence presence = (ScenePresence)update.Entity;
+                    if (presence.IsDeleted)
+                        continue;
+                    // If ParentUUID is not UUID.Zero and ParentID is 0, this
+                    // avatar is in the process of crossing regions while
+                    // sat on an object. In this state, we don't want any
+                    // updates because they will visually orbit the avatar.
+                    // Update will be forced once crossing is completed anyway.
+                    if (presence.ParentUUID != UUID.Zero && presence.ParentID == 0)
+                        continue;
+                }
+                #region UpdateFlags to packet type conversion
+                bool canUseCompressed = true;
+                bool canUseImproved = true;
+                // Compressed object updates only make sense for LL primitives
+                if (!(update.Entity is SceneObjectPart))
+                {
+                    canUseCompressed = false;
+                }
-                        objectUpdateBlocks.Value.Add(updateBlock);
+                if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
-                        objectUpdates.Value.Add(update);
+                {
+                    canUseCompressed = false;
+                    canUseImproved = false;
+                }
+                else
+                {
+                    if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Joint))
+                    {
+                        canUseCompressed = false;
                    }
-                    else if (!canUseImproved)
+                    if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Text) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Material) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Joint))
                    {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
+                        canUseImproved = false;
-                        ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
+                    }
-                            = CreateCompressedUpdateBlock(part, updateFlags);
+                }
-                        // If the part has since been deleted, then drop the update.  In the case of attachments,
+                #endregion UpdateFlags to packet type conversion
-                        // this is to avoid spurious updates to other viewers since post-processing of attachments
-                        // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                        // of the test above).
-                        //
-                        // Actual deletions (kills) happen in another method.
-                        if (part.ParentGroup.IsDeleted)
-                            continue;
-                        compressedUpdateBlocks.Value.Add(compressedBlock);
+                #region Block Construction
-                        compressedUpdates.Value.Add(update);
+                // TODO: Remove this once we can build compressed updates
+                canUseCompressed = false;
+                if (!canUseImproved && !canUseCompressed)
+                {
+                    ObjectUpdatePacket.ObjectDataBlock ablock;
+                    if (update.Entity is ScenePresence)
+                        ablock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
+                    else
+                        ablock = CreatePrimUpdateBlock((SceneObjectPart)update.Entity, mysp);
+                    objectUpdateBlocks.Add(ablock);
+                    objectUpdates.Value.Add(update);
+                    maxUpdatesBytes -= ablock.Length;
+                }
+                else if (!canUseImproved)
+                {
+                    ObjectUpdateCompressedPacket.ObjectDataBlock ablock =
+                            CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags);
+                    compressedUpdateBlocks.Add(ablock);
+                    compressedUpdates.Value.Add(update);
+                    maxUpdatesBytes -= ablock.Length;
+                }
+                else
+                {
+                    ImprovedTerseObjectUpdatePacket.ObjectDataBlock ablock;
+                    if (update.Entity is ScenePresence)
+                    {
+                        // ALL presence updates go into a special list
+                        ablock = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
+                        terseAgentUpdateBlocks.Add(ablock);
+                        terseAgentUpdates.Value.Add(update);
                    }
                    else
                    {
-                        if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
+                        // Everything else goes here
-                        {
+                        ablock = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-                            // Self updates go into a special list
+                        terseUpdateBlocks.Add(ablock);
-                            terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                        terseUpdates.Value.Add(update);
-                            terseAgentUpdates.Value.Add(update);
+                    }
-                        }
+                    maxUpdatesBytes -= ablock.Length;
-                        else
+                }
-                        {
-                            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
-                                = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-                            // Everything else goes here
+                #endregion Block Construction
-                            if (update.Entity is SceneObjectPart)
+            }
-                            {
-                                SceneObjectPart part = (SceneObjectPart)update.Entity;
-                                // If the part has become a private hud since the update was scheduled then we do not
-                                // want to send it to other avatars.
-                                if (part.ParentGroup.IsAttachment
-                                    && part.ParentGroup.HasPrivateAttachmentPoint
-                                    && part.ParentGroup.AttachedAvatar != AgentId)
-                                    continue;
-                                // If the part has since been deleted, then drop the update.  In the case of attachments,
-                                // this is to avoid spurious updates to other viewers since post-processing of attachments
-                                // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                                // of the test above).
-                                //
-                                // Actual deletions (kills) happen in another method.
-                                if (part.ParentGroup.IsDeleted)
-                                    continue;
-                            }
-                            terseUpdateBlocks.Value.Add(terseUpdateBlock);
+            #region Packet Sending
-                            terseUpdates.Value.Add(update);
-                        }
-                    }
-                    ++updatesThisCall;
+            ushort timeDilation;
-    
-                    #endregion Block Construction
-                }
-    
-                #region Packet Sending
-                ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
-                if (terseAgentUpdateBlocks.IsValueCreated)
+            if(!IsActive)
-                {
+                return;
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
+            timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
-                    ImprovedTerseObjectUpdatePacket packet
+            if (terseAgentUpdateBlocks.Count > 0)
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            {
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[terseAgentUpdateBlocks.Count];
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                for (int i = 0; i < terseAgentUpdateBlocks.Count; i++)
-                    packet.RegionData.TimeDilation = timeDilation;
+                    packet.ObjectData[i] = terseAgentUpdateBlocks[i];
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-                    for (int i = 0; i < blocks.Count; i++)
+                terseAgentUpdateBlocks.Clear();
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
+                OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
-                    OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
+            }
-                }
+            if (objectUpdateBlocks.Count > 0)
+            {
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                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];
+                objectUpdateBlocks.Clear();
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
+            }
+            if (compressedUpdateBlocks.Count > 0)
+            {
+                ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[compressedUpdateBlocks.Count];
+                for (int i = 0; i < compressedUpdateBlocks.Count; i++)
+                    packet.ObjectData[i] = compressedUpdateBlocks[i];
+                compressedUpdateBlocks.Clear();
-                if (objectUpdateBlocks.IsValueCreated)
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
+            }
+            if (terseUpdateBlocks.Count > 0)
+            {
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
+                        PacketType.ImprovedTerseObjectUpdate);
+                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];
+                terseUpdateBlocks.Clear();
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
+            }
+            #endregion Packet Sending
+            #region Handle deleted objects
+            if (m_killRecord.Count > 0)
+            {
+                SendKillObject(m_killRecord);
+                m_killRecord.Clear();
+            }
+            if(GroupsNeedFullUpdate.Count > 0)
+            {
+                foreach(SceneObjectGroup grp in GroupsNeedFullUpdate)
                {
-                    List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
+                    foreach(SceneObjectPart p in grp.Parts)
-        
+                        SendEntityUpdate(p,PrimUpdateFlags.CancelKill);
-                    ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                    lock(GroupsInView)
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                        GroupsInView.Add(grp);
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
                }
-        
+            }
-                if (compressedUpdateBlocks.IsValueCreated)
+            #endregion
+        }
+        // hack.. dont use
+/*
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+            if (ent is SceneObjectPart)
+            {
+                SceneObjectPart part = (SceneObjectPart)ent;
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
+                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+                ObjectUpdatePacket.ObjectDataBlock blk = CreatePrimUpdateBlock(part, mysp);
+                if (parentID.HasValue)
                {
-                    List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
+                    blk.ParentID = parentID.Value;
-        
-                    ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
                }
-                if (terseUpdateBlocks.IsValueCreated)
+                packet.ObjectData[0] = blk;
-                {
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
-        
-                    ImprovedTerseObjectUpdatePacket packet
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
-                            PacketType.ImprovedTerseObjectUpdate);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
-                }
            }
 //            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);
 //
-            #endregion Packet Sending
        }
+*/
        public void ReprioritizeUpdates()
        {
            lock (m_entityUpdates.SyncRoot)
                m_entityUpdates.Reprioritize(UpdatePriorityHandler);
+            CheckGroupsInView();
+        }
+        private bool CheckGroupsInViewBusy = false;
+        public void CheckGroupsInView()
+        {
+            bool doCulling = m_scene.ObjectsCullingByDistance;
+            if(!doCulling)
+                return;
+            if(CheckGroupsInViewBusy)
+                return;
+            CheckGroupsInViewBusy = true;
+            float cullingrange = 64.0f;
+//                Vector3 mycamera = Vector3.Zero;
+            Vector3 mypos = Vector3.Zero;
+            ScenePresence mysp = (ScenePresence)SceneAgent;
+            if(mysp != null && !mysp.IsDeleted)
+            {
+                cullingrange  = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
+//                    mycamera = mysp.CameraPosition;
+                mypos = mysp.AbsolutePosition;
+            }
+            else
+            {
+                CheckGroupsInViewBusy= false;
+                return;
+            }
+            HashSet<SceneObjectGroup> NewGroupsInView = new HashSet<SceneObjectGroup>();
+            HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
+            List<SceneObjectGroup> kills = new List<SceneObjectGroup>();
+            EntityBase[] entities = m_scene.Entities.GetEntities();
+            foreach (EntityBase e in entities)
+            {
+                if(!IsActive)
+                    return;
+                if (e != null && e is SceneObjectGroup)
+                {
+                    SceneObjectGroup grp = (SceneObjectGroup)e;
+                    if(grp.IsDeleted || grp.IsAttachment)
+                        continue;
+                    float bradius = grp.GetBoundsRadius();
+                    Vector3 grppos = grp.AbsolutePosition + grp.getBoundsCenter();
+//                        float dcam = (grppos - mycamera).LengthSquared();
+                    float dpos = (grppos - mypos).LengthSquared();
+//                        if(dcam < dpos)
+//                            dpos = dcam;
+                    dpos = (float)Math.Sqrt(dpos) - bradius;
+                    bool inview;
+                    lock(GroupsInView)
+                        inview = GroupsInView.Contains(grp);
+                    if(dpos > cullingrange)
+                    {
+                        if(inview)
+                            kills.Add(grp);
+                    }
+                    else
+                    {
+                        if(!inview)
+                            GroupsNeedFullUpdate.Add(grp);
+                        NewGroupsInView.Add(grp);
+                    }
+                }
+            }
+            lock(GroupsInView)
+                GroupsInView = NewGroupsInView;
+            if (kills.Count > 0)
+            {
+                List<uint> partIDs = new List<uint>();
+                foreach(SceneObjectGroup grp in kills)
+                {
+                    SendEntityUpdate(grp.RootPart,PrimUpdateFlags.Kill);
+                    foreach(SceneObjectPart p in grp.Parts)
+                    {
+                        if(p != grp.RootPart)
+                            partIDs.Add(p.LocalId);
+                    }
+                }
+                kills.Clear();
+                if(partIDs.Count > 0)
+                {
+                    lock (m_entityProps.SyncRoot)
+                        m_entityProps.Remove(partIDs);
+                    lock (m_entityUpdates.SyncRoot)
+                        m_entityUpdates.Remove(partIDs);
+                }
+            }
+            if(GroupsNeedFullUpdate.Count > 0)
+            {
+                foreach(SceneObjectGroup grp in GroupsNeedFullUpdate)
+                {
+                    foreach(SceneObjectPart p in grp.Parts)
+                        SendEntityUpdate(p,PrimUpdateFlags.CancelKill);
+                }
+            }
+            CheckGroupsInViewBusy = false;
        }
        private bool UpdatePriorityHandler(ref uint priority, ISceneEntity entity)
@@ -4285,63 +4673,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        // of updates converted to packets. Since we don't want packets
        // to sit in the queue with old data, only convert enough updates
        // to packets that can be sent in 200ms.
-        private Int32 m_LastQueueFill = 0;
+//        private Int32 m_LastQueueFill = 0;
-        private Int32 m_maxUpdates = 0;
+//        private Int32 m_maxUpdates = 0;
        void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
        {
-//            if (!m_udpServer.IsRunningOutbound)
+            if(m_scene == null)
-//                return;
+                return;
            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
            {
-//                if (!m_udpServer.IsRunningOutbound)
+                int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);
-//                    return;
-                if (m_maxUpdates == 0 || m_LastQueueFill == 0)
-                {
-                    m_maxUpdates = m_udpServer.PrimUpdatesPerCallback;
-                }
-                else
-                {
-                    if (Util.EnvironmentTickCountSubtract(m_LastQueueFill) < 200)
-                        m_maxUpdates += 5;
-                    else
-                        m_maxUpdates = m_maxUpdates >> 1;
-                }
-                m_maxUpdates = Util.Clamp<Int32>(m_maxUpdates,10,500);
-                m_LastQueueFill = Util.EnvironmentTickCount();
-            
                if (m_entityUpdates.Count > 0)
-                    ProcessEntityUpdates(m_maxUpdates);
+                    ProcessEntityUpdates(maxUpdateBytes);
                if (m_entityProps.Count > 0)
-                    ProcessEntityPropertyRequests(m_maxUpdates);
+                    ProcessEntityPropertyRequests(maxUpdateBytes);
            }
            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
                ImageManager.ProcessImageQueue(m_udpServer.TextureSendLimit);
-        }
+    }
        internal bool HandleHasUpdates(ThrottleOutPacketTypeFlags categories)
        {
-            bool hasUpdates = false;
            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
            {
                if (m_entityUpdates.Count > 0)
-                    hasUpdates = true;
+                    return true;
-                else if (m_entityProps.Count > 0)
+                if (m_entityProps.Count > 0)
-                    hasUpdates = true;                   
+                    return true;
            }
            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
            {
                if (ImageManager.HasUpdates())
-                    hasUpdates = true;
+                    return true;
            }
-            return hasUpdates;
+            return false;
        }
        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
@@ -4443,13 +4814,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(pack, ThrottleOutPacketType.Task);
        }
-        private class ObjectPropertyUpdate : IEntityUpdate
+        private class ObjectPropertyUpdate : EntityUpdate
        {
            internal bool SendFamilyProps;
            internal bool SendObjectProps;
-            
            public ObjectPropertyUpdate(ISceneEntity entity, uint flags, bool sendfam, bool sendobj)
-                : base(entity,flags)
+                : base(entity,(PrimUpdateFlags)flags)
            {
                SendFamilyProps = sendfam;
                SendObjectProps = sendobj;
@@ -4462,7 +4833,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                base.Update(update);
            }
        }
-        
        public void SendObjectPropertiesFamilyData(ISceneEntity entity, uint requestFlags)
        {
            uint priority = 0;  // time based ordering only
@@ -4496,7 +4867,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
@@ -4504,29 +4875,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_entityProps.Enqueue(priority, new ObjectPropertyUpdate(entity,0,false,true));
        }
-        private void ProcessEntityPropertyRequests(int maxUpdates)
+       List<ObjectPropertiesFamilyPacket.ObjectDataBlock> objectFamilyBlocks = new
+                List<ObjectPropertiesFamilyPacket.ObjectDataBlock>();
+       List<ObjectPropertiesPacket.ObjectDataBlock> objectPropertiesBlocks =
+                new List<ObjectPropertiesPacket.ObjectDataBlock>();
+       List<SceneObjectPart> needPhysics = new List<SceneObjectPart>();
+        private void ProcessEntityPropertyRequests(int maxUpdateBytes)
        {
-            OpenSim.Framework.Lazy<List<ObjectPropertiesFamilyPacket.ObjectDataBlock>> objectFamilyBlocks =
+//            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> familyUpdates =
-                new OpenSim.Framework.Lazy<List<ObjectPropertiesFamilyPacket.ObjectDataBlock>>();
+//                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-            OpenSim.Framework.Lazy<List<ObjectPropertiesPacket.ObjectDataBlock>> objectPropertiesBlocks =
+//            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
-                new OpenSim.Framework.Lazy<List<ObjectPropertiesPacket.ObjectDataBlock>>();
+//                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> familyUpdates =
+            bool orderedDequeue = m_scene.UpdatePrioritizationScheme  == UpdatePrioritizationSchemes.SimpleAngularDistance;
-                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
+            EntityUpdate iupdate;
-                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
-            
-            IEntityUpdate iupdate;
            Int32 timeinqueue; // this is just debugging code & can be dropped later
-            int updatesThisCall = 0;
+            while (maxUpdateBytes > 0)
-            while (updatesThisCall < m_maxUpdates)
            {
                lock (m_entityProps.SyncRoot)
-                    if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
+                {
-                        break;
+                    if(orderedDequeue)
+                    {
+                        if (!m_entityProps.TryOrderedDequeue(out iupdate, out timeinqueue))
+                            break;
+                    }
+                    else
+                    {
+                        if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
+                            break;
+                    }
+                }
                ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;
                if (update.SendFamilyProps)
@@ -4535,8 +4917,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    {
                        SceneObjectPart sop = (SceneObjectPart)update.Entity;
                        ObjectPropertiesFamilyPacket.ObjectDataBlock objPropDB = CreateObjectPropertiesFamilyBlock(sop,update.Flags);
-                        objectFamilyBlocks.Value.Add(objPropDB);
+                        objectFamilyBlocks.Add(objPropDB);
-                        familyUpdates.Value.Add(update);
+//                        familyUpdates.Value.Add(update);
+                        maxUpdateBytes -= objPropDB.Length;
                    }
                }
@@ -4545,84 +4928,107 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (update.Entity is SceneObjectPart)
                    {
                        SceneObjectPart sop = (SceneObjectPart)update.Entity;
+                        needPhysics.Add(sop);
                        ObjectPropertiesPacket.ObjectDataBlock objPropDB = CreateObjectPropertiesBlock(sop);
-                        objectPropertiesBlocks.Value.Add(objPropDB);
+                        objectPropertiesBlocks.Add(objPropDB);
-                        propertyUpdates.Value.Add(update);
+//                        propertyUpdates.Value.Add(update);
+                        maxUpdateBytes -= objPropDB.Length;
                    }
                }
-                updatesThisCall++;
            }
-            
-            // Int32 ppcnt = 0;
+            if (objectPropertiesBlocks.Count > 0)
-            // Int32 pbcnt = 0;
-            
-            if (objectPropertiesBlocks.IsValueCreated)
            {
-                List<ObjectPropertiesPacket.ObjectDataBlock> blocks = objectPropertiesBlocks.Value;
-                List<ObjectPropertyUpdate> updates = propertyUpdates.Value;
                ObjectPropertiesPacket packet = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
-                packet.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[blocks.Count];
+                packet.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[objectPropertiesBlocks.Count];
-                for (int i = 0; i < blocks.Count; i++)
+                for (int i = 0; i < objectPropertiesBlocks.Count; i++)
-                    packet.ObjectData[i] = blocks[i];
+                    packet.ObjectData[i] = objectPropertiesBlocks[i];
+                objectPropertiesBlocks.Clear();
                packet.Header.Zerocoded = true;
                // Pass in the delegate so that if this packet needs to be resent, we send the current properties
                // of the object rather than the properties when the packet was created
-                OutPacket(packet, ThrottleOutPacketType.Task, true,
+                // HACK : Remove intelligent resending until it's fixed in core
-                          delegate(OutgoingPacket oPacket)
+                //OutPacket(packet, ThrottleOutPacketType.Task, true,
-                          {
+                //          delegate(OutgoingPacket oPacket)
-                              ResendPropertyUpdates(updates, oPacket);
+                //          {
-                          });
+                //              ResendPropertyUpdates(propertyUpdates.Value, oPacket);
+                //          });
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
                // pbcnt += blocks.Count;
                // ppcnt++;
            }
-            
            // Int32 fpcnt = 0;
            // Int32 fbcnt = 0;
-            
-            if (objectFamilyBlocks.IsValueCreated)
+            if (objectFamilyBlocks.Count > 0)
            {
-                List<ObjectPropertiesFamilyPacket.ObjectDataBlock> blocks = objectFamilyBlocks.Value;
-                
                // one packet per object block... uggh...
-                for (int i = 0; i < blocks.Count; i++)
+                for (int i = 0; i < objectFamilyBlocks.Count; i++)
                {
                    ObjectPropertiesFamilyPacket packet =
                        (ObjectPropertiesFamilyPacket)PacketPool.Instance.GetPacket(PacketType.ObjectPropertiesFamily);
-                    packet.ObjectData = blocks[i];
+                    packet.ObjectData = objectFamilyBlocks[i];
                    packet.Header.Zerocoded = true;
                    // Pass in the delegate so that if this packet needs to be resent, we send the current properties
                    // of the object rather than the properties when the packet was created
-                    List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
+//                    List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
-                    updates.Add(familyUpdates.Value[i]);
+//                    updates.Add(familyUpdates.Value[i]);
-                    OutPacket(packet, ThrottleOutPacketType.Task, true,
+                    // HACK : Remove intelligent resending until it's fixed in core
-                              delegate(OutgoingPacket oPacket)
+                    //OutPacket(packet, ThrottleOutPacketType.Task, true,
-                              {
+                    //          delegate(OutgoingPacket oPacket)
-                                  ResendPropertyUpdates(updates, oPacket);
+                    //          {
-                              });
+                    //              ResendPropertyUpdates(updates, oPacket);
+                    //          });
+                    OutPacket(packet, ThrottleOutPacketType.Task, true);
                    // fpcnt++;
                    // fbcnt++;
                }
-                
+                objectFamilyBlocks.Clear();
+            }
+            if(needPhysics.Count > 0)
+            {
+                IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
+                if(eq != null)
+                {
+                    OSDArray array = new OSDArray();
+                    foreach(SceneObjectPart sop in needPhysics)
+                    {
+                        OSDMap physinfo = new OSDMap(6);
+                        physinfo["LocalID"] = sop.LocalId;
+                        physinfo["Density"] = sop.Density;
+                        physinfo["Friction"] = sop.Friction;
+                        physinfo["GravityMultiplier"] = sop.GravityModifier;
+                        physinfo["Restitution"] = sop.Restitution;
+                        physinfo["PhysicsShapeType"] = (int)sop.PhysicsShapeType;
+                        array.Add(physinfo);
+                    }
+                    OSDMap llsdBody = new OSDMap(1);
+                    llsdBody.Add("ObjectData", array);
+                    eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),AgentId);
+                 }
+                 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);
        }
-        private ObjectPropertiesFamilyPacket.ObjectDataBlock CreateObjectPropertiesFamilyBlock(SceneObjectPart sop, uint requestFlags)
+        private ObjectPropertiesFamilyPacket.ObjectDataBlock CreateObjectPropertiesFamilyBlock(SceneObjectPart sop, PrimUpdateFlags requestFlags)
        {
            ObjectPropertiesFamilyPacket.ObjectDataBlock block = new ObjectPropertiesFamilyPacket.ObjectDataBlock();
-            block.RequestFlags = requestFlags;
+            block.RequestFlags = (uint)requestFlags;
            block.ObjectID = sop.UUID;
            if (sop.OwnerID == sop.GroupID)
                block.OwnerID = UUID.Zero;
@@ -4640,13 +5046,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            block.SaleType = sop.ObjectSaleType;
            block.SalePrice = sop.SalePrice;
            block.Category = sop.Category;
-            block.LastOwnerID = sop.CreatorID; // copied from old SOG call... is this right?
+            block.LastOwnerID = sop.LastOwnerID;
            block.Name = Util.StringToBytes256(sop.Name);
            block.Description = Util.StringToBytes256(sop.Description);
            return block;
        }
-    
        private ObjectPropertiesPacket.ObjectDataBlock CreateObjectPropertiesBlock(SceneObjectPart sop)
        {
            //ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
@@ -4672,7 +5078,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);
@@ -4684,7 +5090,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];
 //
@@ -4701,7 +5107,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;
@@ -4728,52 +5134,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
        {
-            EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
+            int TotalnumberIDs = Data.Length;
-            packet.AgentData.TransactionID = UUID.Random();
+            int numberIDs;
-            packet.AgentData.AgentID = AgentId;
+            int IDIndex = 0;
-            packet.AgentData.SessionID = SessionId;
-            packet.MethodData.Invoice = invoice;
-            packet.MethodData.Method = Utils.StringToBytes("setaccess");
-            EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + Data.Length];
+            do
-            for (int i = 0; i < (6 + Data.Length); i++)
            {
-                returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
+                if(TotalnumberIDs > 63)
-            }
+                    numberIDs = 63;
-            int j = 0;
+                else
+                    numberIDs = TotalnumberIDs;
-            returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++;
+                TotalnumberIDs -= numberIDs;
-            returnblock[j].Parameter = Utils.StringToBytes(code.ToString()); j++;
-            returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-            returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-            returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-            returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-            j = 2; // Agents
+                EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
-            if ((code & 2) != 0)
+                packet.AgentData.TransactionID = UUID.Random();
-                j = 3; // Groups
+                packet.AgentData.AgentID = AgentId;
-            if ((code & 8) != 0)
+                packet.AgentData.SessionID = SessionId;
-                j = 5; // Managers
+                packet.MethodData.Invoice = invoice;
+                packet.MethodData.Method = Utils.StringToBytes("setaccess");
-            returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString());
+                EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + numberIDs];
-            j = 6;
-            for (int i = 0; i < Data.Length; i++)
+                for (int i = 0; i < (6 + numberIDs); i++)
-            {
+                {
-                returnblock[j].Parameter = Data[i].GetBytes(); j++;
+                    returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
-            }
+                }
-            packet.ParamList = returnblock;
-            packet.Header.Reliable = true;
+                returnblock[0].Parameter = Utils.StringToBytes(estateID.ToString());
-            OutPacket(packet, ThrottleOutPacketType.Task);
+                returnblock[1].Parameter = Utils.StringToBytes(code.ToString());
+                if((code & 1) != 0) // allowagents
+                    returnblock[2].Parameter = Utils.StringToBytes(numberIDs.ToString());
+                else
+                    returnblock[2].Parameter = Utils.StringToBytes("0");
+                if((code & 2) != 0) // groups
+                    returnblock[3].Parameter = Utils.StringToBytes(numberIDs.ToString());
+                else
+                    returnblock[3].Parameter = Utils.StringToBytes("0");
+                if((code & 4) != 0) // bans
+                    returnblock[4].Parameter = Utils.StringToBytes(numberIDs.ToString());
+                else
+                    returnblock[4].Parameter = Utils.StringToBytes("0");
+                if((code & 8) != 0) // managers
+                    returnblock[5].Parameter = Utils.StringToBytes(numberIDs.ToString());
+                else
+                    returnblock[5].Parameter = Utils.StringToBytes("0");
+                int j = 6;
+                for (int i = 0; i < numberIDs; i++)
+                {
+                    returnblock[j].Parameter = Data[IDIndex].GetBytes();
+                    j++;
+                    IDIndex++;
+                }
+                packet.ParamList = returnblock;
+                packet.Header.Reliable = true;
+                OutPacket(packet, ThrottleOutPacketType.Task);
+            } while (TotalnumberIDs > 0);
        }
        public void SendBannedUserList(UUID invoice, EstateBan[] bl, uint estateID)
        {
            List<UUID> BannedUsers = new List<UUID>();
            for (int i = 0; i < bl.Length; i++)
            {
                if (bl[i] == null)
@@ -4781,44 +5209,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (bl[i].BannedUserID == UUID.Zero)
                    continue;
                BannedUsers.Add(bl[i].BannedUserID);
-                if (BannedUsers.Count >= 50 || (i == (bl.Length - 1) && BannedUsers.Count > 0))
-                {
-                    EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
-                    packet.AgentData.TransactionID = UUID.Random();
-                    packet.AgentData.AgentID = AgentId;
-                    packet.AgentData.SessionID = SessionId;
-                    packet.MethodData.Invoice = invoice;
-                    packet.MethodData.Method = Utils.StringToBytes("setaccess");
-                    EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + BannedUsers.Count];
-                    int j;
-                    for (j = 0; j < (6 + BannedUsers.Count); j++)
-                    {
-                        returnblock[j] = new EstateOwnerMessagePacket.ParamListBlock();
-                    }
-                    j = 0; 
-                    returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++;
-                    returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++;
-                    returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-                    returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-                    returnblock[j].Parameter = Utils.StringToBytes(BannedUsers.Count.ToString()); j++;
-                    returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
-                    foreach (UUID banned in BannedUsers)
-                    {
-                        returnblock[j].Parameter = banned.GetBytes(); j++;
-                    }
-                    packet.ParamList = returnblock;
-                    packet.Header.Reliable = true;
-                    OutPacket(packet, ThrottleOutPacketType.Task);
-                    BannedUsers.Clear();
-                }
            }
+            SendEstateList(invoice, 4, BannedUsers.ToArray(), estateID);
        }
        public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
@@ -4864,7 +5256,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;
@@ -4881,7 +5273,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();
@@ -4939,17 +5331,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            packet.ParcelData.Data = data;
            packet.ParcelData.SequenceID = sequence_id;
            packet.Header.Zerocoded = true;
-            OutPacket(packet, ThrottleOutPacketType.Task);
+//            OutPacket(packet, ThrottleOutPacketType.Task);
+            OutPacket(packet, ThrottleOutPacketType.Land);
        }
        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;
@@ -4962,7 +5355,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;
@@ -4983,7 +5376,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;
@@ -4998,20 +5391,19 @@ 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)
            {
-                int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount();
-                updateMessage.SimWideMaxPrims = simulatorCapacity;
            }
            else
            {
                updateMessage.SimWideMaxPrims = 0;
            }
-            
            updateMessage.SnapSelection = snap_selection;
            updateMessage.SnapshotID    = landData.SnapshotID;
            updateMessage.Status        = (ParcelStatus) landData.Status;
@@ -5025,23 +5417,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            updateMessage.MediaLoop     = landData.MediaLoop;
            updateMessage.ObscureMusic  = landData.ObscureMusic;
            updateMessage.ObscureMedia  = landData.ObscureMedia;
-            
+            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;
+            //m_log.DebugFormat("[YYY]: SimWideMaxPrims={0} OwnerPrims={1} TotalPrims={2} SimWideTotalPrims={3} MaxPrims={4}",
+            //    updateMessage.SimWideMaxPrims, updateMessage.OwnerPrims, updateMessage.TotalPrims, updateMessage.SimWideTotalPrims, updateMessage.MaxPrims);
            try
            {
                IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
                if (eq != null)
                {
                    eq.ParcelProperties(updateMessage, this.AgentId);
-                } 
+                }
-                else 
+                else
                {
                    m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
                }
@@ -5078,7 +5476,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);
@@ -5133,14 +5531,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (notifyCount > 0)
            {
-                if (notifyCount > 32)
+//                if (notifyCount > 32)
-                {
+//                {
-                    m_log.InfoFormat(
+//                    m_log.InfoFormat(
-                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
+//                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
-                        + " - a developer might want to investigate whether this is a hard limit", 32);
+//                        + " - a developer might want to investigate whether this is a hard limit", 32);
+//
-                    notifyCount = 32;
+//                    notifyCount = 32;
-                }
+//                }
                ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
                    = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -5178,6 +5576,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #endregion
        #region Helper Methods
+        private void ClampVectorForUint(ref Vector3 v, float max)
+        {
+            float a,b;
+            a = Math.Abs(v.X);
+            b = Math.Abs(v.Y);
+            if(b > a)
+                a = b;
+            b= Math.Abs(v.Z);
+            if(b > a)
+                a = b;
+            if (a > max)
+            {
+                a = max / a;
+                v.X *= a;
+                v.Y *= a;
+                v.Z *= a;
+            }
+        }
        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(ISceneEntity entity, bool sendTexture)
        {
@@ -5191,45 +5609,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Quaternion rotation;
            byte[] textureEntry;
-            if (entity is ScenePresence)
+            if (avatar)
            {
                ScenePresence presence = (ScenePresence)entity;
-//                m_log.DebugFormat( 
-//                    "[LLCLIENTVIEW]: Sending terse update to {0} with pos {1}, vel {2} in {3}", 
-//                    Name, presence.OffsetPosition, presence.Velocity, m_scene.Name);
-                attachPoint = presence.State;
-                collisionPlane = presence.CollisionPlane;
                position = presence.OffsetPosition;
                velocity = presence.Velocity;
                acceleration = Vector3.Zero;
-                // Interestingly, sending this to non-zero will cause the client's avatar to start moving & accelerating
-                // in that direction, even though we don't model this on the server.  Implementing this in the future
-                // may improve movement smoothness.
-//                acceleration = new Vector3(1, 0, 0);
-                
-                angularVelocity = presence.AngularVelocity;
-                // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
-                // it rotates around.
-                // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
-                // excessive up and down movements of the camera when looking up and down.
-                // See http://opensimulator.org/mantis/view.php?id=3274
-                // This does not affect head movement, since this is controlled entirely by camera movement rather than
-                // body rotation.  We still need to transmit X and Y for sitting avatars but mouselook does not change
-                // the rotation in this case.
                rotation = presence.Rotation;
+                // tpvs can only see rotations around Z in some cases
-                if (!presence.IsSatOnObject)
+                if(!presence.Flying && !presence.IsSatOnObject)
                {
-                    rotation.X = 0;
+                    rotation.X = 0f;
-                    rotation.Y = 0;
+                    rotation.Y = 0f;
+                    rotation.Normalize();
                }
+                angularVelocity = presence.AngularVelocity;
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
+                attachPoint = presence.State;
+                collisionPlane = presence.CollisionPlane;
                if (sendTexture)
+                {
                    textureEntry = presence.Appearance.Texture.GetBytes();
+                }
                else
                    textureEntry = null;
            }
@@ -5287,11 +5693,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pos += 12;
            // Velocity
+            ClampVectorForUint(ref velocity, 128f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.X, -128.0f, 128.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Y, -128.0f, 128.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Z, -128.0f, 128.0f), data, pos); pos += 2;
            // Acceleration
+            ClampVectorForUint(ref acceleration, 64f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.X, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Y, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Z, -64.0f, 64.0f), data, pos); pos += 2;
@@ -5303,13 +5711,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.W, -1.0f, 1.0f), data, pos); pos += 2;
            // Angular Velocity
+            ClampVectorForUint(ref angularVelocity, 64f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.X, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Y, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Z, -64.0f, 64.0f), data, pos); pos += 2;
            ImprovedTerseObjectUpdatePacket.ObjectDataBlock block
                = PacketPool.Instance.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            
            block.Data = data;
            if (textureEntry != null && textureEntry.Length > 0)
@@ -5333,34 +5742,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
        {
+            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);
            byte[] objectData = new byte[76];
-            data.CollisionPlane.ToBytes(objectData, 0);
+            Vector3 velocity = new Vector3(0, 0, 0);
-            data.OffsetPosition.ToBytes(objectData, 16);
+            Vector3 acceleration = new Vector3(0, 0, 0);
-            data.Velocity.ToBytes(objectData, 28);
+            // tpvs can only see rotations around Z in some cases
-//            data.Acceleration.ToBytes(objectData, 40);
+            if(!data.Flying && !data.IsSatOnObject)
-            // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
-            // it rotates around.
-            // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
-            // excessive up and down movements of the camera when looking up and down.
-            // See http://opensimulator.org/mantis/view.php?id=3274
-            // This does not affect head movement, since this is controlled entirely by camera movement rather than
-            // body rotation.  We still need to transmit X and Y for sitting avatars but mouselook does not change
-            // the rotation in this case.
-            Quaternion rot = data.Rotation;
-            if (!data.IsSatOnObject)
            {
-                rot.X = 0;
+                rotation.X = 0f;
-                rot.Y = 0;
+                rotation.Y = 0f;
            }
+            rotation.Normalize();
-            rot.ToBytes(objectData, 52);
+            data.CollisionPlane.ToBytes(objectData, 0);
-            //data.AngularVelocity.ToBytes(objectData, 64);
+            offsetPosition.ToBytes(objectData, 16);
+            velocity.ToBytes(objectData, 28);
+            acceleration.ToBytes(objectData, 40);
+            rotation.ToBytes(objectData, 52);
+            data.AngularVelocity.ToBytes(objectData, 64);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5386,7 +5792,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            update.PCode = (byte)PCode.Avatar;
            update.ProfileCurve = 1;
            update.PSBlock = Utils.EmptyBytes;
-            update.Scale = new Vector3(0.45f, 0.6f, 1.9f);
+            update.Scale = data.Appearance.AvatarSize;
+//            update.Scale.Z -= 0.2f;
            update.Text = Utils.EmptyBytes;
            update.TextColor = new byte[4];
@@ -5397,46 +5805,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            update.TextureEntry = Utils.EmptyBytes;
 //            update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
+/*  all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854)
            update.UpdateFlags = (uint)(
                PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
                PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
                PrimFlags.ObjectOwnerModify);
+*/
+            update.UpdateFlags = 0;
            return update;
        }
-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart data, UUID recipientID)
+//        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart data, UUID recipientID)
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart part, ScenePresence sp)
        {
            byte[] objectData = new byte[60];
-            data.RelativePosition.ToBytes(objectData, 0);
+            part.RelativePosition.ToBytes(objectData, 0);
-            data.Velocity.ToBytes(objectData, 12);
+            part.Velocity.ToBytes(objectData, 12);
-            data.Acceleration.ToBytes(objectData, 24);
+            part.Acceleration.ToBytes(objectData, 24);
-            try
-            {
+            Quaternion rotation = part.RotationOffset;
-                data.RotationOffset.ToBytes(objectData, 36);
+            rotation.Normalize();
-            }
+            rotation.ToBytes(objectData, 36);
-            catch (Exception e)
+            part.AngularVelocity.ToBytes(objectData, 48);
-            {
-                m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString());
-                OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36);
-            }
-            data.AngularVelocity.ToBytes(objectData, 48);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
-            update.ClickAction = (byte)data.ClickAction;
+            update.ClickAction = (byte)part.ClickAction;
            update.CRC = 0;
-            update.ExtraParams = data.Shape.ExtraParams ?? Utils.EmptyBytes;
+            update.ExtraParams = part.Shape.ExtraParams ?? Utils.EmptyBytes;
-            update.FullID = data.UUID;
+            update.FullID = part.UUID;
-            update.ID = data.LocalId;
+            update.ID = part.LocalId;
            //update.JointAxisOrAnchor = Vector3.Zero; // These are deprecated
            //update.JointPivot = Vector3.Zero;
            //update.JointType = 0;
-            update.Material = data.Material;
+            update.Material = part.Material;
-            update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
+/*
            if (data.ParentGroup.IsAttachment)
            {
-                update.NameValue 
+                update.NameValue
                    = Util.StringToBytes256(
                        string.Format("AttachItemID STRING RW SV {0}", data.ParentGroup.FromItemID));
@@ -5458,50 +5864,91 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // case for attachments may contain conflicting values that can end up crashing the viewer.
                update.State = data.ParentGroup.RootPart.Shape.State;
            }
+*/
+            if (part.ParentGroup.IsAttachment)
+            {
+                if (part.IsRoot)
+                {
+                    update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + part.ParentGroup.FromItemID);
+                }
+                else
+                    update.NameValue = Utils.EmptyBytes;
+                int st = (int)part.ParentGroup.AttachmentPoint;
+                update.State = (byte)(((st & 0xf0) >> 4) + ((st & 0x0f) << 4)); ;
+            }
+            else
+            {
+                update.NameValue = Utils.EmptyBytes;
+                update.State = part.Shape.State; // not sure about this
+            }
            update.ObjectData = objectData;
-            update.ParentID = data.ParentID;
+            update.ParentID = part.ParentID;
-            update.PathBegin = data.Shape.PathBegin;
+            update.PathBegin = part.Shape.PathBegin;
-            update.PathCurve = data.Shape.PathCurve;
+            update.PathCurve = part.Shape.PathCurve;
-            update.PathEnd = data.Shape.PathEnd;
+            update.PathEnd = part.Shape.PathEnd;
-            update.PathRadiusOffset = data.Shape.PathRadiusOffset;
+            update.PathRadiusOffset = part.Shape.PathRadiusOffset;
-            update.PathRevolutions = data.Shape.PathRevolutions;
+            update.PathRevolutions = part.Shape.PathRevolutions;
-            update.PathScaleX = data.Shape.PathScaleX;
+            update.PathScaleX = part.Shape.PathScaleX;
-            update.PathScaleY = data.Shape.PathScaleY;
+            update.PathScaleY = part.Shape.PathScaleY;
-            update.PathShearX = data.Shape.PathShearX;
+            update.PathShearX = part.Shape.PathShearX;
-            update.PathShearY = data.Shape.PathShearY;
+            update.PathShearY = part.Shape.PathShearY;
-            update.PathSkew = data.Shape.PathSkew;
+            update.PathSkew = part.Shape.PathSkew;
-            update.PathTaperX = data.Shape.PathTaperX;
+            update.PathTaperX = part.Shape.PathTaperX;
-            update.PathTaperY = data.Shape.PathTaperY;
+            update.PathTaperY = part.Shape.PathTaperY;
-            update.PathTwist = data.Shape.PathTwist;
+            update.PathTwist = part.Shape.PathTwist;
-            update.PathTwistBegin = data.Shape.PathTwistBegin;
+            update.PathTwistBegin = part.Shape.PathTwistBegin;
-            update.PCode = data.Shape.PCode;
+            update.PCode = part.Shape.PCode;
-            update.ProfileBegin = data.Shape.ProfileBegin;
+            update.ProfileBegin = part.Shape.ProfileBegin;
-            update.ProfileCurve = data.Shape.ProfileCurve;
+            update.ProfileCurve = part.Shape.ProfileCurve;
-            update.ProfileEnd = data.Shape.ProfileEnd;
-            update.ProfileHollow = data.Shape.ProfileHollow;
+            ushort profileBegin = part.Shape.ProfileBegin;
-            update.PSBlock = data.ParticleSystem ?? Utils.EmptyBytes;
+            ushort profileHollow = part.Shape.ProfileHollow;
-            update.TextColor = data.GetTextColor().GetBytes(false);
-            update.TextureAnim = data.TextureAnimation ?? Utils.EmptyBytes;
+            if(part.Shape.SculptType == (byte)SculptType.Mesh) // filter out hack
-            update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
+            {
-            update.Scale = data.Shape.Scale;
+                update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
-            update.Text = Util.StringToBytes256(data.Text);
+                // fix old values that confused viewers
-            update.MediaURL = Util.StringToBytes256(data.MediaUrl);
+                if(profileBegin == 1)
+                    profileBegin = 9375;
+                if(profileHollow == 1)
+                    profileHollow = 27500;
+                // fix torus hole size Y that also confuse some viewers
+                if(update.ProfileCurve == (byte)ProfileShape.Circle && update.PathScaleY < 150)
+                       update.PathScaleY = 150;                    
+            }
+            else
+            {
+                update.ProfileCurve = part.Shape.ProfileCurve;
+            }
+            update.ProfileHollow = profileHollow;
+            update.ProfileBegin = profileBegin;
+            update.ProfileEnd = part.Shape.ProfileEnd;
+            update.PSBlock = part.ParticleSystem ?? Utils.EmptyBytes;
+            update.TextColor = part.GetTextColor().GetBytes(false);
+            update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes;
+            update.TextureEntry = part.Shape.TextureEntry ?? Utils.EmptyBytes;
+            update.Scale = part.Shape.Scale;
+            update.Text = Util.StringToBytes(part.Text, 255);
+            update.MediaURL = Util.StringToBytes(part.MediaUrl, 255);
            #region PrimFlags
-            PrimFlags flags = (PrimFlags)m_scene.Permissions.GenerateClientFlags(recipientID, data.UUID);
+            PrimFlags flags = (PrimFlags)m_scene.Permissions.GenerateClientFlags(part, sp);
            // Don't send the CreateSelected flag to everyone
            flags &= ~PrimFlags.CreateSelected;
-            if (recipientID == data.OwnerID)
+            if (sp.UUID == part.OwnerID)
            {
-                if (data.CreateSelected)
+                if (part.CreateSelected)
                {
                    // Only send this flag once, then unset it
                    flags |= PrimFlags.CreateSelected;
-                    data.CreateSelected = false;
+                    part.CreateSelected = false;
                }
            }
@@ -5513,21 +5960,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #endregion PrimFlags
-            if (data.Sound != UUID.Zero)
+            if (part.Sound != UUID.Zero)
            {
-                update.Sound = data.Sound;
+                update.Sound = part.Sound;
-                update.OwnerID = data.OwnerID;
+                update.OwnerID = part.OwnerID;
-                update.Gain = (float)data.SoundGain;
+                update.Gain = (float)part.SoundGain;
-                update.Radius = (float)data.SoundRadius;
+                update.Radius = (float)part.SoundRadius;
-                update.Flags = data.SoundFlags;
+                update.Flags = part.SoundFlags;
            }
-            switch ((PCode)data.Shape.PCode)
+            switch ((PCode)part.Shape.PCode)
            {
                case PCode.Grass:
                case PCode.Tree:
                case PCode.NewTree:
-                    update.Data = new byte[] { data.Shape.State };
+                    update.Data = new byte[] { part.Shape.State };
                    break;
                default:
                    update.Data = Utils.EmptyBytes;
@@ -5556,14 +6003,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(packet, ThrottleOutPacketType.Task);
        }
-        public ulong GetGroupPowers(UUID groupID)
+        public Dictionary<UUID, ulong> GetGroupPowers()
        {
-            if (groupID == ActiveGroupId)
+            lock(m_groupPowers)
-                return ActiveGroupPowers;
+            {
+                return new Dictionary<UUID, ulong>(m_groupPowers);
+            }
+        }
-            if (m_groupPowers.ContainsKey(groupID))
+        public void SetGroupPowers(Dictionary<UUID, ulong> powers)
-                return m_groupPowers[groupID];
+        {
+            lock(m_groupPowers)
+            {
+                m_groupPowers.Clear();
+                m_groupPowers = powers;
+            }
+        }
+        public ulong GetGroupPowers(UUID groupID)
+        {
+            lock(m_groupPowers)
+            {
+                if (m_groupPowers.ContainsKey(groupID))
+                    return m_groupPowers[groupID];
+            }
            return 0;
        }
@@ -5579,18 +6042,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs
            // for each AgentUpdate packet.
            AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false);
-            
            AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false);
+            AddLocalPacketHandler(PacketType.VelocityInterpolateOff, HandleVelocityInterpolateOff, false);
+            AddLocalPacketHandler(PacketType.VelocityInterpolateOn, HandleVelocityInterpolateOn, false);
            AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false);
            AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false);
            AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false);
            AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest, false);
            AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest);
            AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest);
-            AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage, true, true);
+            AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage);
-            AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest, true, true);
+            AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest);
            AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer);
-            AddLocalPacketHandler(PacketType.AvatarPropertiesUpdate, HandlerAvatarPropertiesUpdate, true, true);
+            AddLocalPacketHandler(PacketType.AvatarPropertiesUpdate, HandlerAvatarPropertiesUpdate);
            AddLocalPacketHandler(PacketType.ScriptDialogReply, HandlerScriptDialogReply);
            AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage);
            AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
@@ -5598,6 +6063,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship);
            AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
            AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
+            AddLocalPacketHandler(PacketType.RezRestoreToWorld, HandlerRezRestoreToWorld);
            AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
            AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
            AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest);
@@ -5732,6 +6198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
            AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
            AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
+            AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
            AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
            AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
            AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5775,8 +6242,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.PickDelete, HandlePickDelete);
            AddLocalPacketHandler(PacketType.PickGodDelete, HandlePickGodDelete);
            AddLocalPacketHandler(PacketType.PickInfoUpdate, HandlePickInfoUpdate);
-            AddLocalPacketHandler(PacketType.AvatarNotesUpdate, HandleAvatarNotesUpdate, true, true);
+            AddLocalPacketHandler(PacketType.AvatarNotesUpdate, HandleAvatarNotesUpdate);
-            AddLocalPacketHandler(PacketType.AvatarInterestsUpdate, HandleAvatarInterestsUpdate, true, true);
+            AddLocalPacketHandler(PacketType.AvatarInterestsUpdate, HandleAvatarInterestsUpdate);
            AddLocalPacketHandler(PacketType.GrantUserRights, HandleGrantUserRights);
            AddLocalPacketHandler(PacketType.PlacesQuery, HandlePlacesQuery);
            AddLocalPacketHandler(PacketType.UpdateMuteListEntry, HandleUpdateMuteListEntry);
@@ -5798,7 +6265,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
            AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
            AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
+            AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
+            AddLocalPacketHandler(PacketType.RevokePermissions, HandleRevokePermissions);
            AddGenericPacketHandler("autopilot", HandleAutopilot);
        }
@@ -5809,7 +6277,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Scene/Avatar
        // Threshold for body rotation to be a significant agent update
-        private const float QDELTA = 0.000001f;
+        // use the abs of cos
+        private const float QDELTABody = 1.0f - 0.00005f;
+        private const float QDELTAHead = 1.0f - 0.00005f;
        // Threshold for camera rotation to be a significant agent update
        private const float VDELTA = 0.01f;
@@ -5832,27 +6302,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name='x'></param>
        private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
        {
-            float qdelta1 = 1 - (float)Math.Pow(Quaternion.Dot(x.BodyRotation, m_thisAgentUpdateArgs.BodyRotation), 2);
+            if(
-            //qdelta2 = 1 - (float)Math.Pow(Quaternion.Dot(x.HeadRotation, m_thisAgentUpdateArgs.HeadRotation), 2);
+                (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
+//                || ((x.ControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0 &&
-            bool movementSignificant =
+//                    (x.ControlFlags & 0x3f8dfff) != 0) // we need to rotate the av on fly
-                (qdelta1 > QDELTA)                                          // significant if body rotation above threshold
+                || x.ControlFlags != (byte)AgentManager.ControlFlags.NONE// actually all movement controls need to pass
-                // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
-                // || (qdelta2 > QDELTA * 10)                               // significant if head rotation above threshold
-                || (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
-                || (x.ControlFlags != (byte)AgentManager.ControlFlags.NONE) // significant if user supplying any movement update commands
-                || (x.Far != m_thisAgentUpdateArgs.Far)                     // significant if far distance changed
                || (x.Flags != m_thisAgentUpdateArgs.Flags)                 // significant if Flags changed
                || (x.State != m_thisAgentUpdateArgs.State)                 // significant if Stats changed
-            ;
+                || (Math.Abs(x.Far - m_thisAgentUpdateArgs.Far) >= 32)      // significant if far distance changed
-            //if (movementSignificant)
+                )
-            //{
+                return true;
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
-                //    qdelta1, qdelta2);
+           float qdelta1 = Math.Abs(Quaternion.Dot(x.BodyRotation, m_thisAgentUpdateArgs.BodyRotation));
-                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
+           //qdelta2 = Math.Abs(Quaternion.Dot(x.HeadRotation, m_thisAgentUpdateArgs.HeadRotation));
-                //    x.ControlFlags, x.Flags, x.Far, x.State);
-            //}
+           if(
-            return movementSignificant;
+                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
+                )
+                return true;
+            return false;
        }
        /// <summary>
@@ -5863,78 +6334,95 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name='x'></param>
        private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
        {
-            float vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            if(Math.Abs(x.CameraCenter.X - m_thisAgentUpdateArgs.CameraCenter.X) > VDELTA ||
-            float vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+               Math.Abs(x.CameraCenter.Y - m_thisAgentUpdateArgs.CameraCenter.Y) > VDELTA ||
-            float vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+               Math.Abs(x.CameraCenter.Z - m_thisAgentUpdateArgs.CameraCenter.Z) > VDELTA ||
-            float vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
-            bool cameraSignificant =
+               Math.Abs(x.CameraAtAxis.X - m_thisAgentUpdateArgs.CameraAtAxis.X) > VDELTA ||
-                (vdelta1 > VDELTA) ||
+               Math.Abs(x.CameraAtAxis.Y - m_thisAgentUpdateArgs.CameraAtAxis.Y) > VDELTA ||
-                (vdelta2 > VDELTA) ||
+//               Math.Abs(x.CameraAtAxis.Z - m_thisAgentUpdateArgs.CameraAtAxis.Z) > VDELTA ||
-                (vdelta3 > VDELTA) ||
-                (vdelta4 > VDELTA)
-            ;
-            //if (cameraSignificant)
+               Math.Abs(x.CameraLeftAxis.X - m_thisAgentUpdateArgs.CameraLeftAxis.X) > VDELTA ||
-            //{
+               Math.Abs(x.CameraLeftAxis.Y - m_thisAgentUpdateArgs.CameraLeftAxis.Y) > VDELTA ||
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+//               Math.Abs(x.CameraLeftAxis.Z - m_thisAgentUpdateArgs.CameraLeftAxis.Z) > VDELTA ||
-                //    x.CameraAtAxis, x.CameraCenter);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
-                //    x.CameraLeftAxis, x.CameraUpAxis);
-            //}
-            return cameraSignificant;
+               Math.Abs(x.CameraUpAxis.X - m_thisAgentUpdateArgs.CameraUpAxis.X) > VDELTA ||
-        }
+               Math.Abs(x.CameraUpAxis.Y - m_thisAgentUpdateArgs.CameraUpAxis.Y) > VDELTA
+//               Math.Abs(x.CameraLeftAxis.Z - m_thisAgentUpdateArgs.CameraLeftAxis.Z) > VDELTA ||
+            )
+                return true;
-        private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
+            return false;
-        {            
+        }
-            // We got here, which means that something in agent update was significant
+        private bool HandleAgentUpdate(IClientAPI sender, Packet packet)
+        {
            AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
            AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
            if (x.AgentID != AgentId || x.SessionID != SessionId)
+            {
+                PacketPool.Instance.ReturnPacket(packet);
                return false;
+            }
+            uint seq = packet.Header.Sequence;
+            TotalAgentUpdates++;
+            // dont let ignored updates pollute this throttles
+            if(SceneAgent == null || SceneAgent.IsChildAgent ||
+                    SceneAgent.IsInTransit || seq <= m_thisAgentUpdateArgs.lastpacketSequence )
+            {
+                // throttle reset is done at MoveAgentIntoRegion()
+                // called by scenepresence on completemovement
+                PacketPool.Instance.ReturnPacket(packet);
+                return true;
+            }
+            m_thisAgentUpdateArgs.lastpacketSequence = seq;
-            // Before we update the current m_thisAgentUpdateArgs, let's check this again
-            // to see what exactly changed
            bool movement = CheckAgentMovementUpdateSignificance(x);
            bool camera = CheckAgentCameraUpdateSignificance(x);
-            m_thisAgentUpdateArgs.AgentID = x.AgentID;
-            m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
-            m_thisAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
-            m_thisAgentUpdateArgs.CameraCenter = x.CameraCenter;
-            m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
-            m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
-            m_thisAgentUpdateArgs.ControlFlags = x.ControlFlags;
-            m_thisAgentUpdateArgs.Far = x.Far;
-            m_thisAgentUpdateArgs.Flags = x.Flags;
-            m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation;
-            m_thisAgentUpdateArgs.SessionID = x.SessionID;
-            m_thisAgentUpdateArgs.State = x.State;
-            UpdateAgent handlerAgentUpdate = OnAgentUpdate;
-            UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
-            UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate;
            // Was there a significant movement/state change?
            if (movement)
            {
+                m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
+                m_thisAgentUpdateArgs.ControlFlags = x.ControlFlags;
+                m_thisAgentUpdateArgs.Far = x.Far;
+                m_thisAgentUpdateArgs.Flags = x.Flags;
+                m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation;
+                m_thisAgentUpdateArgs.State = x.State;
+                m_thisAgentUpdateArgs.NeedsCameraCollision = !camera;
+                UpdateAgent handlerAgentUpdate = OnAgentUpdate;
+                UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
                if (handlerPreAgentUpdate != null)
                    OnPreAgentUpdate(this, m_thisAgentUpdateArgs);
                if (handlerAgentUpdate != null)
                    OnAgentUpdate(this, m_thisAgentUpdateArgs);
            }
            // Was there a significant camera(s) change?
            if (camera)
+            {
+                m_thisAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
+                m_thisAgentUpdateArgs.CameraCenter = x.CameraCenter;
+                m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
+                m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
+                m_thisAgentUpdateArgs.NeedsCameraCollision = true;
+                UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate;
                if (handlerAgentCameraUpdate != null)
                    handlerAgentCameraUpdate(this, m_thisAgentUpdateArgs);
-            handlerAgentUpdate = null;
+            }
-            handlerPreAgentUpdate = null;
-            handlerAgentCameraUpdate = null;
            PacketPool.Instance.ReturnPacket(packet);
@@ -5967,6 +6455,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ParcelGodMarkAsContentPacket ParcelGodMarkAsContent =
                (ParcelGodMarkAsContentPacket)Packet;
+            if(SessionId != ParcelGodMarkAsContent.AgentData.SessionID || AgentId != ParcelGodMarkAsContent.AgentData.AgentID)
+                return false;
            ParcelGodMark ParcelGodMarkAsContentHandler = OnParcelGodMark;
            if (ParcelGodMarkAsContentHandler != null)
            {
@@ -5982,6 +6473,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet;
+            if(SessionId != FreezeUser.AgentData.SessionID || AgentId != FreezeUser.AgentData.AgentID)
+                return false;
            FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUser;
            if (FreezeUserHandler != null)
            {
@@ -5999,6 +6493,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            EjectUserPacket EjectUser =
                (EjectUserPacket)Packet;
+            if(SessionId != EjectUser.AgentData.SessionID || AgentId != EjectUser.AgentData.AgentID)
+                return false;
            EjectUserUpdate EjectUserHandler = OnParcelEjectUser;
            if (EjectUserHandler != null)
            {
@@ -6016,6 +6513,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ParcelBuyPassPacket ParcelBuyPass =
                (ParcelBuyPassPacket)Packet;
+            if(SessionId != ParcelBuyPass.AgentData.SessionID || AgentId != ParcelBuyPass.AgentData.AgentID)
+                return false;
            ParcelBuyPass ParcelBuyPassHandler = OnParcelBuyPass;
            if (ParcelBuyPassHandler != null)
            {
@@ -6048,8 +6548,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack)
        {
-            UUIDGroupNameRequestPacket upack = (UUIDGroupNameRequestPacket)Pack;
+            ScenePresence sp = (ScenePresence)SceneAgent;
+            if(sp == null || sp.IsDeleted || (sp.IsInTransit && !sp.IsInLocalTransit))
+                return true;
+            UUIDGroupNameRequestPacket upack = (UUIDGroupNameRequestPacket)Pack;
            for (int i = 0; i < upack.UUIDNameBlock.Length; i++)
            {
@@ -6101,7 +6604,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                }
            }
-            
            //m_log.Debug("[LLCLIENTVIEW]: Not handling GenericMessage with method-type of: " + method);
            return false;
        }
@@ -6150,6 +6653,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
+        private bool HandleVelocityInterpolateOff(IClientAPI sender, Packet Pack)
+        {
+            VelocityInterpolateOffPacket p = (VelocityInterpolateOffPacket)Pack;
+            if (p.AgentData.SessionID != SessionId ||
+                p.AgentData.AgentID != AgentId)
+                return true;
+            m_VelocityInterpolate = false;
+            return true;
+        }
+        private bool HandleVelocityInterpolateOn(IClientAPI sender, Packet Pack)
+        {
+            VelocityInterpolateOnPacket p = (VelocityInterpolateOnPacket)Pack;
+            if (p.AgentData.SessionID != SessionId ||
+                p.AgentData.AgentID != AgentId)
+                return true;
+            m_VelocityInterpolate = true;
+            return true;
+        }
        private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack)
        {
            AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
@@ -6442,11 +6968,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            RezObject handlerRezObject = OnRezObject;
            if (handlerRezObject != null)
            {
-                handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
+                UUID rezGroupID = rezPacket.AgentData.GroupID;
-                                 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
+                if(!IsGroupMember(rezGroupID))
-                                 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
+                    rezGroupID = UUID.Zero;
-                                 rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem,
+                handlerRezObject(this, rezPacket.InventoryData.ItemID, rezGroupID, rezPacket.RezData.RayEnd,
-                                 rezPacket.RezData.FromTaskID);
+                                rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
+                                rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
+                                rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem,
+                                rezPacket.RezData.FromTaskID);
            }
            return true;
        }
@@ -6485,6 +7014,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
+        private bool HandlerRezRestoreToWorld(IClientAPI sender, Packet Pack)
+        {
+            RezRestoreToWorldPacket restore = (RezRestoreToWorldPacket)Pack;
+            #region Packet Session and User Check
+            if (m_checkPackets)
+            {
+                if (restore.AgentData.SessionID != SessionId ||
+                    restore.AgentData.AgentID != AgentId)
+                    return true;
+            }
+            #endregion
+            RezRestoreToWorld handlerRezRestoreToWorld = OnRezRestoreToWorld;
+            if (handlerRezRestoreToWorld != null)
+                handlerRezRestoreToWorld(this, restore.InventoryData.ItemID);
+            return true;
+        }
        private bool HandlerModifyLand(IClientAPI sender, Packet Pack)
        {
            ModifyLandPacket modify = (ModifyLandPacket)Pack;
@@ -6501,9 +7050,8 @@ 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.
-                m_justEditedTerrain = true; // Prevent terrain packet (Land layer) from being queued, make it unreliable
                if (OnModifyTerrain != null)
                {
                    for (int i = 0; i < modify.ParcelData.Length; i++)
@@ -6519,7 +7067,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        }
                    }
                }
-                m_justEditedTerrain = false; // Queue terrain packet (Land layer) if necessary, make it reliable again
            }
            return true;
@@ -6580,7 +7127,7 @@ 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)
@@ -6588,7 +7135,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    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)};
+                        cacheitems[i] = new WearableCacheItem(){
+                            CacheId = appear.WearableData[i].CacheID,
+                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)
+                        };
@@ -6794,13 +7344,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
-        private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack)
+      private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack)
        {
+            m_log.DebugFormat("[LLClientView] HandleCompleteAgentMovement");
            Action<IClientAPI, bool> handlerCompleteMovementToRegion = OnCompleteMovementToRegion;
            if (handlerCompleteMovementToRegion != null)
            {
                handlerCompleteMovementToRegion(sender, true);
            }
+            else
+                m_log.Debug("HandleCompleteAgentMovement NULL handler");
            handlerCompleteMovementToRegion = null;
            return true;
@@ -6818,7 +7373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
            }
            #endregion
+/*
            StartAnim handlerStartAnim = null;
            StopAnim handlerStopAnim = null;
@@ -6842,6 +7397,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                }
            }
            return true;
+*/
+            ChangeAnim handlerChangeAnim = null;
+            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+            {
+                handlerChangeAnim = OnChangeAnim;
+                if (handlerChangeAnim != null)
+                {
+                    handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
+                }
+            }
+            handlerChangeAnim = OnChangeAnim;
+            if (handlerChangeAnim != null)
+            {
+                handlerChangeAnim(UUID.Zero, false, true);
+            }
+            return true;
        }
        private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -6997,7 +7571,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                SendUserInfoReply(false, true, "");
            }
            return true;
        }
        private bool HandleUpdateUserInfo(IClientAPI sender, Packet Pack)
@@ -7087,6 +7660,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #endregion
            m_udpClient.SetThrottles(atpack.Throttle.Throttles);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
            return true;
        }
@@ -7207,7 +7785,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                AddNewPrim handlerAddPrim = OnAddPrim;
                if (handlerAddPrim != null)
-                    handlerAddPrim(AgentId, ActiveGroupId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection);
+                    handlerAddPrim(AgentId, addPacket.AgentData.GroupID, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection);
            }
            return true;
        }
@@ -7302,14 +7880,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ObjectDuplicate handlerObjectDuplicate = null;
-            for (int i = 0; i < dupe.ObjectData.Length; i++)
+            handlerObjectDuplicate = OnObjectDuplicate;
+            if (handlerObjectDuplicate != null)
            {
-                handlerObjectDuplicate = OnObjectDuplicate;
+                for (int i = 0; i < dupe.ObjectData.Length; i++)
-                if (handlerObjectDuplicate != null)
                {
+                    UUID rezGroupID = dupe.AgentData.GroupID;
+                    if(!IsGroupMember(rezGroupID))
+                        rezGroupID = UUID.Zero;
                    handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset,
                                           dupe.SharedData.DuplicateFlags, AgentId,
-                                           ActiveGroupId);
+                                           rezGroupID);
                }
            }
@@ -7354,16 +7935,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
            }
            #endregion
+            List<uint> thisSelection = new List<uint>();
            ObjectSelect handlerObjectSelect = null;
+            uint objID;
-            for (int i = 0; i < incomingselect.ObjectData.Length; i++)
+            handlerObjectSelect = OnObjectSelect;
+            if (handlerObjectSelect != null)
            {
-                handlerObjectSelect = OnObjectSelect;
+                for (int i = 0; i < incomingselect.ObjectData.Length; i++)
-                if (handlerObjectSelect != null)
                {
-                    handlerObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
+                    objID = incomingselect.ObjectData[i].ObjectLocalID;
+                    thisSelection.Add(objID);
                }
+                handlerObjectSelect(thisSelection, this);
            }
            return true;
        }
@@ -7382,13 +7966,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #endregion
            ObjectDeselect handlerObjectDeselect = null;
+            uint objID;
            for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
            {
+                objID = incomingdeselect.ObjectData[i].ObjectLocalID;
                handlerObjectDeselect = OnObjectDeselect;
                if (handlerObjectDeselect != null)
                {
-                    OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);
+                   OnObjectDeselect(objID, this);
                }
            }
            return true;
@@ -7511,7 +8097,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);
@@ -7519,19 +8105,41 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
+        Dictionary<uint, uint> objImageSeqs = null;
+        double lastobjImageSeqsMS = 0.0;
        private bool HandleObjectImage(IClientAPI sender, Packet Pack)
        {
            ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
-            UpdatePrimTexture handlerUpdatePrimTexture = null;
+            UpdatePrimTexture handlerUpdatePrimTexture = OnUpdatePrimTexture;
+            if (handlerUpdatePrimTexture == null)
+                return true;
+            double now = Util.GetTimeStampMS();
+            if(objImageSeqs == null || ( now - lastobjImageSeqsMS > 30000.0))
+            {
+                objImageSeqs = null; // yeah i know superstition...
+                objImageSeqs = new Dictionary<uint, uint>(16);
+            }
+            lastobjImageSeqsMS = now;
+            uint seq = Pack.Header.Sequence;
+            uint id;
+            uint lastseq;
+            ObjectImagePacket.ObjectDataBlock o;
            for (int i = 0; i < imagePack.ObjectData.Length; i++)
            {
-                handlerUpdatePrimTexture = OnUpdatePrimTexture;
+                    o = imagePack.ObjectData[i];
-                if (handlerUpdatePrimTexture != null)
+                    id = o.ObjectLocalID;
-                {
+                    if(objImageSeqs.TryGetValue(id, out lastseq))
-                    handlerUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID,
+                    {
-                                             imagePack.ObjectData[i].TextureEntry, this);
+                        if(seq <= lastseq)
-                }
+                            continue;
+                    }
+                    objImageSeqs[id] = seq;
+                    handlerUpdatePrimTexture(id, o.TextureEntry, this);
            }
            return true;
        }
@@ -7605,6 +8213,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        touchArgs.Add(arg);
                    }
                }
                handlerGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial,
                                  grabUpdate.ObjectData.GrabPosition, this, touchArgs);
            }
@@ -7921,10 +8530,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                handlerObjectDuplicateOnRay = OnObjectDuplicateOnRay;
                if (handlerObjectDuplicateOnRay != null)
                {
-                    handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags,
-                                                AgentId, ActiveGroupId, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
+                    UUID rezGroupID = dupeOnRay.AgentData.GroupID;
-                                                dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection,
+                    if(!IsGroupMember(rezGroupID))
-                                                dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
+                        rezGroupID = UUID.Zero;
+                    handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID,
+                                    dupeOnRay.AgentData.DuplicateFlags, AgentId, rezGroupID,
+                                    dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
+                                    dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast,
+                                    dupeOnRay.AgentData.RayEndIsIntersection,
+                                    dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
                }
            }
@@ -9106,7 +9722,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if ((locX >= m_scene.RegionInfo.WorldLocX)
                            && (locX < (m_scene.RegionInfo.WorldLocX + m_scene.RegionInfo.RegionSizeX))
                            && (locY >= m_scene.RegionInfo.WorldLocY)
-                            && (locY < (m_scene.RegionInfo.WorldLocY + m_scene.RegionInfo.RegionSizeY)) )
+                            && (locY < (m_scene.RegionInfo.WorldLocY + m_scene.RegionInfo.RegionSizeY)))
                {
                    tpLocReq.Info.RegionHandle = m_scene.RegionInfo.RegionHandle;
                    tpLocReq.Info.Position.X += locX - m_scene.RegionInfo.WorldLocX;
@@ -9131,6 +9747,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool HandleUUIDNameRequest(IClientAPI sender, Packet Pack)
        {
+            ScenePresence sp = (ScenePresence)SceneAgent;
+            if(sp == null || sp.IsDeleted || (sp.IsInTransit && !sp.IsInLocalTransit))
+                return true;
            UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
            foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
@@ -9148,13 +9768,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack)
        {
-            RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
            RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest;
            if (handlerRegionHandleRequest != null)
            {
+                RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
                handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID);
            }
            return true;
        }
@@ -9730,6 +10351,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)));
                    }
@@ -9765,7 +10387,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);
@@ -9907,7 +10529,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
                case "kickestate":
-                   
                    if(((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                    {
                        UUID invoice = messagePacket.MethodData.Invoice;
@@ -9986,6 +10608,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;
@@ -9995,7 +10622,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;
@@ -10006,6 +10633,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)
            {
@@ -10039,6 +10670,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)
            {
@@ -10055,6 +10690,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)
            {
@@ -10068,30 +10708,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
@@ -10410,9 +11036,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else
            {
-                SendUseCachedMuteList();
+                 if(muteListRequest.MuteData.MuteCRC == 0)
+                    SendEmpytMuteList();
+                else
+                    SendUseCachedMuteList();
            }
-            return true;
+            return true;           
        }
        private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet)
@@ -10425,7 +11054,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
                                           Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
                                           UpdateMuteListEntry.MuteData.MuteType,
-                                           UpdateMuteListEntry.AgentData.AgentID);
+                                           UpdateMuteListEntry.MuteData.MuteFlags);
                return true;
            }
            return false;
@@ -10440,8 +11069,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                handlerRemoveMuteListEntry(this,
                                           RemoveMuteListEntry.MuteData.MuteID,
-                                           Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName),
+                                           Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
-                                           RemoveMuteListEntry.AgentData.AgentID);
                return true;
            }
            return false;
@@ -10485,16 +11113,62 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return false;
        }
+        private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
+        {
+            ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
+                (ChangeInventoryItemFlagsPacket)packet;
+            ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
+            if (handlerChangeInventoryItemFlags != null)
+            {
+                foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
+                    handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
+                return true;
+            }
+            return false;
+        }
        private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
        {
            return true;
        }
+        private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
+        {
+            CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
+            #region Packet Session and User Check
+            if (m_checkPackets)
+            {
+                if (packet.AgentData.SessionID != SessionId ||
+                    packet.AgentData.AgentID != AgentId)
+                    return true;
+            }
+            #endregion
+            MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+            foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
+            {
+                InventoryItemBase b = new InventoryItemBase();
+                b.ID = n.OldItemID;
+                b.Folder = n.OldFolderID;
+                items.Add(b);
+            }
+            handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
+            if (handlerMoveItemsAndLeaveCopy != null)
+            {
+                handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
+            }
+            return true;
+        }
        private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
        {
            return true;
        }
        private bool HandleInventoryDescendents(IClientAPI sender, Packet Pack)
        {
            return true;
@@ -10748,7 +11422,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (m_GroupsModule != null)
            {
                m_GroupsModule.ActivateGroup(this, activateGroupPacket.AgentData.GroupID);
-                m_GroupsModule.SendAgentGroupDataUpdate(this);
            }
            return true;
@@ -10873,11 +11546,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            return true;
        }
+        UUID lastGroupProfileRequestID = UUID.Zero;
+        double lastGroupProfileRequestTS = Util.GetTimeStampMS();
        private bool HandleGroupProfileRequest(IClientAPI sender, Packet Pack)
        {
+            if(m_GroupsModule == null)
+                return true;
            GroupProfileRequestPacket groupProfileRequest =
                       (GroupProfileRequestPacket)Pack;
            #region Packet Session and User Check
            if (m_checkPackets)
            {
@@ -10887,36 +11568,62 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            #endregion
-            if (m_GroupsModule != null)
+            UUID grpID = groupProfileRequest.GroupData.GroupID;
-            {
+            double ts = Util.GetTimeStampMS();
-                GroupProfileReplyPacket groupProfileReply = (GroupProfileReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupProfileReply);
+            if(grpID == lastGroupProfileRequestID && ts - lastGroupProfileRequestTS < 10000)
+                return true;
-                groupProfileReply.AgentData = new GroupProfileReplyPacket.AgentDataBlock();
+            lastGroupProfileRequestID = grpID;
-                groupProfileReply.GroupData = new GroupProfileReplyPacket.GroupDataBlock();
+            lastGroupProfileRequestTS = ts;
-                groupProfileReply.AgentData.AgentID = AgentId;
-                GroupProfileData d = m_GroupsModule.GroupProfileRequest(this,
+            GroupProfileReplyPacket groupProfileReply = (GroupProfileReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupProfileReply);
-                                                                        groupProfileRequest.GroupData.GroupID);
-                groupProfileReply.GroupData.GroupID = d.GroupID;
+            groupProfileReply.AgentData = new GroupProfileReplyPacket.AgentDataBlock();
-                groupProfileReply.GroupData.Name = Util.StringToBytes256(d.Name);
+            groupProfileReply.GroupData = new GroupProfileReplyPacket.GroupDataBlock();
-                groupProfileReply.GroupData.Charter = Util.StringToBytes1024(d.Charter);
+            groupProfileReply.AgentData.AgentID = AgentId;
-                groupProfileReply.GroupData.ShowInList = d.ShowInList;
-                groupProfileReply.GroupData.MemberTitle = Util.StringToBytes256(d.MemberTitle);
-                groupProfileReply.GroupData.PowersMask = d.PowersMask;
-                groupProfileReply.GroupData.InsigniaID = d.InsigniaID;
-                groupProfileReply.GroupData.FounderID = d.FounderID;
-                groupProfileReply.GroupData.MembershipFee = d.MembershipFee;
-                groupProfileReply.GroupData.OpenEnrollment = d.OpenEnrollment;
-                groupProfileReply.GroupData.Money = d.Money;
-                groupProfileReply.GroupData.GroupMembershipCount = d.GroupMembershipCount;
-                groupProfileReply.GroupData.GroupRolesCount = d.GroupRolesCount;
-                groupProfileReply.GroupData.AllowPublish = d.AllowPublish;
-                groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
-                groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
-                OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
+            GroupProfileData d = m_GroupsModule.GroupProfileRequest(this,
+                                                                    groupProfileRequest.GroupData.GroupID);
+            if(d.GroupID == UUID.Zero) // don't send broken data
+                return true;
+            groupProfileReply.GroupData.GroupID = d.GroupID;
+            groupProfileReply.GroupData.Name = Util.StringToBytes256(d.Name);
+            groupProfileReply.GroupData.Charter = Util.StringToBytes1024(d.Charter);
+            groupProfileReply.GroupData.ShowInList = d.ShowInList;
+            groupProfileReply.GroupData.MemberTitle = Util.StringToBytes256(d.MemberTitle);
+            groupProfileReply.GroupData.PowersMask = d.PowersMask;
+            groupProfileReply.GroupData.InsigniaID = d.InsigniaID;
+            groupProfileReply.GroupData.FounderID = d.FounderID;
+            groupProfileReply.GroupData.MembershipFee = d.MembershipFee;
+            groupProfileReply.GroupData.OpenEnrollment = d.OpenEnrollment;
+            groupProfileReply.GroupData.Money = d.Money;
+            groupProfileReply.GroupData.GroupMembershipCount = d.GroupMembershipCount;
+            groupProfileReply.GroupData.GroupRolesCount = d.GroupRolesCount;
+            groupProfileReply.GroupData.AllowPublish = d.AllowPublish;
+            groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
+            groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
+            Scene scene = (Scene)m_scene;
+            if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
+            {
+                ScenePresence p;
+                if (scene.TryGetScenePresence(sender.AgentId, out p))
+                {
+                    if (p.IsViewerUIGod)
+                    {
+                        groupProfileReply.GroupData.OpenEnrollment = true;
+                        groupProfileReply.GroupData.MembershipFee = 0;
+                    }
+                }
            }
+            OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
+            if(grpID == lastGroupProfileRequestID)
+                lastGroupProfileRequestTS = Util.GetTimeStampMS() - 7000;
            return true;
        }
        private bool HandleGroupMembersRequest(IClientAPI sender, Packet Pack)
@@ -10939,12 +11646,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    m_GroupsModule.GroupMembersRequest(this, groupMembersRequestPacket.GroupData.GroupID);
                int memberCount = members.Count;
+                int indx = 0;
-                while (true)
+                while (indx < memberCount)
                {
-                    int blockCount = members.Count;
+                    int blockCount = memberCount - indx;
-                    if (blockCount > 40)
+                    if (blockCount > 25)
-                        blockCount = 40;
+                        blockCount = 25;
                    GroupMembersReplyPacket groupMembersReply = (GroupMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupMembersReply);
@@ -10965,8 +11672,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    for (int i = 0; i < blockCount; i++)
                    {
-                        GroupMembersData m = members[0];
+                        GroupMembersData m = members[indx++];
-                        members.RemoveAt(0);
                        groupMembersReply.MemberData[i] =
                            new GroupMembersReplyPacket.MemberDataBlock();
@@ -10984,8 +11690,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            m.IsOwner;
                    }
                    OutPacket(groupMembersReply, ThrottleOutPacketType.Task);
-                    if (members.Count == 0)
-                        return true;
                }
            }
            return true;
@@ -11488,11 +12192,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            StartLure handlerStartLure = OnStartLure;
            if (handlerStartLure != null)
-                handlerStartLure(startLureRequest.Info.LureType,
+            {
-                                 Utils.BytesToString(
+                for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
-                                    startLureRequest.Info.Message),
+                {
-                                 startLureRequest.TargetData[0].TargetID,
+                    handlerStartLure(startLureRequest.Info.LureType,
-                                 this);
+                                     Utils.BytesToString(
+                                             startLureRequest.Info.Message),
+                                     startLureRequest.TargetData[i].TargetID,
+                                     this);
+                }
+            }
            return true;
        }
        private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -11606,10 +12315,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            #endregion
-            ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
+            ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
            if (handlerClassifiedGodDelete != null)
                handlerClassifiedGodDelete(
                         classifiedGodDelete.Data.ClassifiedID,
+                         classifiedGodDelete.Data.QueryID,
                         this);
            return true;
        }
@@ -11833,6 +12543,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
+        private bool HandleRevokePermissions(IClientAPI sender, Packet Pack)
+        {
+            RevokePermissionsPacket pkt = (RevokePermissionsPacket)Pack;
+            if (pkt.AgentData.SessionID != SessionId ||
+                    pkt .AgentData.AgentID != AgentId)
+                return true;
+            // don't use multidelegate "event"
+            ScenePresence sp = (ScenePresence)SceneAgent;
+            if(sp != null && !sp.IsDeleted && !sp.IsInTransit)
+            {
+                UUID objectID = pkt.Data.ObjectID;
+                uint permissions = pkt.Data.ObjectPermissions;
+                sp.HandleRevokePermissions(objectID , permissions);
+            }
+            return true;
+        }
        private bool HandlePlacesQuery(IClientAPI sender, Packet Pack)
        {
            PlacesQueryPacket placesQueryPacket =
@@ -11865,7 +12593,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);
        }
@@ -11912,86 +12640,52 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="simclient"></param>
        /// <param name="packet"></param>
        /// <returns></returns>
        protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
        {
+            //m_log.Debug("texture cached: " + packet.ToString());
            AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
            if (cachedtex.AgentData.SessionID != SessionId)
                return false;
            // TODO: don't create new blocks if recycling an old packet
            cachedresp.AgentData.AgentID = AgentId;
            cachedresp.AgentData.SessionID = m_sessionId;
-            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
+            cachedresp.AgentData.SerialNum = cachedtex.AgentData.SerialNum;
-            m_cachedTextureSerial++;
            cachedresp.WearableData =
                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
-            int maxWearablesLoop = cachedtex.WearableData.Length;
+            int cacheHits = 0;
-            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
-                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
-            // Find the cached baked textures for this user, if they're available
+            // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
-            IAssetService cache = m_scene.AssetService;
-            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            
            WearableCacheItem[] cacheItems = null;
-            if (bakedTextureModule != null && cache != null)
+            ScenePresence p = m_scene.GetScenePresence(AgentId);
-            {
-                ScenePresence p = m_scene.GetScenePresence(AgentId);
-                if (p.Appearance != null)
-                {
-                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
-                    {
-                        try
-                        {
-                            cacheItems = bakedTextureModule.Get(AgentId);
-                            p.Appearance.WearableCacheItems = cacheItems;
-                            p.Appearance.WearableCacheItemsDirty = false;
-                        }
-                        catch (Exception)
-                        {
-                            cacheItems = null;
-                        }
-                    }
+            if (p != null && p.Appearance != null)
-                    else if (p.Appearance.WearableCacheItems != null)
+            {
-                    {
+                cacheItems = p.Appearance.WearableCacheItems;
-                        cacheItems = p.Appearance.WearableCacheItems;
-                    }
-                }
            }
+            int maxWearablesLoop = cachedtex.WearableData.Length;
            if (cacheItems != null)
            {
-                // We need to make sure the asset stored in the bake is available on this server also by its assetid before we map it to a Cacheid.
+                if (maxWearablesLoop > cacheItems.Length)
-                // Copy the baked textures to the sim's assets cache (local only).
+                    maxWearablesLoop = cacheItems.Length;
-                foreach (WearableCacheItem item in cacheItems)
-                {
-                    if (cache.GetCached(item.TextureID.ToString()) == null)
-                    {
-                        item.TextureAsset.Temporary = true;
-                        item.TextureAsset.Local = true;
-                        cache.Store(item.TextureAsset);
-                    }
-                }
-                // Return the cached textures
                for (int i = 0; i < maxWearablesLoop; i++)
                {
-                    WearableCacheItem item =
+                    int idx = cachedtex.WearableData[i].TextureIndex;
-                        WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex, cacheItems);
                    cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                    cachedresp.WearableData[i].HostName = new byte[0];
-                    if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+                    if (cachedtex.WearableData[i].ID == cacheItems[idx].CacheId)
                    {
-                        cachedresp.WearableData[i].TextureID = item.TextureID;
+                        cachedresp.WearableData[i].TextureID = cacheItems[idx].TextureID;
+                        cacheHits++;
                    }
                    else
                    {
@@ -12001,7 +12695,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else
            {
-                // Cached textures not available
                for (int i = 0; i < maxWearablesLoop; i++)
                {
                    cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
@@ -12010,13 +12703,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    cachedresp.WearableData[i].HostName = new byte[0];
                }
            }
-            
+            //m_log.DebugFormat("texture cached: hits {0}", cacheHits);
            cachedresp.Header.Zerocoded = true;
            OutPacket(cachedresp, ThrottleOutPacketType.Task);
            return true;
        }
-        
        /// <summary>
        /// Send a response back to a client when it asks the asset server (via the region server) if it has
        /// its appearance texture cached.
@@ -12080,209 +12775,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                    else
                    {
-//                        m_log.DebugFormat(
+                        ClientChangeObject updatehandler = onClientChangeObject;
-//                            "[CLIENT]: Processing block {0} type {1} for {2} {3}",
-//                            i, block.Type, part.Name, part.LocalId);
-//                        // Do this once since fetch parts creates a new array.
+                        if (updatehandler != null)
-//                        SceneObjectPart[] parts = part.ParentGroup.Parts;
+                        {
-//                        for (int j = 0; j < parts.Length; j++)
+                            ObjectChangeData udata = new ObjectChangeData();
-//                        {
-//                            part.StoreUndoState();
-//                            parts[j].IgnoreUndoUpdate = true;
-//                        }
-                        UpdatePrimGroupRotation handlerUpdatePrimGroupRotation;
+                            /*ubit from ll JIRA:
+                             * 0x01 position
+                             * 0x02 rotation
+                             * 0x04 scale
-                        switch (block.Type)
+                             * 0x08 LINK_SET
-                        {
+                             * 0x10 UNIFORM for scale
-                            case 1:
+                             */
-                                Vector3 pos1 = new Vector3(block.Data, 0);
-                                UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                            // translate to internal changes
-                                if (handlerUpdatePrimSinglePosition != null)
+                            // not all cases .. just the ones older code did
-                                {
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                    handlerUpdatePrimSinglePosition(localId, pos1, this);
-                                }
-                                break;
-                            case 2:
+                            switch (block.Type)
-                                Quaternion rot1 = new Quaternion(block.Data, 0, true);
+                            {
+                                case 1: //change position sp
+                                    udata.position = new Vector3(block.Data, 0);
-                                UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
+                                    udata.change = ObjectChangeType.primP;
-                                if (handlerUpdatePrimSingleRotation != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
-                                    handlerUpdatePrimSingleRotation(localId, rot1, this);
-                                }
-                                break;
-                            case 3:
+                                case 2: // rotation sp
-                                Vector3 rotPos = new Vector3(block.Data, 0);
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
-                                Quaternion rot2 = new Quaternion(block.Data, 12, true);
-                                UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition;
+                                    udata.change = ObjectChangeType.primR;
-                                if (handlerUpdatePrimSingleRotationPosition != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
-                                    // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
-                                    handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
-                                }
-                                break;
-                            case 4:
+                                case 3: // position plus rotation
-                            case 20:
+                                    udata.position = new Vector3(block.Data, 0);
-                                Vector3 scale4 = new Vector3(block.Data, 0);
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
-                                UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale;
+                                    udata.change = ObjectChangeType.primPR;
-                                if (handlerUpdatePrimScale != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    //                                     m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
-                                    handlerUpdatePrimScale(localId, scale4, this);
-                                }
-                                break;
-                            case 5:
+                                case 4: // scale sp
-                                Vector3 scale1 = new Vector3(block.Data, 12);
+                                    udata.scale = new Vector3(block.Data, 0);
-                                Vector3 pos11 = new Vector3(block.Data, 0);
+                                    udata.change = ObjectChangeType.primS;
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                    updatehandler(localId, udata, this);
-                                if (handlerUpdatePrimScale != null)
+                                    break;
-                                {
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale1, this);
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                                case 0x14: // uniform scale sp
-                                    if (handlerUpdatePrimSinglePosition != null)
+                                    udata.scale = new Vector3(block.Data, 0);
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos11, this);
-                                    }
-                                }
-                                break;
-                            case 9:
+                                    udata.change = ObjectChangeType.primUS;
-                                Vector3 pos2 = new Vector3(block.Data, 0);
+                                    updatehandler(localId, udata, this);
+                                    break;
-                                UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition;
+                                case 5: // scale and position sp
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
-                                if (handlerUpdateVector != null)
+                                    udata.change = ObjectChangeType.primPS;
-                                {
+                                    updatehandler(localId, udata, this);
-                                    handlerUpdateVector(localId, pos2, this);
+                                    break;
-                                }
-                                break;
-                            case 10:
+                                case 0x15: //uniform scale and position
-                                Quaternion rot3 = new Quaternion(block.Data, 0, true);
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
-                                UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
+                                    udata.change = ObjectChangeType.primPUS;
-                                if (handlerUpdatePrimRotation != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    //  Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
-                                    handlerUpdatePrimRotation(localId, rot3, this);
-                                }
-                                break;
-                            case 11:
+                                // now group related (bit 4)
-                                Vector3 pos3 = new Vector3(block.Data, 0);
+                                case 9: //( 8 + 1 )group position
-                                Quaternion rot4 = new Quaternion(block.Data, 12, true);
+                                    udata.position = new Vector3(block.Data, 0);
-                                handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
+                                    udata.change = ObjectChangeType.groupP;
-                                if (handlerUpdatePrimGroupRotation != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    //  m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                    // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
-                                    handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
-                                }
-                                break;
-                            case 12:
-                            case 28:
-                                Vector3 scale7 = new Vector3(block.Data, 0);
-                                UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
+                                case 0x0A: // (8 + 2) group rotation
-                                if (handlerUpdatePrimGroupScale != null)
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
-                                {
-                                    //                                     m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
-                                    handlerUpdatePrimGroupScale(localId, scale7, this);
-                                }
-                                break;
-                            case 13:
+                                    udata.change = ObjectChangeType.groupR;
-                                Vector3 scale2 = new Vector3(block.Data, 12);
+                                    updatehandler(localId, udata, this);
-                                Vector3 pos4 = new Vector3(block.Data, 0);
+                                    break;
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                case 0x0B: //( 8 + 2 + 1) group rotation and position
-                                if (handlerUpdatePrimScale != null)
+                                    udata.position = new Vector3(block.Data, 0);
-                                {
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
-                                    //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale2, this);
-                                    // Change the position based on scale (for bug number 246)
+                                    udata.change = ObjectChangeType.groupPR;
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                                    updatehandler(localId, udata, this);
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                                    break;
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos4, this);
-                                    }
-                                }
-                                break;
-                            case 29:
+                                case 0x0C: // (8 + 4) group scale
-                                Vector3 scale5 = new Vector3(block.Data, 12);
+                                    // only afects root prim and only sent by viewer editor object tab scaling
-                                Vector3 pos5 = new Vector3(block.Data, 0);
+                                    // mouse edition only allows uniform scaling
+                                    // SL MAY CHANGE THIS in viewers
-                                handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
+                                    udata.scale = new Vector3(block.Data, 0);
-                                if (handlerUpdatePrimGroupScale != null)
-                                {
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    part.StoreUndoState(true);
-                                    part.IgnoreUndoUpdate = true;
-                                    handlerUpdatePrimGroupScale(localId, scale5, this);
-                                    handlerUpdateVector = OnUpdatePrimGroupPosition;
-                                    if (handlerUpdateVector != null)
+                                    udata.change = ObjectChangeType.groupS;
-                                    {
+                                    updatehandler(localId, udata, this);
-                                        handlerUpdateVector(localId, pos5, this);
-                                    }
-                                    part.IgnoreUndoUpdate = false;
+                                    break;
-                                }
-                                break;
+                                case 0x0D: //(8 + 4 + 1) group scale and position
+                                    // exception as above
-                            case 21:
+                                    udata.position = new Vector3(block.Data, 0);
-                                Vector3 scale6 = new Vector3(block.Data, 12);
+                                    udata.scale = new Vector3(block.Data, 12);
-                                Vector3 pos6 = new Vector3(block.Data, 0);
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                    udata.change = ObjectChangeType.groupPS;
-                                if (handlerUpdatePrimScale != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    part.StoreUndoState(false);
-                                    part.IgnoreUndoUpdate = true;
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+                                case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
-                                    handlerUpdatePrimScale(localId, scale6, this);
+                                    udata.scale = new Vector3(block.Data, 0);
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos6, this);
-                                    }
-                                    part.IgnoreUndoUpdate = false;
+                                    udata.change = ObjectChangeType.groupUS;
-                                }
+                                    updatehandler(localId, udata, this);
-                                break;
+                                    break;
-                            default:
+                                case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
-                                m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
+                                    udata.position = new Vector3(block.Data, 0);
-                                break;
+                                    udata.scale = new Vector3(block.Data, 12);
+                                    udata.change = ObjectChangeType.groupPUS;
+                                    updatehandler(localId, udata, this);
+                                    break;
+                                default:
+                                    m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
+                                    break;
+                            }
                        }
-//                        for (int j = 0; j < parts.Length; j++)
-//                            parts[j].IgnoreUndoUpdate = false;
                    }
                }
            }
            return true;
        }
@@ -12342,7 +12975,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="throttles"></param>
        public void SetChildAgentThrottle(byte[] throttles)
        {
-            m_udpClient.SetThrottles(throttles);
+            SetChildAgentThrottle(throttles, 1.0f);
+        }
+        public void SetChildAgentThrottle(byte[] throttles,float factor)
+        {
+            m_udpClient.SetThrottles(throttles, factor);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
+        }
+        /// <summary>
+        /// Sets the throttles from values supplied caller
+        /// </summary>
+        /// <param name="throttles"></param>
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+            m_udpClient.ForceThrottleSetting(throttle,setting);
+        }
+        public int GetAgentThrottleSilent(int throttle)
+        {
+            return m_udpClient.GetThrottleSetting(throttle);
        }
        /// <summary>
@@ -12403,9 +13060,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// provide your own method.</param>
        protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
        {
+/* this is causing packet loss for some reason
+            if(!m_udpClient.IsConnected)
+            {
+                PacketPool.Instance.ReturnPacket(packet);
+                return;
+            }
+*/
            if (m_outPacketsToDrop != null)
+            {
                if (m_outPacketsToDrop.Contains(packet.Type.ToString()))
+                {
+                    PacketPool.Instance.ReturnPacket(packet);
                    return;
+                }
+            }
            if (DebugPacketLevel > 0)
            {
@@ -12424,7 +13094,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;
@@ -12437,7 +13107,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);
        }
@@ -12450,8 +13120,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            uint regionY = 0;
            Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out regionX, out regionY);
-            locx = Convert.ToSingle(args[0]) - (float)regionX;
+            locx = (float)(Convert.ToDouble(args[0]) - (double)regionX);
-            locy = Convert.ToSingle(args[1]) - (float)regionY;
+            locy = (float)(Convert.ToDouble(args[1]) - (double)regionY);
            locz = Convert.ToSingle(args[2]);
            Action<Vector3, bool, bool> handlerAutoPilotGo = OnAutoPilotGo;
@@ -12677,20 +13347,75 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void RefreshGroupMembership()
        {
-            if (m_GroupsModule != null)
+            lock(m_groupPowers)
            {
-                GroupMembershipData[] GroupMembership =
+                GroupMembershipData activeMembership = null;
+                if (m_GroupsModule != null)
+                {
+                    GroupMembershipData[] GroupMembership =
                        m_GroupsModule.GetMembershipData(AgentId);
-                m_groupPowers.Clear();
+                    m_groupPowers.Clear();
-                if (GroupMembership != null)
+                    if (GroupMembership != null)
-                {
+                    {
-                    for (int i = 0; i < GroupMembership.Length; i++)
+                        for (int i = 0; i < GroupMembership.Length; i++)
+                        {
+                            m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
+                        }
+                    }
+                    activeMembership = m_GroupsModule.GetActiveMembershipData(AgentId);
+                    if(activeMembership != null)
                    {
-                        m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
+                        if(!m_groupPowers.ContainsKey(activeMembership.GroupID))
+                            activeMembership = null;
+                        else
+                        {
+                            m_activeGroupID = activeMembership.GroupID;
+                            m_activeGroupName = activeMembership.GroupName;
+                            m_activeGroupPowers = ActiveGroupPowers;
+                        }
                    }
                }
+                if(activeMembership == null)
+                {
+                    m_activeGroupID = UUID.Zero;
+                    m_activeGroupName = "";
+                    m_activeGroupPowers = 0;
+                }
+            }
+        }
+        public void UpdateGroupMembership(GroupMembershipData[] data)
+        {
+            lock(m_groupPowers)
+            {
+                m_groupPowers.Clear();
+                if (data != null)
+                {
+                    for (int i = 0; i < data.Length; i++)
+                        m_groupPowers[data[i].GroupID] = data[i].GroupPowers;
+                }
+            }
+        }
+        public void GroupMembershipRemove(UUID GroupID)
+        {
+            lock(m_groupPowers)
+            {
+                if(m_groupPowers.ContainsKey(GroupID))
+                    m_groupPowers.Remove(GroupID);
+            }
+        }
+        public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
+        {
+            lock(m_groupPowers)
+            {
+                m_groupPowers[GroupID] = GroupPowers;
            }
        }
@@ -12736,7 +13461,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
 //                requestID, taskID, (SourceType)sourceType, Name);
+            //Note, the bool returned from the below function is useless since it is always false.
            m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
        }
        /// <summary>
@@ -12782,7 +13510,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    SendAssetNotFound(req);
                    return;
                }
            }
            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
@@ -12819,7 +13546,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <returns></returns>
        private static int CalculateNumPackets(byte[] data)
        {
-            const uint m_maxPacketSize = 600;
+//            const uint m_maxPacketSize = 600;
+            uint m_maxPacketSize = MaxTransferBytesPerPacket;
            int numPackets = 1;
            if (data == null)
@@ -12858,11 +13586,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            /// </summary>
            public bool Async { get; set; }
-            /// <summary>
-            /// If async is true, should this packet be handled in the async engine or given directly to a threadpool
-            /// thread?
-            /// </summary>
-            public bool InEngine { get; set; }
        }
        public class AsyncPacketProcess
@@ -12930,7 +13653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // this is the username of the *owner*
            dialog.Data.FirstName = Util.StringToBytes256(ownerFirstName);
            dialog.Data.LastName = Util.StringToBytes256(ownerLastName);
-            dialog.Data.Message =  Util.StringToBytes256(message);
+            dialog.Data.Message =  Util.StringToBytes(message,512);
            ScriptDialogPacket.ButtonsBlock[] buttons = new ScriptDialogPacket.ButtonsBlock[1];
            buttons[0] = new ScriptDialogPacket.ButtonsBlock();
@@ -12949,7 +13672,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
@@ -12962,8 +13685,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                ImprovedTerseObjectUpdatePacket.ObjectDataBlock block =
                    CreateImprovedTerseBlock(p, false);
-                const float TIME_DILATION = 1.0f;
+//                const float TIME_DILATION = 1.0f;
-                ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
+                ushort timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);;
                ImprovedTerseObjectUpdatePacket packet
                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
@@ -12986,7 +13709,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++)
@@ -13164,7 +13887,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 0394e54..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;
@@ -96,9 +96,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            set
            {
                m_throttleDebugLevel = value;
+/*
                m_throttleClient.DebugLevel = m_throttleDebugLevel;
                foreach (TokenBucket tb in m_throttleCategories)
                    tb.DebugLevel = m_throttleDebugLevel;
+ */
            }
        }
        private int m_throttleDebugLevel;
@@ -118,18 +120,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Circuit code that this client is connected on</summary>
        public readonly uint CircuitCode;
        /// <summary>Sequence numbers of packets we've received (for duplicate checking)</summary>
-        public readonly IncomingPacketHistoryCollection PacketArchive = new IncomingPacketHistoryCollection(200);
+        public IncomingPacketHistoryCollection PacketArchive = new IncomingPacketHistoryCollection(200);
-        /// <summary>
-        /// If true then we take action in response to unacked reliably sent packets such as resending the packet.
-        /// </summary>
-        public bool ProcessUnackedSends { get; set; }
        /// <summary>Packets we have sent that need to be ACKed by the client</summary>
-        public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
+        public UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
        /// <summary>ACKs that are queued up, waiting to be sent to the client</summary>
-        public readonly OpenSim.Framework.LocklessQueue<uint> PendingAcks = new OpenSim.Framework.LocklessQueue<uint>();
+        public DoubleLocklessQueue<uint> PendingAcks = new DoubleLocklessQueue<uint>();
        /// <summary>Current packet sequence number</summary>
        public int CurrentSequence;
@@ -160,19 +157,20 @@ 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;
+        private int m_packetsUnAckReported;
        /// <summary>Total number of received packets that we have reported to the OnPacketStats event(s)</summary>
        private int m_packetsReceivedReported;
        /// <summary>Total number of sent packets that we have reported to the OnPacketStats event(s)</summary>
        private int m_packetsSentReported;
        /// <summary>Holds the Environment.TickCount value of when the next OnQueueEmpty can be fired</summary>
-        private int m_nextOnQueueEmpty = 1;
+        private double m_nextOnQueueEmpty = 0;
        /// <summary>Throttle bucket for this agent's connection</summary>
-        private readonly AdaptiveTokenBucket m_throttleClient;
+        private AdaptiveTokenBucket m_throttleClient;
        public AdaptiveTokenBucket FlowThrottle
        {
            get { return m_throttleClient; }
@@ -181,10 +179,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Throttle buckets for each packet category</summary>
        private readonly TokenBucket[] m_throttleCategories;
        /// <summary>Outgoing queues for throttled packets</summary>
-        private readonly OpenSim.Framework.LocklessQueue<OutgoingPacket>[] m_packetOutboxes = new OpenSim.Framework.LocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT];
+        private DoubleLocklessQueue<OutgoingPacket>[] m_packetOutboxes = new DoubleLocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT];
        /// <summary>A container that can hold one packet for each outbox, used to store
        /// dequeued packets that are being held for throttling</summary>
-        private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT];
+        private OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT];
        /// <summary>A reference to the LLUDPServer that is managing this client</summary>
        private readonly LLUDPServer m_udpServer;
@@ -193,13 +191,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
        private int m_maxRTO = 60000;
+        public bool m_deliverPackets = true;
+        private float m_burstTime;
+        public int m_lastStartpingTimeMS;
+        public int m_pingMS;
+        public int PingTimeMS
+        {
+            get
+            {
+                if (m_pingMS < 10)
+                    return 10;
+                if(m_pingMS > 2000)
+                    return 2000;
+                return m_pingMS;
+            }
+        }
        /// <summary>
        /// This is the percentage of the udp texture queue to add to the task queue since
        /// textures are now generally handled through http.
        /// </summary>
        private double m_cannibalrate = 0.0;
-        
        private ClientInfo m_info = new ClientInfo();
        /// <summary>
@@ -232,31 +248,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (maxRTO != 0)
                m_maxRTO = maxRTO;
-            ProcessUnackedSends = true;
+            m_burstTime = rates.BrustTime;
+            float m_burst = rates.ClientMaxRate * m_burstTime;
            // Create a token bucket throttle for this client that has the scene token bucket as a parent
-            m_throttleClient 
+            m_throttleClient = new AdaptiveTokenBucket(parentThrottle, rates.ClientMaxRate, m_burst, rates.AdaptiveThrottlesEnabled);
-                = new AdaptiveTokenBucket(
-                    string.Format("adaptive throttle for {0} in {1}", AgentID, server.Scene.Name), 
-                    parentThrottle, 0, rates.Total, rates.MinimumAdaptiveThrottleRate, rates.AdaptiveThrottlesEnabled);
            // Create an array of token buckets for this clients different throttle categories
            m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
            m_cannibalrate = rates.CannibalizeTextureRate;
-            
+            m_burst = rates.Total * rates.BrustTime;
            for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
            {
                ThrottleOutPacketType type = (ThrottleOutPacketType)i;
                // Initialize the packet outboxes, where packets sit while they are waiting for tokens
-                m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
+                m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
                // Initialize the token buckets that control the throttling for each category
-                m_throttleCategories[i]
+                m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst);
-                    = new TokenBucket(
-                        string.Format("{0} throttle for {1} in {2}", type, AgentID, server.Scene.Name), 
-                    m_throttleClient, rates.GetRate(type), 0);
            }
            // Default the retransmission timeout to one second
@@ -264,6 +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;
        }
        /// <summary>
@@ -280,9 +293,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // pull the throttle out of the scene throttle
            m_throttleClient.Parent.UnregisterRequest(m_throttleClient);
-            OnPacketStats = null;
+            PendingAcks.Clear();
-            OnQueueEmpty = null;
+            NeedAcks.Clear();
-        }
+         }
        /// <summary>
        /// Gets information about this client connection
@@ -302,9 +315,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
            m_info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
            m_info.totalThrottle = (int)m_throttleClient.DripRate;
-            m_info.targetThrottle = (int)m_throttleClient.TargetDripRate;
-            m_info.maxThrottle = (int)m_throttleClient.MaxDripRate;
            return m_info;
        }
@@ -341,8 +351,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="throttleType"></param>
        public int GetPacketsQueuedCount(ThrottleOutPacketType throttleType)
        {
-            if ((int)throttleType > 0)
+            int icat = (int)throttleType;
-                return m_packetOutboxes[(int)throttleType].Count;
+            if (icat > 0 && icat < THROTTLE_CATEGORY_COUNT)
+                return m_packetOutboxes[icat].Count;
            else
                return 0;
        }
@@ -359,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,
@@ -379,16 +390,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                int newPacketsReceived = PacketsReceived - m_packetsReceivedReported;
                int newPacketsSent = PacketsSent - m_packetsSentReported;
+                int newPacketUnAck = UnackedBytes - m_packetsUnAckReported;
                callback(newPacketsReceived, newPacketsSent, UnackedBytes);
                m_packetsReceivedReported += newPacketsReceived;
                m_packetsSentReported += newPacketsSent;
+                m_packetsUnAckReported += newPacketUnAck;
            }
        }
        public void SetThrottles(byte[] throttleData)
        {
+            SetThrottles(throttleData, 1.0f);
+        }
+        public void SetThrottles(byte[] throttleData, float factor)
+        {
            byte[] adjData;
            int pos = 0;
@@ -408,24 +425,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            // 0.125f converts from bits to bytes
-            int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            float scale = 0.125f * factor;
-            int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            int resend = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
-            int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            int land = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
-            int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            int wind = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
-            int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            int cloud = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
-            int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
+            int task = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
-            int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
+            int texture = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
+            int asset = (int)(BitConverter.ToSingle(adjData, pos) * scale);
-            if (ThrottleDebugLevel > 0)
-            {
-                long total = resend + land + wind + cloud + task + texture + asset;
-                m_log.DebugFormat(
-                    "[LLUDPCLIENT]: {0} is setting throttles in {1} to Resend={2}, Land={3}, Wind={4}, Cloud={5}, Task={6}, Texture={7}, Asset={8}, TOTAL = {9}",
-                    AgentID, m_udpServer.Scene.Name, resend, land, wind, cloud, task, texture, asset, total);
-            }
            // Make sure none of the throttles are set below our packet MTU,
            // otherwise a throttle could become permanently clogged
+/* now using floats
            resend = Math.Max(resend, LLUDPServer.MTU);
            land = Math.Max(land, LLUDPServer.MTU);
            wind = Math.Max(wind, LLUDPServer.MTU);
@@ -433,52 +447,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            task = Math.Max(task, LLUDPServer.MTU);
            texture = Math.Max(texture, LLUDPServer.MTU);
            asset = Math.Max(asset, LLUDPServer.MTU);
+*/
            // Since most textures are now delivered through http, make it possible
            // to cannibalize some of the bw from the texture throttle to use for
            // the task queue (e.g. object updates)
            task = task + (int)(m_cannibalrate * texture);
            texture = (int)((1 - m_cannibalrate) * texture);
-            
-            //int total = resend + land + wind + cloud + task + texture + asset;
+            int total = resend + land + wind + cloud + task + texture + asset;
+            float m_burst = total * m_burstTime;
            if (ThrottleDebugLevel > 0)
            {
-                long total = resend + land + wind + cloud + task + texture + asset;
                m_log.DebugFormat(
                    "[LLUDPCLIENT]: {0} is setting throttles in {1} to Resend={2}, Land={3}, Wind={4}, Cloud={5}, Task={6}, Texture={7}, Asset={8}, TOTAL = {9}",
                    AgentID, m_udpServer.Scene.Name, resend, land, wind, cloud, task, texture, asset, total);
            }
-            // Update the token buckets with new throttle values
-            if (m_throttleClient.AdaptiveEnabled)
-            {
-                long total = resend + land + wind + cloud + task + texture + asset;
-                m_throttleClient.TargetDripRate = total;
-            }
            TokenBucket bucket;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
            bucket.RequestedDripRate = resend;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
            bucket.RequestedDripRate = land;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
            bucket.RequestedDripRate = wind;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
            bucket.RequestedDripRate = cloud;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
            bucket.RequestedDripRate = asset;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
            bucket.RequestedDripRate = task;
+            bucket.RequestedBurst = m_burst;
            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
            bucket.RequestedDripRate = texture;
+            bucket.RequestedBurst = m_burst;
            // Reset the packed throttles cached data
            m_packedThrottles = null;
@@ -496,25 +512,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                int i = 0;
                // multiply by 8 to convert bytes back to bits
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Resend].RequestedDripRate * 8 * multiplier;
+                multiplier *= 8;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Resend].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Land].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Land].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Wind].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Wind].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Task].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Task].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Texture].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Texture].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
-                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Asset].RequestedDripRate * 8 * multiplier;
+                rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Asset].RequestedDripRate * multiplier;
                Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
                m_packedThrottles = data;
@@ -523,43 +541,65 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return data;
        }
+        public int GetCatBytesCanSend(ThrottleOutPacketType cat, int timeMS)
+        {
+            int icat = (int)cat;
+            if (icat > 0 && icat < THROTTLE_CATEGORY_COUNT)
+            {
+                TokenBucket bucket = m_throttleCategories[icat];
+                return bucket.GetCatBytesCanSend(timeMS);
+            }
+            else
+                return 0;
+        }
        /// <summary>
        /// Queue an outgoing packet if appropriate.
        /// </summary>
        /// <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)
        {
+            return EnqueueOutgoing(packet, forceQueue, false);
+        }
+        public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue, bool highPriority)
+        {
            int category = (int)packet.Category;
            if (category >= 0 && category < m_packetOutboxes.Length)
            {
-                OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
+                DoubleLocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
+                if (m_deliverPackets == false)
+                {
+                    queue.Enqueue(packet, highPriority);
+                    return true;
+                }
                TokenBucket bucket = m_throttleCategories[category];
-                // Don't send this packet if there is already a packet waiting in the queue
+                // Don't send this packet if queue is not empty
-                // even if we have the tokens to send it, tokens should go to the already
+                if (queue.Count > 0 || m_nextPackets[category] != null)
-                // queued packets
-                if (queue.Count > 0)
                {
-                    queue.Enqueue(packet);
+                    queue.Enqueue(packet, highPriority);
                    return true;
                }
-                
-                    
+                if (!forceQueue && bucket.CheckTokens(packet.Buffer.DataLength))
-                if (!forceQueue && bucket.RemoveTokens(packet.Buffer.DataLength))
                {
-                    // Enough tokens were removed from the bucket, the packet will not be queued
+                    // enough tokens so it can be sent imediatly by caller
+                    bucket.RemoveTokens(packet.Buffer.DataLength);
                    return false;
                }
                else
                {
                    // Force queue specified or not enough tokens in the bucket, queue this packet
-                    queue.Enqueue(packet);
+                    queue.Enqueue(packet, highPriority);
                    return true;
                }
            }
@@ -568,28 +608,31 @@ 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()
        {
-            OutgoingPacket packet;
+//            if (m_deliverPackets == false) return false;
-            OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
+            OutgoingPacket packet = null;
+            DoubleLocklessQueue<OutgoingPacket> queue;
            TokenBucket bucket;
            bool packetSent = false;
            ThrottleOutPacketTypeFlags emptyCategories = 0;
@@ -613,6 +656,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        m_udpServer.SendPacketFinal(nextPacket);
                        m_nextPackets[i] = null;
                        packetSent = true;
+                        if (m_packetOutboxes[i].Count < 5)
+                            emptyCategories |= CategoryToFlag(i);
                    }
                }
                else
@@ -620,32 +666,47 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    // No dequeued packet waiting to be sent, try to pull one off
                    // this queue
                    queue = m_packetOutboxes[i];
-                    if (queue.Dequeue(out packet))
+                    if (queue != null)
                    {
-                        // A packet was pulled off the queue. See if we have
+                        bool success = false;
-                        // enough tokens in the bucket to send it out
+                        try
-                        if (bucket.RemoveTokens(packet.Buffer.DataLength))
                        {
-                            // Send the packet
+                            success = queue.Dequeue(out packet);
-                            m_udpServer.SendPacketFinal(packet);
-                            packetSent = true;
                        }
-                        else
+                        catch
                        {
-                            // Save the dequeued packet for the next iteration
+                            m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
-                            m_nextPackets[i] = packet;
                        }
+                        if (success)
+                        {
+                            // A packet was pulled off the queue. See if we have
+                            // enough tokens in the bucket to send it out
+                            if (bucket.RemoveTokens(packet.Buffer.DataLength))
+                            {
+                                // Send the packet
+                                m_udpServer.SendPacketFinal(packet);
+                                packetSent = true;
+                                if (queue.Count < 5)
+                                    emptyCategories |= CategoryToFlag(i);
+                            }
+                            else
+                            {
+                                // Save the dequeued packet for the next iteration
+                                m_nextPackets[i] = packet;
+                            }
-                        // If the queue is empty after this dequeue, fire the queue
+                        }
-                        // empty callback now so it has a chance to fill before we 
+                        else
-                        // get back here
+                        {
-                        if (queue.Count == 0)
+                            // No packets in this queue. Fire the queue empty callback
+                            // if it has not been called recently
                            emptyCategories |= CategoryToFlag(i);
+                        }
                    }
                    else
                    {
-                        // No packets in this queue. Fire the queue empty callback
+                        m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
-                        // if it has not been called recently
                        emptyCategories |= CategoryToFlag(i);
                    }
                }
@@ -712,6 +773,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            RTO = Math.Min(RTO * 2, m_maxRTO);
        }
+        const double MIN_CALLBACK_MS = 20.0;
+        private bool m_isQueueEmptyRunning;
        /// <summary>
        /// Does an early check to see if this queue empty callback is already
        /// running, then asynchronously firing the event
@@ -719,44 +783,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="categories">Throttle categories to fire the callback for</param>
        private void BeginFireQueueEmpty(ThrottleOutPacketTypeFlags categories)
        {
-//            if (m_nextOnQueueEmpty != 0 && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
+            if (!m_isQueueEmptyRunning)
-            if (!m_isQueueEmptyRunning && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
            {
-                m_isQueueEmptyRunning = true;
+                if (!HasUpdates(categories))
+                    return;
-                int start = Environment.TickCount & Int32.MaxValue;
+                double start = Util.GetTimeStampMS();
-                const int MIN_CALLBACK_MS = 30;
+                if (start < m_nextOnQueueEmpty)
+                    return;
+                m_isQueueEmptyRunning = true;
                m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
-                if (m_nextOnQueueEmpty == 0)
-                    m_nextOnQueueEmpty = 1;
-                // Use a value of 0 to signal that FireQueueEmpty is running
+                // Asynchronously run the callback
-//                m_nextOnQueueEmpty = 0;
+                if (m_udpServer.OqrEngine.IsRunning)
+                    m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => FireQueueEmpty(categories));
-                m_categories = categories;
-                if (HasUpdates(m_categories))
-                {
-                    if (!m_udpServer.OqrEngine.IsRunning)
-                    {
-                        // Asynchronously run the callback
-                        Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty");
-                    }
-                    else
-                    {
-                        m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => FireQueueEmpty(categories));
-                    }
-                }
                else
-                {
+                    Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty");
-                    m_isQueueEmptyRunning = false;
-                }
            }
        }
-        private bool m_isQueueEmptyRunning;
-        private ThrottleOutPacketTypeFlags m_categories = 0;
        /// <summary>
        /// Fires the OnQueueEmpty callback and sets the minimum time that it
@@ -767,33 +814,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// signature</param>
        public void FireQueueEmpty(object o)
        {
-//            m_log.DebugFormat("[LLUDPCLIENT]: FireQueueEmpty for {0} in {1}", AgentID, m_udpServer.Scene.Name);
+            ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
+            QueueEmpty callback = OnQueueEmpty;
-//            int start = Environment.TickCount & Int32.MaxValue;
-//            const int MIN_CALLBACK_MS = 30;
-//            if (m_udpServer.IsRunningOutbound)
+            if (callback != null)
-//            {        
+            {
-                ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
+                // if (m_udpServer.IsRunningOutbound)
-                QueueEmpty callback = OnQueueEmpty;                      
+                // {
+                try { callback(categories); }
-                if (callback != null)
+                catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
-                {
+                // }
-//                    if (m_udpServer.IsRunningOutbound)
+            }
-//                    {                
-                        try { callback(categories); }
-                        catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
-//                    }
-                }
-//            }
-//            m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
+            m_isQueueEmptyRunning = false;
-//            if (m_nextOnQueueEmpty == 0)
+        }
-//                m_nextOnQueueEmpty = 1;
-//            }
+        internal void ForceThrottleSetting(int throttle, int setting)
+        {
+            if (throttle > 0 && throttle < THROTTLE_CATEGORY_COUNT)
+                m_throttleCategories[throttle].RequestedDripRate = Math.Max(setting, LLUDPServer.MTU);
+        }
-            m_isQueueEmptyRunning = false;
+        internal int GetThrottleSetting(int throttle)
+        {
+            if (throttle > 0 && throttle < THROTTLE_CATEGORY_COUNT)
+                return (int)m_throttleCategories[throttle].RequestedDripRate;
+            else
+                return 0;
        }
        /// <summary>
@@ -839,4 +886,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
        }
    }
+    public class DoubleLocklessQueue<T> : OpenSim.Framework.LocklessQueue<T>
+    {
+        OpenSim.Framework.LocklessQueue<T> highQueue = new OpenSim.Framework.LocklessQueue<T>();
+        public override int Count
+        {
+            get
+            {
+                return base.Count + highQueue.Count;
+            }
+        }
+        public override bool Dequeue(out T item)
+        {
+            if (highQueue.Dequeue(out item))
+                return true;
+            return base.Dequeue(out item);
+        }
+        public void Enqueue(T item, bool highPriority)
+        {
+            if (highPriority)
+                highQueue.Enqueue(item);
+            else
+                Enqueue(item);
+        }
+    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 4528714..b575ed9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -51,60 +51,59 @@ namespace OpenSim.Region.ClientStack.LindenUDP
    /// A shim around LLUDPServer that implements the IClientNetworkServer interface
    /// </summary>
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LLUDPServerShim")]
-    public sealed class LLUDPServerShim : INonSharedRegionModule
+    public class LLUDPServerShim : INonSharedRegionModule
    {
-        private bool m_Enabled = true;
+        protected IConfigSource m_Config;
-        private IConfigSource m_Config;
+        protected LLUDPServer m_udpServer;
-        LLUDPServer m_udpServer;
        #region INonSharedRegionModule
-        public string Name
+        public virtual string Name
        {
            get { return "LLUDPServerShim"; }
        }
-        public Type ReplaceableInterface
+        public virtual Type ReplaceableInterface
        {
            get { return null; }
        }
-        public void Initialise(IConfigSource source)
+        public virtual void Initialise(IConfigSource source)
        {
            m_Config = source;
        }
-        public void Close()
+        public virtual void Close()
        {
        }
-        public void AddRegion(Scene scene)
+        public virtual void AddRegion(Scene scene)
        {
            uint port = (uint)scene.RegionInfo.InternalEndPoint.Port;
            IPAddress listenIP = scene.RegionInfo.InternalEndPoint.Address;
-            Initialise(listenIP, ref port, scene.RegionInfo.ProxyOffset, scene.RegionInfo.m_allow_alternate_ports, m_Config, scene.AuthenticateHandler);
+            Initialise(listenIP, ref port, scene.RegionInfo.ProxyOffset, m_Config, scene.AuthenticateHandler);
            scene.RegionInfo.InternalEndPoint.Port = (int)port;
            AddScene(scene);
        }
-        public void RemoveRegion(Scene scene)
+        public virtual void RemoveRegion(Scene scene)
        {
            Stop();
        }
-        public void RegionLoaded(Scene scene)
+        public virtual void RegionLoaded(Scene scene)
        {
            Start();
        }
        #endregion
-        public void Initialise(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager)
+        public virtual void Initialise(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, IConfigSource configSource, AgentCircuitManager circuitManager)
        {
-            m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
+            m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, configSource, circuitManager);
        }
-        public void AddScene(IScene scene)
+        public virtual void AddScene(IScene scene)
        {
            m_udpServer.AddScene(scene);
@@ -223,22 +222,22 @@ 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));
        }
-        public bool HandlesRegion(Location x)
+        public virtual bool HandlesRegion(Location x)
        {
            return m_udpServer.HandlesRegion(x);
        }
-        public void Start()
+        public virtual void Start()
        {
            m_udpServer.Start();
        }
-        public void Stop()
+        public virtual void Stop()
        {
            m_udpServer.Stop();
        }
@@ -257,7 +256,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public const int MTU = 1400;
        /// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary>
-        public int ClientLogoutsDueToNoReceives { get; private set; }
+        public int ClientLogoutsDueToNoReceives { get; protected set; }
        /// <summary>
        /// Default packet debug level given to new clients
@@ -273,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;
@@ -284,54 +283,53 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Handlers for incoming packets</summary>
        //PacketEventDictionary packetEvents = new PacketEventDictionary();
        /// <summary>Incoming packets that are awaiting handling</summary>
-        private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
+        //protected OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
+        protected OpenSim.Framework.BlockingQueue<IncomingPacket> packetInbox = new OpenSim.Framework.BlockingQueue<IncomingPacket>();
        /// <summary>Bandwidth throttle for this UDP server</summary>
-        public TokenBucket Throttle { get; private set; }
+        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.
        /// The other rates (resend, asset, etc.) are the defaults for a new client and can be changed (and usually
        /// do get changed immediately).  They do not need to sum to the total.
        /// </remarks>
-        public ThrottleRates ThrottleRates { get; private set; }
+        public ThrottleRates ThrottleRates { get; protected set; }
-        
        /// <summary>Manages authentication for agent circuits</summary>
-        private AgentCircuitManager m_circuitManager;
+        protected AgentCircuitManager m_circuitManager;
        /// <summary>Reference to the scene this UDP server is attached to</summary>
-        public Scene Scene { get; private set; }
+        public Scene Scene { get; protected set; }
        /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
-        private Location m_location;
+        protected Location m_location;
        /// <summary>The size of the receive buffer for 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</summary>
-        private int m_recvBufferSize;
+        protected int m_recvBufferSize;
-        /// <summary>Flag to process packets asynchronously or synchronously</summary>
-        private bool m_asyncPacketHandling;
        /// <summary>Tracks whether or not a packet was sent each round so we know
        /// whether or not to sleep</summary>
-        private bool m_packetSent;
+        protected bool m_packetSent;
        /// <summary>Environment.TickCount of the last time that packet stats were reported to the scene</summary>
-        private int m_elapsedMSSinceLastStatReport = 0;
+        protected int m_elapsedMSSinceLastStatReport = 0;
        /// <summary>Environment.TickCount of the last time the outgoing packet handler executed</summary>
-        private int m_tickLastOutgoingPacketHandler;
+        protected double m_tickLastOutgoingPacketHandler;
        /// <summary>Keeps track of the number of elapsed milliseconds since the last time the outgoing packet handler looped</summary>
-        private int m_elapsedMSOutgoingPacketHandler;
+        protected double m_elapsedMSOutgoingPacketHandler;
        /// <summary>Keeps track of the number of 100 millisecond periods elapsed in the outgoing packet handler executed</summary>
-        private int m_elapsed100MSOutgoingPacketHandler;
+        protected int m_elapsed100MSOutgoingPacketHandler;
        /// <summary>Keeps track of the number of 500 millisecond periods elapsed in the outgoing packet handler executed</summary>
-        private int m_elapsed500MSOutgoingPacketHandler;
+        protected int m_elapsed500MSOutgoingPacketHandler;
        /// <summary>Flag to signal when clients should check for resends</summary>
        protected bool m_resendUnacked;
@@ -342,32 +340,38 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Flag to signal when clients should send pings</summary>
        protected bool m_sendPing;
-        /// <summary>
+        protected int m_animationSequenceNumber;
-        /// Event used to signal when queued packets are available for sending.
-        /// </summary>
-        /// <remarks>
-        /// This allows the outbound loop to only operate when there is data to send rather than continuously polling.
-        /// Some data is sent immediately and not queued.  That data would not trigger this event.
-        /// </remarks>
-        private AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
-        private Pool<IncomingPacket> m_incomingPacketPool;
+        public int NextAnimationSequenceNumber
+        {
+            get
+            {
+                m_animationSequenceNumber++;
+                if (m_animationSequenceNumber > 2147482624)
+                    m_animationSequenceNumber = 1;
+                return m_animationSequenceNumber;
+            }
+        }
+        protected ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
+        protected Pool<IncomingPacket> m_incomingPacketPool;
        /// <summary>
        /// Stat for number of packets in the main pool awaiting use.
        /// </summary>
-        private Stat m_poolCountStat;
+        protected Stat m_poolCountStat;
        /// <summary>
        /// Stat for number of packets in the inbound packet pool awaiting use.
        /// </summary>
-        private Stat m_incomingPacketPoolStat;
+        protected Stat m_incomingPacketPoolStat;
-        private int m_defaultRTO = 0;
+        protected int m_defaultRTO = 0;
-        private int m_maxRTO = 0;
+        protected int m_maxRTO = 0;
-        private int m_ackTimeout = 0;
+        protected int m_ackTimeout = 0;
-        private int m_pausedAckTimeout = 0;
+        protected int m_pausedAckTimeout = 0;
-        private bool m_disableFacelights = false;
+        protected bool m_disableFacelights = false;
        public Socket Server { get { return null; } }
@@ -389,28 +393,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>
        /// Record how many inbound packets could not be recognized as LLUDP packets.
        /// </summary>
-        public int IncomingMalformedPacketCount { get; private set; }
+        public int IncomingMalformedPacketCount { get; protected set; }
        /// <summary>
        /// Record how many inbound packets could not be associated with a simulator circuit.
        /// </summary>
-        public int IncomingOrphanedPacketCount { get; private set; }
+        public int IncomingOrphanedPacketCount { get; protected set; }
        /// <summary>
        /// Record current outgoing client for monitoring purposes.
        /// </summary>
-        private IClientAPI m_currentOutgoingClient;
+        protected IClientAPI m_currentOutgoingClient;
        /// <summary>
        /// Recording current incoming client for monitoring purposes.
        /// </summary>
-        private IClientAPI m_currentIncomingClient;
+        protected IClientAPI m_currentIncomingClient;
        /// <summary>
        /// Queue some low priority but potentially high volume async requests so that they don't overwhelm available
        /// threadpool threads.
        /// </summary>
-        public JobEngine IpahEngine { get; private set; }
+//        public JobEngine IpahEngine { get; protected set; }
        /// <summary>
        /// Run queue empty processing within a single persistent thread.
@@ -420,27 +424,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// connection schedule its own job in the threadpool which causes performance problems when there are many
        /// connections.
        /// </remarks>
-        public JobEngine OqrEngine { get; private set; }
+        public JobEngine OqrEngine { get; protected set; }
        public LLUDPServer(
-            IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port,
+            IPAddress listenIP, ref uint port, int proxyPortOffsetParm,
            IConfigSource configSource, AgentCircuitManager circuitManager)
            : base(listenIP, (int)port)
        {
            #region Environment.TickCount Measurement
+            // Update the port with the one we actually got
+            port = (uint)Port;
            // Measure the resolution of Environment.TickCount
            TickCountResolution = 0f;
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 10; i++)
            {
                int start = Environment.TickCount;
                int now = start;
                while (now == start)
                    now = Environment.TickCount;
-                TickCountResolution += (float)(now - start) * 0.2f;
+                TickCountResolution += (float)(now - start);
+            }
+            m_log.Info("[LLUDPSERVER]: Average Environment.TickCount resolution: " + TickCountResolution * 0.1f + "ms");
+            TickCountResolution = 0f;
+            for (int i = 0; i < 100; i++)
+            {
+                double start = Util.GetTimeStampMS();
+                double now = start;
+                while (now == start)
+                    now = Util.GetTimeStampMS();
+                TickCountResolution += (float)((now - start));
            }
-            m_log.Info("[LLUDPSERVER]: Average Environment.TickCount resolution: " + TickCountResolution + "ms");
-            TickCountResolution = (float)Math.Ceiling(TickCountResolution);
+            TickCountResolution = (float)Math.Round(TickCountResolution * 0.01f,6,MidpointRounding.AwayFromZero);
+            m_log.Info("[LLUDPSERVER]: Average Util.GetTimeStampMS resolution: " + TickCountResolution + "ms");
            #endregion Environment.TickCount Measurement
@@ -451,7 +470,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            IConfig config = configSource.Configs["ClientStack.LindenUDP"];
            if (config != null)
            {
-                m_asyncPacketHandling = config.GetBoolean("async_packet_handling", true);
                m_recvBufferSize = config.GetInt("client_socket_rcvbuf_size", 0);
                sceneThrottleBps = config.GetInt("scene_throttle_max_bps", 0);
@@ -494,24 +512,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            #endregion BinaryStats
-            // FIXME: Can't add info here because don't know scene yet.
+            Throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps * 10e-3f);
-//            m_throttle 
-//                = new TokenBucket(
-//                    string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps);
-            Throttle = new TokenBucket("server throttle bucket", null, 0, sceneThrottleBps);
            ThrottleRates = new ThrottleRates(configSource);
-            if (usePools)
+            Random rnd = new Random(Util.EnvironmentTickCount());
-                EnablePools();
+            m_animationSequenceNumber = rnd.Next(11474826);
+//            if (usePools)
+//                EnablePools();
+            base.DisablePools();
        }
        public void Start()
        {
            StartInbound();
            StartOutbound();
-            IpahEngine.Start();
+//            IpahEngine.Start();
            OqrEngine.Start();
            m_elapsedMSSinceLastStatReport = Environment.TickCount;
@@ -520,10 +536,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void StartInbound()
        {
            m_log.InfoFormat(
-                "[LLUDPSERVER]: Starting inbound packet processing for the LLUDP server in {0} mode with UsePools = {1}",
+                "[LLUDPSERVER]: Starting inbound packet processing for the LLUDP server");
-                m_asyncPacketHandling ? "asynchronous" : "synchronous", UsePools);
-            base.StartInbound(m_recvBufferSize, m_asyncPacketHandling);
+            base.StartInbound(m_recvBufferSize);
            // This thread will process the packets received that are placed on the packetInbox
            WorkManager.StartThread(
@@ -557,7 +572,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name);
            base.StopOutbound();
            base.StopInbound();
-            IpahEngine.Stop();
+//            IpahEngine.Stop();
            OqrEngine.Stop();
        }
@@ -642,7 +657,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// If the outgoing UDP thread times out, then return client that was being processed to help with debugging.
        /// </summary>
        /// <returns></returns>
-        private string GetWatchdogIncomingAlarmData()
+        protected string GetWatchdogIncomingAlarmData()
        {
            return string.Format(
                "Client is {0}",
@@ -653,7 +668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// If the outgoing UDP thread times out, then return client that was being processed to help with debugging.
        /// </summary>
        /// <returns></returns>
-        private string GetWatchdogOutgoingAlarmData()
+        protected string GetWatchdogOutgoingAlarmData()
        {
            return string.Format(
                "Client is {0}",
@@ -676,15 +691,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(
@@ -697,7 +712,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    scene.Name,
                    StatType.Pull,
                    MeasuresOfInterest.AverageChangeOverTime,
-                    stat => stat.Value = packetInbox.Count,
+                    stat => stat.Value = packetInbox.Count(),
                    StatVerbosity.Debug));
            // XXX: These stats are also pool stats but we register them separately since they are currently not
@@ -710,9 +725,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));
@@ -725,8 +740,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));
@@ -766,7 +781,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    MeasuresOfInterest.AverageChangeOverTime,
                    stat => stat.Value = GetTotalQueuedOutgoingPackets(),
                    StatVerbosity.Info));
+/*
            StatsManager.RegisterStat(
                new Stat(
                    "IncomingPacketAsyncRequestsWaiting",
@@ -779,7 +794,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    MeasuresOfInterest.None,
                    stat => stat.Value = IpahEngine.JobsWaiting,
                    StatVerbosity.Debug));
-                        
+*/
            StatsManager.RegisterStat(
                new Stat(
                    "OQRERequestsWaiting",
@@ -792,14 +807,16 @@ 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)
                EnablePoolStats();
            LLUDPServerCommands commands = new LLUDPServerCommands(MainConsole.Instance, this);
            commands.Register();
        }
        public bool HandlesRegion(Location x)
@@ -906,9 +923,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            PacketPool.Instance.ReturnPacket(packet);
-            if (packetQueued)
-                m_dataPresentEvent.Set();
        }
        /// <summary>
@@ -969,8 +983,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    bufferSize = dataLength;
                    buffer = new UDPPacketBuffer(udpClient.RemoteEndPoint, bufferSize);
-                    // m_log.Error("[LLUDPSERVER]: Packet exceeded buffer size! This could be an indication of packet assembly not obeying the MTU. Type=" +
+                    m_log.Error("[LLUDPSERVER]: Packet exceeded buffer size! This could be an indication of packet assembly not obeying the MTU. Type=" +
-                    //     type + ", DataLength=" + dataLength + ", BufferLength=" + buffer.Data.Length + ". Dropping packet");
+                        type + ", DataLength=" + dataLength + ", BufferLength=" + buffer.Data.Length);
                    Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength);
                }
            }
@@ -979,35 +993,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #region Queue or Send
+            bool highPriority = false;
+            if (category != ThrottleOutPacketType.Unknown && (category & ThrottleOutPacketType.HighPriority) != 0)
+            {
+                category = (ThrottleOutPacketType)((int)category & 127);
+                highPriority = true;
+            }
            OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null);
            // If we were not provided a method for handling unacked, use the UDPServer default method
            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.
-            bool forceQueue = (type == PacketType.KillObject);
-//            if (type == PacketType.ImprovedTerseObjectUpdate)
+            bool requestQueue = type == PacketType.KillObject;
-//            {
+            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue, highPriority))
-//                m_log.DebugFormat("Direct send ITOU to {0} in {1}", udpClient.AgentID, Scene.Name);
-//                SendPacketFinal(outgoingPacket);
-//                return false;
-//            }
-//            else
-//            {
-            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, forceQueue))
            {
                SendPacketFinal(outgoingPacket);
                return true;
            }
-            else
-            {
+            return false;
-                return false;
-            }
-//            }
            #endregion Queue or Send
        }
@@ -1048,6 +1059,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pc.PingID.OldestUnacked = 0;
            SendPacket(udpClient, pc, ThrottleOutPacketType.Unknown, false, null);
+            udpClient.m_lastStartpingTimeMS = Util.EnvironmentTickCount();
        }
        public void CompletePing(LLUDPClient udpClient, byte pingID)
@@ -1145,7 +1157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            int dataLength = buffer.DataLength;
            // NOTE: I'm seeing problems with some viewers when ACKs are appended to zerocoded packets so I've disabled that here
-            if (!isZerocoded)
+            if (!isZerocoded && !isResend && outgoingPacket.UnackedMethod == null)
            {
                // Keep appending ACKs until there is no room left in the buffer or there are
                // no more ACKs to append
@@ -1180,7 +1192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                Utils.UIntToBytesBig(sequenceNumber, buffer.Data, 1);
                outgoingPacket.SequenceNumber = sequenceNumber;
-                if (udpClient.ProcessUnackedSends && isReliable)
+                if (isReliable)
                {
                    // Add this packet to the list of ACK responses we are waiting on from the server
                    udpClient.NeedAcks.Add(outgoingPacket);
@@ -1210,13 +1222,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    outgoingPacket.SequenceNumber, isReliable, isResend, udpClient.AgentID, Scene.Name);
            // Put the UDP payload on the wire
-            AsyncBeginSend(buffer);
+//            AsyncBeginSend(buffer);
+            SyncSend(buffer);
            // Keep track of when this packet was sent out (right now)
            outgoingPacket.TickCount = Environment.TickCount & Int32.MaxValue;
        }
-        private void RecordMalformedInboundPacket(IPEndPoint endPoint)
+        protected void RecordMalformedInboundPacket(IPEndPoint endPoint)
        {
 //                if (m_malformedCount < 100)
 //                    m_log.DebugFormat("[LLUDPSERVER]: Dropped malformed packet: " + e.ToString());
@@ -1225,7 +1238,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);
        }
@@ -1311,35 +1324,62 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #region Packet to Client Mapping
-            // UseCircuitCode handling
+            // If there is already a client for this endpoint, don't process UseCircuitCode
-            if (packet.Type == PacketType.UseCircuitCode)
+            IClientAPI client = null;
+            if (!Scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
            {
-                // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
+                // UseCircuitCode handling
-                // buffer.
+                if (packet.Type == PacketType.UseCircuitCode)
-                object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+                {
+                    // And if there is a UseCircuitCode pending, also drop it
+                    lock (m_pendingCache)
+                    {
+                        if (m_pendingCache.Contains(endPoint))
+                            return;
-                Util.FireAndForget(HandleUseCircuitCode, array, "LLUDPServer.HandleUseCircuitCode");
+                        m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60);
+                    }
-                return;
+                    // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
+                    // buffer.
+                    object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+                    Util.FireAndForget(HandleUseCircuitCode, array);
+                    return;
+                }
            }
-            else if (packet.Type == PacketType.CompleteAgentMovement)
+            // If this is a pending connection, enqueue, don't process yet
+            lock (m_pendingCache)
            {
-                // Send ack straight away to let the viewer know that we got it.
+                Queue<UDPPacketBuffer> queue;
-                SendAckImmediate(endPoint, packet.Header.Sequence);
+                if (m_pendingCache.TryGetValue(endPoint, out queue))
+                {
+                    //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
+                    queue.Enqueue(buffer);
+                    return;
+                }
-                // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
+/*
-                // buffer.
+                else if (packet.Type == PacketType.CompleteAgentMovement)
-                object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+                {
+                    // Send ack straight away to let the viewer know that we got it.
+                    SendAckImmediate(endPoint, packet.Header.Sequence);
-                Util.FireAndForget(
+                    // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
-                    HandleCompleteMovementIntoRegion, array, "LLUDPServer.HandleCompleteMovementIntoRegion");
+                    // buffer.
+                    object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
-                return;
+                    Util.FireAndForget(HandleCompleteMovementIntoRegion, array);
+                    return;
+                }
+ */
            }
            // Determine which agent this packet came from
-            IClientAPI client;
+            if (client == null || !(client is LLClientView))
-            if (!Scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
            {
                //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
@@ -1347,7 +1387,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;
@@ -1356,7 +1396,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            udpClient = ((LLClientView)client).UDPClient;
            if (!udpClient.IsConnected)
+            {
+                m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + Scene.RegionInfo.RegionName);
                return;
+            }
            #endregion Packet to Client Mapping
@@ -1368,37 +1411,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #region ACK Receiving
-            if (udpClient.ProcessUnackedSends)
+            // Handle appended ACKs
+            if (packet.Header.AppendedAcks && packet.Header.AckList != null)
            {
-                // Handle appended ACKs
+                // m_log.DebugFormat(
-                if (packet.Header.AppendedAcks && packet.Header.AckList != null)
+                //      "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
-                {
+                //      packet.Header.AckList.Length, client.Name, m_scene.Name);
-    //                m_log.DebugFormat(
-    //                    "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
-    //                    packet.Header.AckList.Length, client.Name, m_scene.Name);
-                    for (int i = 0; i < packet.Header.AckList.Length; i++)
+                for (int i = 0; i < packet.Header.AckList.Length; i++)
-                        udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
+                    udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
-                }
+            }
-                // Handle PacketAck packets
+            // Handle PacketAck packets
-                if (packet.Type == PacketType.PacketAck)
+            if (packet.Type == PacketType.PacketAck)
-                {
+            {
-                    PacketAckPacket ackPacket = (PacketAckPacket)packet;
+                PacketAckPacket ackPacket = (PacketAckPacket)packet;
-    //                m_log.DebugFormat(
+                // m_log.DebugFormat(
-    //                    "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
+                //      "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
-    //                    ackPacket.Packets.Length, client.Name, m_scene.Name);
+                //      ackPacket.Packets.Length, client.Name, m_scene.Name);
-                    for (int i = 0; i < ackPacket.Packets.Length; i++)
+                for (int i = 0; i < ackPacket.Packets.Length; i++)
-                        udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
+                    udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
-                    // We don't need to do anything else with PacketAck packets
+                // We don't need to do anything else with PacketAck packets
-                    return;
-                }
-            }
-            else if (packet.Type == PacketType.PacketAck)
-            {
                return;
            }
@@ -1442,7 +1478,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(
@@ -1459,24 +1495,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            LogPacketHeader(true, udpClient.CircuitCode, 0, packet.Type, (ushort)packet.Length);
            #endregion BinaryStats
-            if (packet.Type == PacketType.AgentUpdate)
-            {
-                if (DiscardInboundAgentUpdates)
-                    return;
-                ((LLClientView)client).TotalAgentUpdates++;
+//AgentUpdate removed from here
-                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
-                LLClientView llClient = client as LLClientView;
-                if (agentUpdate.AgentData.SessionID != client.SessionId 
-                    || agentUpdate.AgentData.AgentID != client.AgentId
-                    || !(llClient == null || llClient.CheckAgentUpdateSignificance(agentUpdate.AgentData)) )
-                {
-                    PacketPool.Instance.ReturnPacket(packet);
-                    return;
-                }
-            }
            #region Ping Check Handling
@@ -1497,7 +1518,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else if (packet.Type == PacketType.CompletePingCheck)
            {
-                // We don't currently track client ping times
+                int t = Util.EnvironmentTickCountSubtract(udpClient.m_lastStartpingTimeMS);
+                int c = udpClient.m_pingMS;
+                c = 800 * c + 200 * t;
+                c /= 1000;
+                udpClient.m_pingMS = c;
                return;
            }
@@ -1517,7 +1542,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                incomingPacket = new IncomingPacket((LLClientView)client, packet);
            }
-            packetInbox.Enqueue(incomingPacket);
+//            if (incomingPacket.Packet.Type == PacketType.AgentUpdate ||
+//                incomingPacket.Packet.Type == PacketType.ChatFromViewer)
+            if (incomingPacket.Packet.Type == PacketType.ChatFromViewer)
+                packetInbox.PriorityEnqueue(incomingPacket);
+            else
+                packetInbox.Enqueue(incomingPacket);
        }
        #region BinaryStats
@@ -1627,14 +1658,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #endregion BinaryStats
-        private void HandleUseCircuitCode(object o)
+        protected void HandleUseCircuitCode(object o)
        {
            IPEndPoint endPoint = null;
            IClientAPI client = null;
            try
            {
-    //            DateTime startTime = DateTime.Now;
+//              DateTime startTime = DateTime.Now;
                object[] array = (object[])o;
                endPoint = (IPEndPoint)array[0];
                UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1];
@@ -1642,10 +1673,12 @@ 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))
                {
+                    AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                    // Begin the process of adding the client to the simulator
                    client
                        = AddClient(
@@ -1654,20 +1687,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            uccp.CircuitCode.SessionID,
                            endPoint,
                            sessionInfo);
-            
+                    // This will be true if the client is new, e.g. not
+                    // an existing child agent, and there is no circuit data
+                    if (client != null && aCircuit == null)
+                    {
+                        Scene.CloseAgent(client.AgentId, true);
+                        return;
+                    }
+                    // Now we know we can handle more data
+                    Thread.Sleep(200);
+                    // Obtain the pending queue and remove it from the cache
+                    Queue<UDPPacketBuffer> queue = null;
+                    lock (m_pendingCache)
+                    {
+                        if (!m_pendingCache.TryGetValue(endPoint, out queue))
+                        {
+                            m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
+                            return;
+                        }
+                        m_pendingCache.Remove(endPoint);
+                    }
+                    m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
+                    // Reinject queued packets
+                    while (queue.Count > 0)
+                    {
+                        UDPPacketBuffer buf = queue.Dequeue();
+                        PacketReceived(buf);
+                    }
+                    queue = null;
                    // Send ack straight away to let the viewer know that the connection is active.
                    // The client will be null if it already exists (e.g. if on a region crossing the client sends a use
                    // circuit code to the existing child agent.  This is not particularly obvious.
                    SendAckImmediate(endPoint, uccp.Header.Sequence);
-            
                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
                    if (client != null)
                    {
-                        AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                        bool tp = (aCircuit.teleportFlags > 0);
                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
-                        if (!tp && !client.SceneAgent.SentInitialDataToClient)
+                        if (!tp)
-                            client.SceneAgent.SendInitialDataToClient();
+                            client.SceneAgent.SendInitialDataToMe();
                    }
                }
                else
@@ -1675,11 +1743,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    // Don't create clients for unauthorized requesters.
                    m_log.WarnFormat(
                        "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
                        uccp.CircuitCode.ID, Scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
+                    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);
            }
@@ -1694,8 +1766,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    e.StackTrace);
            }
        }
+/*
-        private void HandleCompleteMovementIntoRegion(object o)
+         protected void HandleCompleteMovementIntoRegion(object o)
        {
            IPEndPoint endPoint = null;
            IClientAPI client = null;
@@ -1711,9 +1783,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)
@@ -1735,7 +1807,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.",
@@ -1749,7 +1821,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);
                    }
@@ -1804,6 +1876,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    e.StackTrace);
            }
        }
+*/
        /// <summary>
        /// Send an ack immediately to the given endpoint.
@@ -1814,7 +1887,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </remarks>
        /// <param name="remoteEndpoint"></param>
        /// <param name="sequenceNumber"></param>
-        private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
+        protected void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
        {
            PacketAckPacket ack = new PacketAckPacket();
            ack.Header.Reliable = false;
@@ -1835,10 +1908,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Buffer.BlockCopy(packetData, 0, buffer.Data, 0, length);
-            AsyncBeginSend(buffer);
+//            AsyncBeginSend(buffer);
+            SyncSend(buffer);
        }
-        private bool IsClientAuthorized(UseCircuitCodePacket useCircuitCode, out AuthenticateResponse sessionInfo)
+        protected bool IsClientAuthorized(UseCircuitCodePacket useCircuitCode, out AuthenticateResponse sessionInfo)
        {
            UUID agentID = useCircuitCode.CircuitCode.ID;
            UUID sessionID = useCircuitCode.CircuitCode.SessionID;
@@ -1861,6 +1935,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
        {
            IClientAPI client = null;
+            bool createNew = false;
            // We currently synchronize this code across the whole scene to avoid issues such as
            // http://opensimulator.org/mantis/view.php?id=5365  However, once locking per agent circuit can be done
@@ -1869,14 +1944,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                if (!Scene.TryGetClient(agentID, out client))
                {
+                    createNew = true;
+                }
+                else
+                {
+                    if (client.SceneAgent == null)
+                    {
+                        Scene.CloseAgent(agentID, true);
+                        createNew = true;
+                    }
+                }
+                if (createNew)
+                {
                    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();
                }
            }
@@ -1893,56 +1982,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </remarks>
        /// <param name='client'></param>
        /// <param name='timeoutTicks'></param>
-        private void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
+        protected void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
        {
            lock (client.CloseSyncLock)
-            {    
+            {
                ClientLogoutsDueToNoReceives++;
-                m_log.WarnFormat(
+                if (client.SceneAgent != null)
-                    "[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);
+                    m_log.WarnFormat(
-    
+                        "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
-                if (!client.SceneAgent.IsChildAgent)
+                        client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, Scene.Name);
-                     client.Kick("Simulator logged you out due to connection timeout.");
+                    if (!client.SceneAgent.IsChildAgent)
+                         client.Kick("Simulator logged you out due to connection timeout.");
+                }
            }
-            Scene.CloseAgent(client.AgentId, true);
+            if (!Scene.CloseAgent(client.AgentId, true))
+                client.Close(true,true);
        }
-        private void IncomingPacketHandler()
+        protected void IncomingPacketHandler()
        {
            Thread.CurrentThread.Priority = ThreadPriority.Highest;
+            IncomingPacket incomingPacket;
            // Set this culture for the thread that incoming packets are received
            // on to en-US to avoid number parsing issues
            Culture.SetCurrentCulture();
            while (IsRunningInbound)
            {
+                Scene.ThreadAlive(1);
                try
                {
-                    IncomingPacket incomingPacket = null;
+                    incomingPacket = packetInbox.Dequeue(250);
-                    /*
-                    // HACK: This is a test to try and rate limit packet handling on Mono.
-                    // If it works, a more elegant solution can be devised
-                    if (Util.FireAndForgetCount() < 2)
-                    {
-                        //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
-                        Thread.Sleep(30);
-                    }
-                     */
-                    if (packetInbox.Dequeue(100, ref incomingPacket))
+                    if (incomingPacket != null && IsRunningInbound)
                    {
-                        ProcessInPacket(incomingPacket);//, incomingPacket); Util.FireAndForget(ProcessInPacket, incomingPacket);
+                        ProcessInPacket(incomingPacket);
                        if (UsePools)
+                        {
+                            incomingPacket.Client = null;
                            m_incomingPacketPool.ReturnObject(incomingPacket);
+                        }
+                        incomingPacket = null;
                    }
                }
-                catch (Exception ex)
+                catch(Exception ex)
                {
                    m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex);
                }
@@ -1950,14 +2038,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                Watchdog.UpdateThread();
            }
-            if (packetInbox.Count > 0)
+            if (packetInbox.Count() > 0)
-                m_log.Warn("[LLUDPSERVER]: IncomingPacketHandler is shutting down, dropping " + packetInbox.Count + " packets");
+                m_log.Warn("[LLUDPSERVER]: IncomingPacketHandler is shutting down, dropping " + packetInbox.Count() + " packets");
            packetInbox.Clear();
            Watchdog.RemoveThread();
        }
-        private void OutgoingPacketHandler()
+        protected void OutgoingPacketHandler()
        {
            Thread.CurrentThread.Priority = ThreadPriority.Highest;
@@ -1971,6 +2059,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            while (base.IsRunningOutbound)
            {
+                Scene.ThreadAlive(2);
                try
                {
                    m_packetSent = false;
@@ -1982,19 +2073,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    m_sendPing = false;
                    // Update elapsed time
-                    int thisTick = Environment.TickCount & Int32.MaxValue;
+                    double thisTick = Util.GetTimeStampMS();
-                    if (m_tickLastOutgoingPacketHandler > thisTick)
-                        m_elapsedMSOutgoingPacketHandler += ((Int32.MaxValue - m_tickLastOutgoingPacketHandler) + thisTick);
-                    else
-                        m_elapsedMSOutgoingPacketHandler += (thisTick - m_tickLastOutgoingPacketHandler);
+                    // update some 1ms resolution chained timers
+                    m_elapsedMSOutgoingPacketHandler +=  thisTick - m_tickLastOutgoingPacketHandler;
                    m_tickLastOutgoingPacketHandler = thisTick;
                    // Check for pending outgoing resends every 100ms
-                    if (m_elapsedMSOutgoingPacketHandler >= 100)
+                    if (m_elapsedMSOutgoingPacketHandler >= 100.0)
                    {
                        m_resendUnacked = true;
-                        m_elapsedMSOutgoingPacketHandler = 0;
+                        m_elapsedMSOutgoingPacketHandler = 0.0;
                        m_elapsed100MSOutgoingPacketHandler += 1;
                    }
@@ -2012,15 +2101,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        m_sendPing = true;
                        m_elapsed500MSOutgoingPacketHandler = 0;
                    }
                    #endregion Update Timers
-                    // Use this for emergency monitoring -- bug hunting
-                    //if (m_scene.EmergencyMonitoring)
-                    //    clientPacketHandler = MonitoredClientOutgoingPacketHandler;
-                    //else
-                    //    clientPacketHandler = ClientOutgoingPacketHandler;
                    // Handle outgoing packets, resends, acknowledgements, and pings for each
                    // client. m_packetSent will be set to true if a packet is sent
                    Scene.ForEachClient(clientPacketHandler);
@@ -2029,13 +2111,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    // If nothing was sent, sleep for the minimum amount of time before a
                    // token bucket could get more tokens
-                    //if (!m_packetSent)
-                    //    Thread.Sleep((int)TickCountResolution);
+                    if(Scene.GetNumberOfClients() == 0)
-                    //
+                    {
-                    // Instead, now wait for data present to be explicitly signalled.  Evidence so far is that with
+                        Thread.Sleep(100);
-                    // modern mono it reduces CPU base load since there is no more continuous polling.
+                    }
-                    if (!m_packetSent)
+                    else if (!m_packetSent)
-                        m_dataPresentEvent.WaitOne(100);
+//                        Thread.Sleep((int)TickCountResolution);  outch this is bad on linux
+                        Thread.Sleep(15); // match the 16ms of windows7, dont ask 16 or win may decide to do 32ms.
                    Watchdog.UpdateThread();
                }
@@ -2061,7 +2144,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (udpClient.IsConnected)
                    {
-                        if (udpClient.ProcessUnackedSends && m_resendUnacked)
+                        if (m_resendUnacked)
                            HandleUnacked(llClient);
                        if (m_sendAcks)
@@ -2086,160 +2169,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Emergency Monitoring
        // Alternative packet handler fuull of instrumentation
        // Handy for hunting bugs
-        private Stopwatch watch1 = new Stopwatch();
+        protected Stopwatch watch1 = new Stopwatch();
-        private Stopwatch watch2 = new Stopwatch();
+        protected Stopwatch watch2 = new Stopwatch();
-        private float avgProcessingTicks = 0;
+        protected float avgProcessingTicks = 0;
-        private float avgResendUnackedTicks = 0;
+        protected float avgResendUnackedTicks = 0;
-        private float avgSendAcksTicks = 0;
+        protected float avgSendAcksTicks = 0;
-        private float avgSendPingTicks = 0;
+        protected float avgSendPingTicks = 0;
-        private float avgDequeueTicks = 0;
+        protected float avgDequeueTicks = 0;
-        private long nticks = 0;
+        protected long nticks = 0;
-        private long nticksUnack = 0;
+        protected long nticksUnack = 0;
-        private long nticksAck = 0;
+        protected long nticksAck = 0;
-        private long nticksPing = 0;
+        protected long nticksPing = 0;
-        private int npacksSent = 0;
+        protected int npacksSent = 0;
-        private int npackNotSent = 0;
+        protected int npackNotSent = 0;
        /// <summary>
        /// Number of inbound packets processed since startup.
        /// </summary>
-        public long IncomingPacketsProcessed { get; private set; }
+        public long IncomingPacketsProcessed { get; protected set; }
-        private void MonitoredClientOutgoingPacketHandler(IClientAPI client)
-        {
-            nticks++;
-            watch1.Start();
-            m_currentOutgoingClient = client;
-            try
-            {
-                if (client is LLClientView)
-                {
-                    LLClientView llClient = (LLClientView)client;
-                    LLUDPClient udpClient = llClient.UDPClient;
-                    if (udpClient.IsConnected)
+        #endregion
-                    {
-                        if (m_resendUnacked)
-                        {
-                            nticksUnack++;
-                            watch2.Start();
-                            HandleUnacked(llClient);
-                            watch2.Stop();
-                            avgResendUnackedTicks = (nticksUnack - 1)/(float)nticksUnack * avgResendUnackedTicks + (watch2.ElapsedTicks / (float)nticksUnack);
-                            watch2.Reset();
-                        }
-                        if (m_sendAcks)
-                        {
-                            nticksAck++;
-                            watch2.Start();
-                            
-                            SendAcks(udpClient);
-                            watch2.Stop();
-                            avgSendAcksTicks = (nticksAck - 1) / (float)nticksAck * avgSendAcksTicks + (watch2.ElapsedTicks / (float)nticksAck);
-                            watch2.Reset();
-                        }
-                        if (m_sendPing)
-                        {
-                            nticksPing++;
-                            watch2.Start();
-                            
-                            SendPing(udpClient);
-                            watch2.Stop();
+        protected void ProcessInPacket(IncomingPacket incomingPacket)
-                            avgSendPingTicks = (nticksPing - 1) / (float)nticksPing * avgSendPingTicks + (watch2.ElapsedTicks / (float)nticksPing);
+        {
-                            watch2.Reset();
+            Packet packet = incomingPacket.Packet;
-                        }
+            LLClientView client = incomingPacket.Client;
-                        watch2.Start();
+            if(!client.IsActive)
-                        // Dequeue any outgoing packets that are within the throttle limits
+                return;
-                        if (udpClient.DequeueOutgoing())
-                        {
-                            m_packetSent = true;
-                            npacksSent++;
-                        }
-                        else
-                        {
-                            npackNotSent++;
-                        }
-                        watch2.Stop();
+            m_currentIncomingClient = client;
-                        avgDequeueTicks = (nticks - 1) / (float)nticks * avgDequeueTicks + (watch2.ElapsedTicks / (float)nticks);
-                        watch2.Reset();
-                    }
+            try
-                    else
-                    {
-                        m_log.WarnFormat("[LLUDPSERVER]: Client is not connected");
-                    }
-                }
-            }
-            catch (Exception ex)
            {
-                m_log.Error("[LLUDPSERVER]: OutgoingPacketHandler iteration for " + client.Name +
+                // Process this packet
-                    " threw an exception: " + ex.Message, ex);
+                client.ProcessInPacket(packet);
            }
-            watch1.Stop();
+            catch(ThreadAbortException)
-            avgProcessingTicks = (nticks - 1) / (float)nticks * avgProcessingTicks + (watch1.ElapsedTicks / (float)nticks);
-            watch1.Reset();
-            // reuse this -- it's every ~100ms
-            if (Scene.EmergencyMonitoring && nticks % 100 == 0)
            {
-                m_log.InfoFormat("[LLUDPSERVER]: avg processing ticks: {0} avg unacked: {1} avg acks: {2} avg ping: {3} avg dequeue: {4} (TickCountRes: {5} sent: {6} notsent: {7})", 
+                // If something is trying to abort the packet processing thread, take that as a hint that it's time to shut down
-                    avgProcessingTicks, avgResendUnackedTicks, avgSendAcksTicks, avgSendPingTicks, avgDequeueTicks, TickCountResolution, npacksSent, npackNotSent);
+                m_log.Info("[LLUDPSERVER]: Caught a thread abort, shutting down the LLUDP server");
-                npackNotSent = npacksSent = 0;
+                Stop();
            }
+            catch(Exception e)
-        }
-        #endregion 
-        private void ProcessInPacket(IncomingPacket incomingPacket)
-        {
-            Packet packet = incomingPacket.Packet;
-            LLClientView client = incomingPacket.Client;
-            if (client.IsActive)
            {
-                m_currentIncomingClient = client;
+                // Don't let a failure in an individual client thread crash the whole sim.
+                m_log.Error(
-                try
+                    string.Format(
-                {
+                        "[LLUDPSERVER]: Client packet handler for {0} for packet {1} threw ",
-                    // Process this packet
+                        client.Name,packet.Type),
-                    client.ProcessInPacket(packet);
+                    e);
-                }
-                catch (ThreadAbortException)
-                {
-                    // If something is trying to abort the packet processing thread, take that as a hint that it's time to shut down
-                    m_log.Info("[LLUDPSERVER]: Caught a thread abort, shutting down the LLUDP server");
-                    Stop();
-                }
-                catch (Exception e)
-                {
-                    // Don't let a failure in an individual client thread crash the whole sim.
-                    m_log.Error(
-                        string.Format(
-                            "[LLUDPSERVER]: Client packet handler for {0} for packet {1} threw ",
-                            client.Name, packet.Type),
-                        e);
-                }
-                finally
-                {
-                    m_currentIncomingClient = null;
-                }
            }
-            else
+            finally
            {
-                m_log.DebugFormat(
+                m_currentIncomingClient = null;
-                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
-                    packet.Type, client.Name, Scene.RegionInfo.RegionName);
            }
            IncomingPacketsProcessed++;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index ac6c0b4..012a57d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -48,11 +48,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void Register()
        {
+/*
            m_console.Commands.AddCommand(
                "Comms", false, "show server throttles",
                "show server throttles",
                "Show information about server throttles",
-                HandleShowServerThrottlesCommand); 
+                HandleShowServerThrottlesCommand);
            m_console.Commands.AddCommand(
                "Debug", false, "debug lludp packet",
@@ -206,13 +207,14 @@ 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.",
                "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.",
                HandleClientSetCommand);
+*/
        }
        private void HandleShowServerThrottlesCommand(string module, string[] args)
@@ -224,24 +226,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ConsoleDisplayList cdl = new ConsoleDisplayList();
            cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
-            long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate;
+            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",
@@ -252,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",
@@ -263,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                "kb/s",
                "kb/s",
                "kb/s",
-                "kb/s");     
+                "kb/s");
            ThrottleRates throttleRates = udpServer.ThrottleRates;
            report.AppendFormat(
@@ -275,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,
                "");
        }
@@ -373,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];
@@ -465,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;
@@ -489,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());
@@ -505,14 +507,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name);
            ConsoleDisplayList cdl = new ConsoleDisplayList();
-            long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate;
+            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());
@@ -527,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];
@@ -550,12 +552,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else
            {
-                return; 
+                return;
            }
            m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
        }
+/* not in use, nothing to set/get from lludp
        private void HandleClientGetCommand(string module, string[] args)
        {
            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
@@ -582,11 +585,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        m_console.OutputFormat(
                            "Client debug parameters for {0} ({1}) in {2}",
                            sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
-                        ConsoleDisplayList cdl = new ConsoleDisplayList();
-                        cdl.AddRow("process-unacked-sends", udpClient.ProcessUnackedSends);
-                        m_console.Output(cdl.ToString());
                    }
                });
        }
@@ -600,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];
@@ -609,28 +607,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (args.Length == 8)
                name = string.Format("{0} {1}", args[6], args[7]);
+            // nothing here now
-            if (param == "process-unacked-sends")
-            {
-                bool newValue;
-                if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newValue))
-                    return;
-                m_udpServer.Scene.ForEachScenePresence(
-                    sp =>
-                    {
-                        if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView)
-                        {
-                            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
-                            udpClient.ProcessUnackedSends = newValue;
-                            m_console.OutputFormat("{0} set to {1} for {2} in {3}", param, newValue, sp.Name, m_udpServer.Scene.Name);
-                        }
-                    });
-            }
        }
+*/
        private void HandlePacketCommand(string module, string[] args)
        {
            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
@@ -718,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(
@@ -741,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(
@@ -889,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 f62dc15..f362b06 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.
 */
@@ -57,9 +57,6 @@ namespace OpenMetaverse
        /// <summary>UDP socket, used in either client or server mode</summary>
        private Socket m_udpSocket;
-        /// <summary>Flag to process packets asynchronously or synchronously</summary>
-        private bool m_asyncPacketHandling;
        /// <summary>
        /// Are we to use object pool(s) to reduce memory churn when receiving data?
        /// </summary>
@@ -107,13 +104,18 @@ namespace OpenMetaverse
        /// </summary>
        public float AverageReceiveTicksForLastSamplePeriod { get; private set; }
+        public int Port
+        {
+            get { return m_udpPort; }
+        }
        #region PacketDropDebugging
        /// <summary>
        /// For debugging purposes only... random number generator for dropping
        /// 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
@@ -132,7 +134,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>
@@ -179,11 +181,16 @@ namespace OpenMetaverse
            // m_dropRandomGenerator = new Random();
        }
+        ~OpenSimUDPBase()
+        {
+            if(m_udpSocket !=null)
+                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
@@ -195,10 +202,8 @@ namespace OpenMetaverse
        /// manner (not throwing an exception when the remote side resets the
        /// connection). This call is ignored on Mono where the flag is not
        /// necessary</remarks>
-        public virtual void StartInbound(int recvBufferSize, bool asyncPacketHandling)
+        public virtual void StartInbound(int recvBufferSize)
        {
-            m_asyncPacketHandling = asyncPacketHandling;
            if (!IsRunningInbound)
            {
                m_log.DebugFormat("[UDPBASE]: Starting inbound UDP loop");
@@ -206,10 +211,6 @@ namespace OpenMetaverse
                const int SIO_UDP_CONNRESET = -1744830452;
                IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
-                
-                m_log.DebugFormat(
-                    "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}", 
-                    ipep.Address, ipep.Port);                
                m_udpSocket = new Socket(
                    AddressFamily.InterNetwork,
@@ -227,14 +228,23 @@ namespace OpenMetaverse
                {
                    m_log.Debug("[UDPBASE]: Failed to increase default TTL");
                }
                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);
+                    // Try does not protect some mono versions on mac
-                    m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set");
+                    if(Util.IsWindows())
+                    {
+                        m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
+                        m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set");
+                    }               
+                    else
+                    {
+                        m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring");
+                    }
                }
-                catch (SocketException)
+                catch
                {
                    m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring");
                }
@@ -243,13 +253,22 @@ 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.
-                m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
+                //
+                // 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
+                // crashing rather than closing it. While this protects agains misconfiguration,
+                // 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
+                // m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
                if (recvBufferSize != 0)
                    m_udpSocket.ReceiveBufferSize = recvBufferSize;
                m_udpSocket.Bind(ipep);
+                if (m_udpPort == 0)
+                    m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port;
                IsRunningInbound = true;
                // kick off an async receive.  The Start() method will return, the
@@ -319,7 +338,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)
@@ -372,8 +391,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);
                }
@@ -392,12 +411,7 @@ namespace OpenMetaverse
            if (IsRunningInbound)
            {
                UdpReceives++;
+ 
-                // Asynchronous mode will start another receive before the
-                // callback for this packet is even fired. Very parallel :-)
-                if (m_asyncPacketHandling)
-                    AsyncBeginReceive();
                try
                {
                    // get the buffer that was created in AsyncBeginReceive
@@ -419,7 +433,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;
@@ -431,16 +445,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);
                }
@@ -454,10 +468,7 @@ namespace OpenMetaverse
 //                    if (UsePools)
 //                        Pool.ReturnObject(buffer);
-                    // Synchronous mode waits until the packet callback completes
+                    AsyncBeginReceive();
-                    // before starting the receive to fetch another packet
-                    if (!m_asyncPacketHandling)
-                        AsyncBeginReceive();
                }
            }
        }
@@ -471,7 +482,7 @@ namespace OpenMetaverse
                // packets when testing throttles & retransmission code
                // if (DropOutgoingPacket())
                //     return;
-            
                try
                {
                    m_udpSocket.BeginSendTo(
@@ -485,7 +496,7 @@ namespace OpenMetaverse
                }
                catch (SocketException) { }
                catch (ObjectDisposedException) { }
-//            }
+ //           }
        }
        void AsyncEndSend(IAsyncResult result)
@@ -500,5 +511,25 @@ namespace OpenMetaverse
            catch (SocketException) { }
            catch (ObjectDisposedException) { }
        }
+        public void SyncSend(UDPPacketBuffer buf)
+        {
+            try
+            {
+                m_udpSocket.SendTo(
+                    buf.Data,
+                    0,
+                    buf.DataLength,
+                    SocketFlags.None,
+                    buf.RemoteEndPoint
+                    );
+                 UdpSends++;
+            }
+            catch (SocketException e)
+            {
+                m_log.Warn("[UDPBASE]: sync send SocketException {0} " + e.Message);
+            }
+            catch (ObjectDisposedException) { }
+        }
    }
-}
-\ No newline at end of file
+}
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 bf505b4..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,11 +26,11 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 [assembly: Addin("LindenUDP", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a935dd2..eb262d2 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,13 +84,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            odb.Name = Utils.StringToBytes(objectName);
 //            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
 //            onp.Header.Zerocoded = false;
-//            
+//
 //            return onp;
 //        }
 //
        /// <summary>
        /// Test adding a client to the stack
        /// </summary>
+/*        
        [Test]
        public void TestAddClient()
        {
@@ -156,7 +157,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);
@@ -165,7 +166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            ScenePresence spAfterAckTimeout = m_scene.GetScenePresence(sp.UUID);
            Assert.That(spAfterAckTimeout, Is.Null);
        }
+*/
 //        /// <summary>
 //        /// Test removing a client from the stack
 //        /// </summary>
@@ -175,21 +176,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 +201,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 +214,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 +240,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 3c82a78..873b1e5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
@@ -35,6 +35,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
+    /*
    [TestFixture]
    public class ThrottleTests : OpenSimTestCase
    {
@@ -57,16 +58,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        [Test]
        public void TestSetRequestDripRate()
        {
            TestHelpers.InMethod();
-            TokenBucket tb = new TokenBucket("tb", null, 5000, 0);
+            TokenBucket tb = new TokenBucket(null, 5000f,10000f);
            AssertRates(tb, 5000, 0, 5000, 0);
-            tb.RequestedDripRate = 4000;
+            tb.RequestedDripRate = 4000f;
            AssertRates(tb, 4000, 0, 4000, 0);
            tb.RequestedDripRate = 6000;
            AssertRates(tb, 6000, 0, 6000, 0);
        }
        [Test]
@@ -74,7 +77,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        {
            TestHelpers.InMethod();
-            TokenBucket tb = new TokenBucket("tb", null, 5000, 10000);
+            TokenBucket tb = new TokenBucket(null, 5000,15000);
            AssertRates(tb, 5000, 0, 5000, 10000);
            tb.RequestedDripRate = 4000;
@@ -92,9 +95,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        {
            TestHelpers.InMethod();
-            TokenBucket tbParent = new TokenBucket("tbParent", null, 0, 0);
+            TokenBucket tbParent = new TokenBucket("tbParent", null, 0);
-            TokenBucket tbChild1 = new TokenBucket("tbChild1", tbParent, 3000, 0);
+            TokenBucket tbChild1 = new TokenBucket("tbChild1", tbParent, 3000);
-            TokenBucket tbChild2 = new TokenBucket("tbChild2", tbParent, 5000, 0);
+            TokenBucket tbChild2 = new TokenBucket("tbChild2", tbParent, 5000);
            AssertRates(tbParent, 8000, 8000, 8000, 0);
            AssertRates(tbChild1, 3000, 0, 3000, 0);
@@ -113,6 +116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            AssertRates(tbParent, 6000, 8000, 6000, 0);
            AssertRates(tbChild1, 3000, 0, 6000 / 8 * 3, 0);
            AssertRates(tbChild2, 5000, 0, 6000 / 8 * 5, 0);
        }
        private void AssertRates(
@@ -133,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);
@@ -141,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;
@@ -157,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);
        }
@@ -177,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);
@@ -203,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);
@@ -213,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);
@@ -223,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);
        }
@@ -244,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);
@@ -261,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
@@ -277,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);
        }
@@ -303,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);
@@ -321,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);
        }
@@ -348,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);
@@ -359,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
@@ -375,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");
@@ -424,4 +428,5 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            udpClient.SetThrottles(throttles);
        }
    }
+     */
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 7a2756b..f8ec97a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -58,17 +58,20 @@ 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;
+        public int ClientMaxRate;
+        public float BrustTime;
        /// <summary>
        /// Default constructor
        /// </summary>
@@ -88,13 +91,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                Texture = throttleConfig.GetInt("texture_default", 18500);
                Asset = throttleConfig.GetInt("asset_default", 10500);
-                Total = throttleConfig.GetInt("client_throttle_max_bps", 0);
+                Total = Resend + Land + Wind + Cloud + Task + Texture + Asset;
+                // 5120000 bps default max
+                ClientMaxRate = throttleConfig.GetInt("client_throttle_max_bps", 640000);
+                if (ClientMaxRate > 1000000)
+                    ClientMaxRate = 1000000; // no more than 8Mbps
-                AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
+                BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10);
+                BrustTime *= 1e-3f;
+                // Adaptive is broken
+//                AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
+                AdaptiveThrottlesEnabled = false;
                MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000);
-                CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
+                // http textures do use udp bandwidth setting
-                CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
+//                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 4616203..1daf091 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
@@ -43,150 +43,143 @@ namespace OpenSim.Region.ClientStack.LindenUDP
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string Identifier { get; private set; }
+        private static Int32 m_counter = 0;
-        public int DebugLevel { get; set; }
+//        private Int32 m_identifier;
-        
-        /// <summary>
+        protected const float m_timeScale = 1e-3f;
-        /// Number of ticks (ms) per quantum, drip rate and max burst
-        /// are defined over this interval.
-        /// </summary>
-        protected const Int32 m_ticksPerQuantum = 1000;
        /// <summary>
-        /// This is the number of quantums worth of packets that can
+        /// This is the number of m_minimumDripRate bytes
-        /// be accommodated during a burst
+        /// allowed in a burst
+        /// roughtly, with this settings, the maximum time system will take
+        /// to recheck a bucket in ms
+        ///
        /// </summary>
-        protected const Double m_quantumsPerBurst = 1.5;
+        protected const float m_quantumsPerBurst = 5;
-                
        /// <summary>
        /// </summary>
-        protected const Int32 m_minimumDripRate = LLUDPServer.MTU;
+        protected const float m_minimumDripRate = 1500;
-        
-        /// <summary>Time of the last drip, in system ticks</summary>
+        /// <summary>Time of the last drip</summary>
-        protected Int32 m_lastDrip;
+        protected double m_lastDrip;
        /// <summary>
        /// The number of bytes that can be sent at this moment. This is the
        /// current number of tokens in the bucket
        /// </summary>
-        protected Int64 m_tokenCount;
+        protected float m_tokenCount;
        /// <summary>
        /// Map of children buckets and their requested maximum burst rate
        /// </summary>
-        protected Dictionary<TokenBucket,Int64> m_children = new Dictionary<TokenBucket,Int64>();
+        protected Dictionary<TokenBucket, float> m_children = new Dictionary<TokenBucket, float>();
+#region Properties
        /// <summary>
        /// The parent bucket of this bucket, or null if this bucket has no
        /// parent. The parent bucket will limit the aggregate bandwidth of all
        /// of its children buckets
        /// </summary>
-        public TokenBucket Parent { get; protected set; }
+        protected TokenBucket m_parent;
+        public TokenBucket Parent
+        {
+            get { return m_parent; }
+            set { m_parent = value; }
+        }
        /// <summary>
-        /// Maximum burst rate in bytes per second. This is the maximum number
+        /// 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 Int64 m_burstRate;
+        protected float m_burst;
-        public Int64 RequestedBurstRate
+        protected float m_maxDripRate = 0;
+        public virtual float MaxDripRate
        {
-            get { return m_burstRate; }
+            get { return m_maxDripRate; }
-            set { m_burstRate = (value < 0 ? 0 : value); }
+            set { m_maxDripRate = value; }
        }
-        public Int64 BurstRate
+        public float RequestedBurst
        {
-            get {
+            get { return m_burst; }
-                double rate = RequestedBurstRate * BurstRateModifier();
+            set {
-                if (rate < m_minimumDripRate * m_quantumsPerBurst)
+                float rate = (value < 0 ? 0 : value);
+                if (rate < 1.5f * m_minimumDripRate)
+                    rate = 1.5f * m_minimumDripRate;
+                else if (rate > m_minimumDripRate * m_quantumsPerBurst)
                    rate = m_minimumDripRate * m_quantumsPerBurst;
-                
-                return (Int64) rate;
+                m_burst = rate;
+                }
+        }
+        public float Burst
+        {
+            get {
+                float rate = RequestedBurst * BurstModifier();
+                if (rate < m_minimumDripRate)
+                    rate = m_minimumDripRate;
+                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)
+        /// the system tick interval (typically around 15-22ms)</remarks>
-        /// FIXME: It is extremely confusing to be able to set a RequestedDripRate of 0 and then receive a positive
+        protected float m_dripRate;
-        /// number on get if TotalDripRequest is set.  This also stops us being able to retrieve the fact that
-        /// RequestedDripRate is set to 0.  Really, this should always return m_dripRate and then we can get
-        /// (m_dripRate == 0 ? TotalDripRequest : m_dripRate) on some other properties.
-        /// </remarks>
-        public virtual Int64 RequestedDripRate
-        {
-            get { return (m_dripRate == 0 ? TotalDripRequest : m_dripRate); }
-            set 
-            {
-                if (value <= 0)
-                    m_dripRate = 0;
-                else if (MaxDripRate > 0 && value > MaxDripRate)
-                    m_dripRate = MaxDripRate;
-                else
-                    m_dripRate = value;
-                m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
+        public float RequestedDripRate
+        {
+            get { return (m_dripRate == 0 ? m_totalDripRequest : m_dripRate); }
+            set {
+                m_dripRate = (value < 0 ? 0 : value);
+                m_totalDripRequest = m_dripRate;
-                if (Parent != null)
+                if (m_parent != null)
-                    Parent.RegisterRequest(this, m_dripRate);
+                    m_parent.RegisterRequest(this,m_dripRate);
            }
        }
-        /// <summary>
+       public float DripRate
-        /// Gets the drip rate.
-        /// </summary>
-        /// <value>
-        /// DripRate can never be above max drip rate or below min drip rate.
-        /// If we are a child bucket then the drip rate return is modifed by the total load on the capacity of the
-        /// parent bucket.
-        /// </value>
-        public virtual Int64 DripRate
        {
-            get 
+            get {
-            {
+                float rate = Math.Min(RequestedDripRate,TotalDripRequest);
-                double rate;
+                if (m_parent == null)
+                    return rate;
-                // FIXME: This doesn't properly work if we have a parent and children and a requested drip rate set
-                // on ourselves which is not equal to the child drip rates.
-                if (Parent == null)
-                {
-                    if (TotalDripRequest > 0)
-                        rate = Math.Min(RequestedDripRate, TotalDripRequest);
-                    else
-                        rate = RequestedDripRate;
-                }   
-                else
-                {
-                    rate = (double)RequestedDripRate * Parent.DripRateModifier();
-                }
+                rate *= m_parent.DripRateModifier();
                if (rate < m_minimumDripRate)
                    rate = m_minimumDripRate;
-                else if (MaxDripRate > 0 && rate > MaxDripRate)
-                    rate = MaxDripRate;
-                return (Int64)rate;
+                return (float)rate;
            }
        }
-        protected Int64 m_dripRate;
-        // <summary>
-        // The maximum rate for flow control. Drip rate can never be greater than this.
-        // </summary>
-        public Int64 MaxDripRate { get; set; }
        /// <summary>
        /// The current total of the requested maximum burst rates of children buckets.
        /// </summary>
-        public Int64 TotalDripRequest { get; protected set; }
+        protected float m_totalDripRequest;
+        public float TotalDripRequest
+        {
+            get { return m_totalDripRequest; }
+            set { m_totalDripRequest = value; }
+        }
+#endregion Properties
+#region Constructor
        /// <summary>
        /// Default constructor
@@ -194,20 +187,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="identifier">Identifier for this token bucket</param>
        /// <param name="parent">Parent bucket if this is a child bucket, or
        /// null if this is a root bucket</param>
-        /// <param name="requestedDripRate">
+        /// <param name="maxBurst">Maximum size of the bucket in bytes, or
-        /// Requested rate that the bucket fills, in bytes per
+        /// zero if this bucket has no maximum capacity</param>
-        /// second. If zero, the bucket always remains full.
+        /// <param name="dripRate">Rate that the bucket fills, in bytes per
-        /// </param>
+        /// second. If zero, the bucket always remains full</param>
-        public TokenBucket(string identifier, TokenBucket parent, Int64 requestedDripRate, Int64 maxDripRate) 
+        public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst)
        {
-            Identifier = identifier;
+            m_counter++;
            Parent = parent;
-            RequestedDripRate = requestedDripRate;
+            RequestedDripRate = dripRate;
-            MaxDripRate = maxDripRate;
+            RequestedBurst = MaxBurst;
-            m_lastDrip = Util.EnvironmentTickCount();
+            m_lastDrip = Util.GetTimeStampMS() + 100000.0; // skip first drip
        }
+#endregion Constructor
        /// <summary>
        /// Compute a modifier for the MaxBurst rate. This is 1.0, meaning
        /// no modification if the requested bandwidth is less than the
@@ -215,22 +210,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// hierarchy. However, if any of the parents is over-booked, then
        /// the modifier will be less than 1.
        /// </summary>
-        protected double DripRateModifier()
+        protected float DripRateModifier()
        {
-            Int64 driprate = DripRate;
+            float driprate = DripRate;
-            double modifier = driprate >= TotalDripRequest ? 1.0 : (double)driprate / (double)TotalDripRequest;
+            return driprate >= TotalDripRequest ? 1.0f : (driprate / TotalDripRequest);
-//            if (DebugLevel > 0)
-//                m_log.DebugFormat(
-//                    "[TOKEN BUCKET]: Returning drip modifier {0}/{1} = {2} from {3}", 
-//                    driprate, TotalDripRequest, modifier, Identifier);
-            return modifier;
        }
        /// <summary>
        /// </summary>
-        protected double BurstRateModifier()
+        protected float BurstModifier()
        {
            // for now... burst rate is always m_quantumsPerBurst (constant)
            // larger than drip rate so the ratio of burst requests is the
@@ -242,29 +230,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// Register drip rate requested by a child of this throttle. Pass the
        /// changes up the hierarchy.
        /// </summary>
-        public void RegisterRequest(TokenBucket child, Int64 request)
+        public void RegisterRequest(TokenBucket child, float request)
        {
            lock (m_children)
            {
                m_children[child] = request;
-                TotalDripRequest = 0;
+                m_totalDripRequest = 0;
-                foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
+                foreach (KeyValuePair<TokenBucket, float> cref in m_children)
-                    TotalDripRequest += cref.Value;
+                    m_totalDripRequest += cref.Value;
            }
-            
-            // Pass the new values up to the parent
-            if (Parent != null)
-            {
-                Int64 effectiveDripRate;
-                if (RequestedDripRate > 0)
-                    effectiveDripRate = Math.Min(RequestedDripRate, TotalDripRequest);
-                else
-                    effectiveDripRate = TotalDripRequest;
-                Parent.RegisterRequest(this, effectiveDripRate);
+            // Pass the new values up to the parent
-            }
+            if (m_parent != null)
+                m_parent.RegisterRequest(this, Math.Min(RequestedDripRate, TotalDripRequest));
        }
        /// <summary>
@@ -277,23 +256,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                m_children.Remove(child);
-                TotalDripRequest = 0;
+                m_totalDripRequest = 0;
-                foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
+                foreach (KeyValuePair<TokenBucket, float> cref in m_children)
-                    TotalDripRequest += cref.Value;
+                    m_totalDripRequest += cref.Value;
            }
            // Pass the new values up to the parent
            if (Parent != null)
                Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
        }
-        
        /// <summary>
        /// Remove a given number of tokens from the bucket
        /// </summary>
        /// <param name="amount">Number of tokens to remove from the bucket</param>
        /// <returns>True if the requested number of tokens were removed from
        /// the bucket, otherwise false</returns>
-        public bool RemoveTokens(Int64 amount)
+        public bool RemoveTokens(int amount)
        {
            // Deposit tokens for this interval
            Drip();
@@ -310,24 +289,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return false;
        }
-        /// <summary>
+        public bool CheckTokens(int amount)
-        /// Deposit tokens into the bucket from a child bucket that did
-        /// not use all of its available tokens
-        /// </summary>
-        protected void Deposit(Int64 count)
        {
-            m_tokenCount += count;
+            return  (m_tokenCount - amount >= 0);
+        }
-            // Deposit the overflow in the parent bucket, this is how we share
+        public int GetCatBytesCanSend(int timeMS)
-            // unused bandwidth
+        {
-            Int64 burstrate = BurstRate;
+//            return (int)(m_tokenCount + timeMS * m_dripRate * 1e-3);
-            if (m_tokenCount > burstrate)
+            return (int)(timeMS * DripRate * 1e-3);
-                m_tokenCount = burstrate;
        }
        /// <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>
@@ -337,128 +312,106 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // with no drip rate...
            if (DripRate == 0)
            {
-                m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0 for {0}", Identifier);
+                m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0 for {0}", m_counter);
                return;
            }
-            
-            // Determine the interval over which we are adding tokens, never add
+            double now = Util.GetTimeStampMS();
-            // more than a single quantum of tokens
+            double deltaMS = now - m_lastDrip;
-            Int32 deltaMS = Math.Min(Util.EnvironmentTickCountSubtract(m_lastDrip), m_ticksPerQuantum);
+            m_lastDrip = now;
-            m_lastDrip = Util.EnvironmentTickCount();
-            // This can be 0 in the very unusual case that the timer wrapped
-            // It can be 0 if we try add tokens at a sub-tick rate
            if (deltaMS <= 0)
                return;
-            Deposit(deltaMS * DripRate / m_ticksPerQuantum);
+            m_tokenCount += (float)deltaMS * DripRate * m_timeScale;
+            float burst = Burst;
+            if (m_tokenCount > burst)
+                m_tokenCount = burst;
        }
    }
    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>
-        /// Target drip rate for this bucket.
+        /// The minimum rate for flow control. Minimum drip rate is one
+        /// packet per second.
        /// </summary>
-        /// <remarks>Usually set by the client.  If adaptive is enabled then throttles will increase until we reach this.</remarks>
-        public Int64 TargetDripRate 
+        protected const float m_minimumFlow = 50000;
-        { 
-            get { return m_targetDripRate; }
+        // <summary>
-            set 
+        // The maximum rate for flow control. Drip rate can never be
+        // greater than this.
+        // </summary>
+        public override float MaxDripRate
+        {
+            get { return (m_maxDripRate == 0 ? m_totalDripRequest : m_maxDripRate); }
+            set
            {
-                m_targetDripRate = Math.Max(value, m_minimumFlow);
+                m_maxDripRate = (value == 0 ? m_totalDripRequest : Math.Max(value, m_minimumFlow));
            }
        }
-        protected Int64 m_targetDripRate;
+        private bool m_enabled = false;
        // <summary>
-        // Adjust drip rate in response to network conditions. 
+        // Adjust drip rate in response to network conditions.
        // </summary>
-        public virtual Int64 AdjustedDripRate
+        public float AdjustedDripRate
        {
            get { return m_dripRate; }
-            set 
+            set
            {
-                m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value, m_minimumFlow, TargetDripRate);
+                m_dripRate = OpenSim.Framework.Util.Clamp<float>(value, m_minimumFlow, MaxDripRate);
-                m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
-                if (Parent != null)
+                if (m_parent != null)
-                    Parent.RegisterRequest(this, m_dripRate);
+                    m_parent.RegisterRequest(this, m_dripRate);
            }
        }
-                
-        /// <summary>
-        /// The minimum rate for adaptive flow control. 
-        /// </summary>
-        protected Int64 m_minimumFlow = 32000;
-        /// <summary>
-        /// Constructor for the AdaptiveTokenBucket class
-        /// <param name="identifier">Unique identifier for the client</param>
-        /// <param name="parent">Parent bucket in the hierarchy</param>
-        /// <param name="requestedDripRate"></param>
-        /// <param name="maxDripRate">The ceiling rate for adaptation</param>
-        /// <param name="minDripRate">The floor rate for adaptation</param>
-        /// </summary>
-        public AdaptiveTokenBucket(string identifier, TokenBucket parent, Int64 requestedDripRate, Int64 maxDripRate, Int64 minDripRate, bool enabled) 
-            : base(identifier, parent, requestedDripRate, maxDripRate)
-        {
-            AdaptiveEnabled = enabled;
-            if (AdaptiveEnabled)
+        // <summary>
-            {
+        //
-//                m_log.DebugFormat("[TOKENBUCKET]: Adaptive throttle enabled");
+        // </summary>
-                m_minimumFlow = minDripRate;
+        public AdaptiveTokenBucket(TokenBucket parent, float maxDripRate, float maxBurst, bool enabled)
-                TargetDripRate = m_minimumFlow;
+            : base(parent, maxDripRate, maxBurst)
-                AdjustedDripRate = m_minimumFlow;
-            }
-        }
-                
-        /// <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>
-        /// </summary>
-        public void ExpirePackets(Int32 packets)
        {
-            if (AdaptiveEnabled)
+            m_enabled = enabled;
-            {
-                if (DebugLevel > 0)
-                    m_log.WarnFormat(
-                        "[ADAPTIVEBUCKET] drop {0} by {1} expired packets for {2}", 
-                        AdjustedDripRate, packets, Identifier);
-                // AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,packets));
+            m_maxDripRate = (maxDripRate == 0 ? m_totalDripRequest : Math.Max(maxDripRate, m_minimumFlow));
-                // Compute the fallback solely on the rate allocated beyond the minimum, this
+            if (enabled)
-                // should smooth out the fallback to the minimum rate
+                m_dripRate = m_maxDripRate * .5f;
-                AdjustedDripRate = m_minimumFlow + (Int64) ((AdjustedDripRate - m_minimumFlow) / Math.Pow(2, packets));
+            else
-            }
+                m_dripRate = m_maxDripRate;
+            if (m_parent != null)
+                m_parent.RegisterRequest(this, m_dripRate);
        }
        /// <summary>
-        /// Reliable packets acked by the client adjust the drip rate up.
+        /// Reliable packets sent to the client for which we never received an ack adjust the drip rate down.
-        /// <param name="packets">Number of packets successfully acknowledged</param>
+        /// <param name="packets">Number of packets that expired without successful delivery</param>
        /// </summary>
-        public void AcknowledgePackets(Int32 packets)
+        public void ExpirePackets(Int32 count)
        {
-            if (AdaptiveEnabled)
+            // m_log.WarnFormat("[ADAPTIVEBUCKET] drop {0} by {1} expired packets",AdjustedDripRate,count);
-                AdjustedDripRate = AdjustedDripRate + packets * LLUDPServer.MTU;
+            if (m_enabled)
+                AdjustedDripRate = (Int64)(AdjustedDripRate / Math.Pow(2, count));
        }
-        /// <summary>
+        // <summary>
-        /// Adjust the minimum flow level for the adaptive throttle, this will drop adjusted
+        //
-        /// throttles back to the minimum levels
+        // </summary>
-        /// <param>minDripRate--the new minimum flow</param>
+        public void AcknowledgePackets(Int32 count)
-        /// </summary>
-        public void ResetMinimumAdaptiveFlow(Int64 minDripRate)
        {
-            m_minimumFlow = minDripRate;
+            if (m_enabled)
-            TargetDripRate = m_minimumFlow;
+                AdjustedDripRate = AdjustedDripRate + count;
-            AdjustedDripRate = m_minimumFlow;
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
index b546a99..76f4c6f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
@@ -74,6 +74,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Holds information about pending removals</summary>
        private LocklessQueue<uint> m_pendingRemoves = new LocklessQueue<uint>();
+        public void Clear()
+        {
+            m_packets.Clear();
+            m_pendingAdds = null;
+            m_pendingAcknowledgements = null;
+            m_pendingRemoves = null;
+        }
        /// <summary>
        /// Add an unacked packet to the collection
        /// </summary>
@@ -85,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>
@@ -107,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
@@ -146,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;
@@ -163,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);
                    }
                }
@@ -182,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))
@@ -219,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);
                }
            }