1 files changed, 921 insertions, 573 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e47397d..ef1d803 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -101,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;
@@ -128,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;
@@ -161,6 +163,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;
@@ -259,7 +262,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;
@@ -290,10 +293,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;
        #endregion Events
@@ -322,11 +327,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private readonly byte[] m_channelVersion = Utils.EmptyBytes;
        private readonly IGroupsModule m_GroupsModule;
+        private int m_cachedTextureSerial;
        private PriorityQueue m_entityUpdates;
        private PriorityQueue m_entityProps;
        private Prioritizer m_prioritizer;
        private bool m_disableFacelights = false;
+        private bool m_VelocityInterpolate = false;
+        private const uint MaxTransferBytesPerPacket = 600;
        /// <value>
        /// List used in construction of data blocks for an object update packet.  This is to stop us having to
        /// continually recreate it.
@@ -338,13 +348,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// 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 HashSet<uint> m_killRecord;
 //        protected HashSet<uint> m_attachmentsSent;
+        private bool m_deliverPackets = true;
        private int m_animationSequenceNumber = 1;
        private bool m_SendLogoutPacketWhenClosing = true;
@@ -391,6 +402,14 @@ 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; } }
@@ -441,6 +460,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
+       
        #endregion Properties
@@ -467,7 +487,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            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 HashSet<uint>();
+//            m_killRecord = new HashSet<uint>();
 //            m_attachmentsSent = new HashSet<uint>();
            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -496,12 +516,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #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.
@@ -513,7 +537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return;
                IsActive = false;
-                CloseWithoutChecks();
+                CloseWithoutChecks(sendStop);
            }
        }
@@ -526,12 +550,19 @@ 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);
+            if (sendStop)
+            {
+                // Send the STOP packet
+                DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
+                OutPacket(disable, ThrottleOutPacketType.Unknown);
+            }
            // Shutdown the image manager
            ImageManager.Close();
@@ -554,6 +585,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // Disable UDP handling for this client
            m_udpClient.Shutdown();
+            
            //m_log.InfoFormat("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
            //GC.Collect();
            //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -794,7 +826,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
            handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
-            OutPacket(handshake, ThrottleOutPacketType.Task);
+            OutPacket(handshake, ThrottleOutPacketType.Unknown);
        }
@@ -835,7 +867,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            reply.ChatData.OwnerID = ownerID;
            reply.ChatData.SourceID = fromAgentID;
-            OutPacket(reply, ThrottleOutPacketType.Task);
+            OutPacket(reply, ThrottleOutPacketType.Unknown);
        }
        /// <summary>
@@ -868,32 +900,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);
            }
        }
@@ -1131,6 +1138,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public virtual void SendLayerData(float[] map)
        {
            Util.FireAndForget(DoSendLayerData, map);
+            // Send it sync, and async. It's not that much data
+            // and it improves user experience just so much!
+            DoSendLayerData(map);
        }
        /// <summary>
@@ -1143,16 +1154,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            try
            {
-                //for (int y = 0; y < 16; y++)
+                for (int y = 0; y < 16; y++)
-                //{
+                {
-                //    for (int x = 0; x < 16; x++)
+                    for (int x = 0; x < 16; x+=4)
-                //    {
+                    {
-                //        SendLayerData(x, y, map);
+                        SendLayerPacket(x, y, map);
-                //    }
+                    }
-                //}
+                }
-                // Send LayerData in a spiral pattern. Fun!
-                SendLayerTopRight(map, 0, 0, 15, 15);
            }
            catch (Exception e)
            {
@@ -1160,51 +1168,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
        }
-        private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
-        {
-            // Row
-            for (int i = x1; i <= x2; i++)
-                SendLayerData(i, y1, map);
-            // Column
-            for (int j = y1 + 1; j <= y2; j++)
-                SendLayerData(x2, j, map);
-            if (x2 - x1 > 0)
-                SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
-        }
-        void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
-        {
-            // Row in reverse
-            for (int i = x2; i >= x1; i--)
-                SendLayerData(i, y2, map);
-            // Column in reverse
-            for (int j = y2 - 1; j >= y1; j--)
-                SendLayerData(x1, j, map);
-            if (x2 - x1 > 0)
-                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)
+        private void SendLayerPacket(int x, int y, float[] map)
-        // {
+        {
-        //     int[] patches = new int[4];
+            int[] patches = new int[4];
-        //     patches[0] = x + 0 + y * 16;
+            patches[0] = x + 0 + y * 16;
-        //     patches[1] = x + 1 + y * 16;
+            patches[1] = x + 1 + y * 16;
-        //     patches[2] = x + 2 + y * 16;
+            patches[2] = x + 2 + y * 16;
-        //     patches[3] = x + 3 + y * 16;
+            patches[3] = x + 3 + y * 16;
-        //     Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
+            float[] heightmap = (map.Length == 65536) ?
-        //     OutPacket(layerpack, ThrottleOutPacketType.Land);
+                map :
-        // }
+                LLHeightFieldMoronize(map);
+            try
+            {
+                Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
+                OutPacket(layerpack, ThrottleOutPacketType.Land);
+            }
+            catch
+            {
+                for (int px = x ; px < x + 4 ; px++)
+                    SendLayerData(px, y, map);
+            }
+        }
        /// <summary>
        /// Sends a specified patch to a client
@@ -1224,7 +1216,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
                layerpack.Header.Reliable = true;
-                OutPacket(layerpack, ThrottleOutPacketType.Land);
+                OutPacket(layerpack, ThrottleOutPacketType.Task);
            }
            catch (Exception e)
            {
@@ -1594,7 +1586,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        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);
            KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
            // TODO: don't create new blocks if recycling an old packet
@@ -1616,17 +1609,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // 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)
+//                lock (m_killRecord)
-                {
+//                {
-                    foreach (uint localID in localIDs)
+//                    foreach (uint localID in localIDs)
-                        m_killRecord.Add(localID);
+//                        m_killRecord.Add(localID);
                    // 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);
-                }
+//                }
            }
        }
@@ -2085,9 +2078,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
@@ -2097,6 +2095,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;
@@ -2166,16 +2165,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            replytask.InventoryData.TaskID = taskID;
            replytask.InventoryData.Serial = serial;
            replytask.InventoryData.Filename = fileName;
-            OutPacket(replytask, ThrottleOutPacketType.Asset);
+            OutPacket(replytask, ThrottleOutPacketType.Task);
        }
-        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)
@@ -2362,6 +2365,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);
@@ -2670,6 +2682,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);
                    }
                }
@@ -2740,8 +2753,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
                return;
            }
+            int WearableOut = 0;
+            bool isWearable = false;
+            if (req.AssetInf != null)
+                isWearable =
+                    ((AssetType) req.AssetInf.Type ==
+                     AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
-            //m_log.Debug("sending asset " + req.RequestAssetID);
+            
+            //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;
@@ -2763,7 +2789,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)
            {
@@ -2774,12 +2800,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)
@@ -2805,7 +2833,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++;
@@ -2850,7 +2878,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            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 != null && 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?
@@ -3557,24 +3588,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 i = 0; i < wearables.Length; i++)
-                for (int j = 0; j < wearables[i].Count; j++)
+                    {
-                {
+                        for (int j = 0; j < wearables[i].Count; j++)
-                    awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+                        {
-                    awb.WearableType = (byte)i;
+                            awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                    awb.AssetID = wearables[i][j].AssetID;
+                            awb.WearableType = (byte) i;
-                    awb.ItemID = wearables[i][j].ItemID;
+                            awb.AssetID = wearables[i][j].AssetID;
-                    aw.WearableData[idx] = awb;
+                            awb.ItemID = wearables[i][j].ItemID;
-                    idx++;
+                            aw.WearableData[idx] = awb;
+                            idx++;
-//                                m_log.DebugFormat(
-//                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
+                            //                                m_log.DebugFormat(
-//                                    awb.ItemID, awb.AssetID, i, Name);
+                            //                                    "[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)
@@ -3585,7 +3617,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
            // TODO: don't create new blocks if recycling an old packet
-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
            avp.ObjectData.TextureEntry = textureEntry;
            AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3716,7 +3748,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
        {
-            //double priority = m_prioritizer.GetUpdatePriority(this, entity);
+            if (entity is SceneObjectPart)
+            {
+                SceneObjectPart e = (SceneObjectPart)entity;
+                SceneObjectGroup g = e.ParentGroup;
+                if (g.RootPart.Shape.State > 30) // HUD
+                    if (g.OwnerID != AgentId)
+                        return; // Don't send updates for other people's HUDs
+            }
            uint priority = m_prioritizer.GetUpdatePriority(this, entity);
            lock (m_entityUpdates.SyncRoot)
@@ -3783,27 +3823,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // 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.                        
-            lock (m_killRecord)
+            float avgTimeDilation = 1.0f;
+            IEntityUpdate iupdate;
+            Int32 timeinqueue; // this is just debugging code & can be dropped later
+                
+            while (updatesThisCall < maxUpdates)
            {
-                float avgTimeDilation = 1.0f;
+                lock (m_entityUpdates.SyncRoot)
-                IEntityUpdate iupdate;
+                    if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
-                Int32 timeinqueue; // this is just debugging code & can be dropped later
+                        break;
-                while (updatesThisCall < maxUpdates)
+                EntityUpdate update = (EntityUpdate)iupdate;
+                    
+                avgTimeDilation += update.TimeDilation;
+                avgTimeDilation *= 0.5f;
+                if (update.Entity is SceneObjectPart)
                {
-                    lock (m_entityUpdates.SyncRoot)
+                    SceneObjectPart part = (SceneObjectPart)update.Entity;
-                        if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
-                            break;
-                    EntityUpdate update = (EntityUpdate)iupdate;
+                    if (part.ParentGroup.IsDeleted)
-                    
+                        continue;
-                    avgTimeDilation += update.TimeDilation;
-                    avgTimeDilation *= 0.5f;
-                    if (update.Entity is SceneObjectPart)
+                    if (part.ParentGroup.IsAttachment)
+                    {   // Someone else's HUD, why are we getting these?
+                        if (part.ParentGroup.OwnerID != AgentId &&
+                            part.ParentGroup.RootPart.Shape.State > 30)
+                            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();
+                        bool found = false;
+                        foreach (SceneObjectGroup att in atts)
+                        {
+                            if (att == part.ParentGroup)
+                            {
+                                found = true;
+                                break;
+                            }
+                        }
+                        // It's an attachment of a valid avatar, but
+                        // doesn't seem to be attached, skip
+                        if (!found)
+                            continue;
+                        // 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
+                        // attachments until the avatar becomes root.
+                        if (sp.IsChildAgent)
+                            continue;
+                        // If the object is an attachment we don't want it to be in the kill
+                        // record. Else attaching from inworld and subsequently dropping
+                        // it will no longer work.
+//                        lock (m_killRecord)
+//                        {
+//                            m_killRecord.Remove(part.LocalId);
+//                            m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
+//                        }
+                    }
+                    else
                    {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
-    
                        // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
                        // will never receive an update after a prim kill.  Even then, keeping the kill record may be a good
                        // safety measure.
@@ -3814,21 +3901,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        // 
                        // 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))
+                        //
-                        {
+                        // We ignore this for attachments because attaching something from inworld breaks unless we do.
-        //                        m_log.WarnFormat(
+//                        lock (m_killRecord)
-        //                            "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted",
+//                        {
-        //                            part.LocalId, Name);
+//                            if (m_killRecord.Contains(part.LocalId))
-                            continue;
+//                                continue;
-                        }                        
+//                            if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
-                            
+//                                continue;
-                        if (part.ParentGroup.IsAttachment && m_disableFacelights)
+//                        }
+                    }
+                    if (part.ParentGroup.IsAttachment && m_disableFacelights)
+                    {
+                        if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
+                            part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
                        {
-                            if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
+                            part.Shape.LightEntry = false;
-                                part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
-                            {
-                                part.Shape.LightEntry = false;
-                            }
                        }
                        if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh))
@@ -3839,224 +3928,166 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            part.Shape.ProfileHollow = 27500;
                        }
                    }
-    
-                    #region UpdateFlags to packet type conversion
+                    if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh))
-    
-                    PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
-    
-                    bool canUseCompressed = true;
-                    bool canUseImproved = true;
-    
-                    // Compressed object updates only make sense for LL primitives
-                    if (!(update.Entity is SceneObjectPart))
                    {
-                        canUseCompressed = false;
+                        // Ensure that mesh has at least 8 valid faces
+                        part.Shape.ProfileBegin = 12500;
+                        part.Shape.ProfileEnd = 0;
+                        part.Shape.ProfileHollow = 27500;
                    }
-    
+                }
-                    if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
+                ++updatesThisCall;
+                #region UpdateFlags to packet type conversion
+                PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
+                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 (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Joint))
                    {
                        canUseCompressed = false;
-                        canUseImproved = false;
                    }
-                    else
+                    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))
                    {
-                        if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                        canUseImproved = false;
-                            updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
-                            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;
-                        }
                    }
+                }
    
-                    #endregion UpdateFlags to packet type conversion
+                #endregion UpdateFlags to packet type conversion
-    
-                    #region Block Construction
-    
-                    // TODO: Remove this once we can build compressed updates
-                    canUseCompressed = false;
-    
-                    if (!canUseImproved && !canUseCompressed)
-                    {
-                        ObjectUpdatePacket.ObjectDataBlock updateBlock;
-                        if (update.Entity is ScenePresence)
+                #region Block Construction
-                        {
-                            updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
-                        }
-                        else
-                        {
-                            SceneObjectPart part = (SceneObjectPart)update.Entity;
-                            updateBlock = CreatePrimUpdateBlock(part, AgentId);
-                            // 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;
-                        }
-                        objectUpdateBlocks.Value.Add(updateBlock);
+                // TODO: Remove this once we can build compressed updates
-                        objectUpdates.Value.Add(update);
+                canUseCompressed = false;
-                    }
-                    else if (!canUseImproved)
-                    {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
-                        ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
-                            = CreateCompressedUpdateBlock(part, updateFlags);
-                        // 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;
-                        compressedUpdateBlocks.Value.Add(compressedBlock);
+                if (!canUseImproved && !canUseCompressed)
-                        compressedUpdates.Value.Add(update);
+                {
+                    if (update.Entity is ScenePresence)
+                    {
+                        objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
                    }
                    else
                    {
-                        if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
+                        objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
-                        {
-                            // Self updates go into a special list
-                            terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
-                            terseAgentUpdates.Value.Add(update);
-                        }
-                        else
-                        {
-                            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
-                                = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-                            // Everything else goes here
-                            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);
-                            terseUpdates.Value.Add(update);
-                        }
                    }
-                    ++updatesThisCall;
-    
-                    #endregion Block Construction
                }
-    
+                else if (!canUseImproved)
-                #region Packet Sending
+                {
-                ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
+                    compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
+                }
-                if (terseAgentUpdateBlocks.IsValueCreated)
+                else
                {
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
+                    if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
+                        // Self updates go into a special list
+                        terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                    else
+                        // Everything else goes here
+                        terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                }
-                    ImprovedTerseObjectUpdatePacket packet
+                #endregion Block Construction
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            }
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+            #region Packet Sending
-                    packet.RegionData.TimeDilation = timeDilation;
+    
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+            const float TIME_DILATION = 1.0f;
+            ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
+    
+            if (terseAgentUpdateBlocks.IsValueCreated)
+            {
+                List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
-                    for (int i = 0; i < blocks.Count; i++)
+                ImprovedTerseObjectUpdatePacket packet
-                        packet.ObjectData[i] = blocks[i];
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
+                packet.RegionData.TimeDilation = timeDilation;
-                }
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-                if (objectUpdateBlocks.IsValueCreated)
+                for (int i = 0; i < blocks.Count; i++)
-                {
+                    packet.ObjectData[i] = blocks[i];
-                    List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
-        
-                    ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    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)
-                {
-                    List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.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)
+                OutPacket(packet, ThrottleOutPacketType.Unknown, true);
-                {
+            }
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
-        
-                    ImprovedTerseObjectUpdatePacket packet
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
-                            PacketType.ImprovedTerseObjectUpdate);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+            if (objectUpdateBlocks.IsValueCreated)
-                    packet.RegionData.TimeDilation = timeDilation;
+            {
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+                List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
-        
+    
-                    for (int i = 0; i < blocks.Count; i++)
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
-                        packet.ObjectData[i] = blocks[i];
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
+                packet.RegionData.TimeDilation = timeDilation;
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
+                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-                }
+    
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+    
+            if (compressedUpdateBlocks.IsValueCreated)
+            {
+                List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.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];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+    
+            if (terseUpdateBlocks.IsValueCreated)
+            {
+                List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
+    
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
+                        PacketType.ImprovedTerseObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+    
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
            }
            #endregion Packet Sending
@@ -4349,11 +4380,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // 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(updates, oPacket);
+                //          });
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
                // pbcnt += blocks.Count;
                // ppcnt++;
@@ -4379,11 +4412,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    // of the object rather than the properties when the packet was created
                    List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
                    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++;
@@ -4755,7 +4790,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            
            if (landData.SimwideArea > 0)
            {
-                int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
+                // Never report more than sim total capacity
+                if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
+                    simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
                updateMessage.SimWideMaxPrims = simulatorCapacity;
            }
            else
@@ -4884,14 +4922,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];
@@ -4946,9 +4984,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                ScenePresence presence = (ScenePresence)entity;
+                position = presence.OffsetPosition;
+                rotation = presence.Rotation;
+                if (presence.ParentID != 0)
+                {
+                    SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
+                    if (part != null && part != part.ParentGroup.RootPart)
+                    {
+                        position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
+                        rotation = part.RotationOffset * presence.Rotation;
+                    }
+                    angularVelocity = Vector3.Zero;
+                }
+                else
+                {
+                    angularVelocity = presence.AngularVelocity;
+                    rotation = presence.Rotation;
+                }
                attachPoint = 0;
                collisionPlane = presence.CollisionPlane;
-                position = presence.OffsetPosition;
                velocity = presence.Velocity;
                acceleration = Vector3.Zero;
@@ -4957,9 +5013,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // may improve movement smoothness.
 //                acceleration = new Vector3(1, 0, 0);
                
-                angularVelocity = presence.AngularVelocity;
-                rotation = presence.Rotation;
                if (sendTexture)
                    textureEntry = presence.Appearance.Texture.GetBytes();
                else
@@ -5065,13 +5118,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
        {
+            Vector3 offsetPosition = data.OffsetPosition;
+            Quaternion rotation = data.Rotation;
+            uint parentID = data.ParentID;
+            if (parentID != 0)
+            {
+                SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
+                if (part != null && part != part.ParentGroup.RootPart)
+                {
+                    offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
+                    rotation = part.RotationOffset * data.Rotation;
+                    parentID = part.ParentGroup.RootPart.LocalId;
+                }
+            }
            byte[] objectData = new byte[76];
            data.CollisionPlane.ToBytes(objectData, 0);
-            data.OffsetPosition.ToBytes(objectData, 16);
+            offsetPosition.ToBytes(objectData, 16);
 //            data.Velocity.ToBytes(objectData, 28);
 //            data.Acceleration.ToBytes(objectData, 40);
-            data.Rotation.ToBytes(objectData, 52);
+            rotation.ToBytes(objectData, 52);
            //data.AngularVelocity.ToBytes(objectData, 64);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5085,14 +5153,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
                data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
            update.ObjectData = objectData;
-            update.ParentID = data.ParentID;
+            update.ParentID = parentID;
            update.PathCurve = 16;
            update.PathScaleX = 100;
            update.PathScaleY = 100;
            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];
@@ -5103,10 +5173,13 @@ 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;
        }
@@ -5277,8 +5350,10 @@ 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);
@@ -5430,6 +5505,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);
@@ -5496,6 +5572,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
            AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
            AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
+            AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
            AddGenericPacketHandler("autopilot", HandleAutopilot);
        }
@@ -5534,6 +5611,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
                        (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
                        (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
+                        (x.ControlFlags != 0) ||
                        (x.Far != m_lastAgentUpdateArgs.Far) ||
                        (x.Flags != m_lastAgentUpdateArgs.Flags) ||
                        (x.State != m_lastAgentUpdateArgs.State) ||
@@ -5793,6 +5871,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;
@@ -6213,26 +6314,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // Temporarily protect ourselves from the mantis #951 failure.
                // However, we could do this for several other handlers where a failure isn't terminal
                // for the client session anyway, in order to protect ourselves against bad code in plugins
+                Vector3 avSize = appear.AgentData.Size;
                try
                {
                    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]; 
+                    
                    Primitive.TextureEntry te = null;
                    if (appear.ObjectData.TextureEntry.Length > 1)
                        te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
+                    
+                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
+                    for (int i=0; i<appear.WearableData.Length;i++)
+                        cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
-                    List<CachedTextureRequestArg> hashes = new List<CachedTextureRequestArg>();
+                    
-                    for (int i = 0; i < appear.WearableData.Length; i++)
-                    {
-                        CachedTextureRequestArg arg = new CachedTextureRequestArg();
-                        arg.BakedTextureIndex = appear.WearableData[i].TextureIndex;
-                        arg.WearableHashID = appear.WearableData[i].CacheID;
-                        hashes.Add(arg);
-                    }
-                    handlerSetAppearance(sender, te, visualparams, hashes);
+                    handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
                }
                catch (Exception e)
                {
@@ -6441,6 +6541,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                handlerCompleteMovementToRegion(sender, true);
            }
+            else
+                m_log.Debug("HandleCompleteAgentMovement NULL handler");
            handlerCompleteMovementToRegion = null;
            return true;
@@ -6458,7 +6561,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
            }
            #endregion
+/*
            StartAnim handlerStartAnim = null;
            StopAnim handlerStopAnim = null;
@@ -6482,6 +6585,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)
@@ -6707,6 +6829,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #endregion
            m_udpClient.SetThrottles(atpack.Throttle.Throttles);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
            return true;
        }
@@ -7131,7 +7258,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);
@@ -7717,6 +7844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // surrounding scene
                if ((ImageType)block.Type == ImageType.Baked)
                    args.Priority *= 2.0f;
+                int wearableout = 0;
                ImageManager.EnqueueReq(args);
            }
@@ -8735,16 +8863,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Parcel related packets
+        // acumulate several HandleRegionHandleRequest consecutive overlaping requests
+        // to be done with minimal resources as possible
+        // variables temporary here while in test
+        Queue<UUID> RegionHandleRequests = new Queue<UUID>();
+        bool RegionHandleRequestsInService = false;
        private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack)
        {
-            RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
+            UUID currentUUID;
            RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest;
-            if (handlerRegionHandleRequest != null)
+            if (handlerRegionHandleRequest == null)
+                return true;
+            RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
+            lock (RegionHandleRequests)
            {
-                handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID);
+                if (RegionHandleRequestsInService)
+                {
+                    // we are already busy doing a previus request
+                    // so enqueue it
+                    RegionHandleRequests.Enqueue(rhrPack.RequestBlock.RegionID);
+                    return true;
+                }
+                // else do it
+                currentUUID = rhrPack.RequestBlock.RegionID;
+                RegionHandleRequestsInService = true;
            }
-            return true;
+            while (true)
+            {
+                handlerRegionHandleRequest(this, currentUUID);
+                lock (RegionHandleRequests)
+                {
+                    // exit condition, nothing to do or closed
+                    // current code seems to assume we may loose the handler at anytime,
+                    // so keep checking it
+                    handlerRegionHandleRequest = OnRegionHandleRequest;
+                    if (RegionHandleRequests.Count == 0 || !IsActive || handlerRegionHandleRequest == null)
+                    {
+                        RegionHandleRequests.Clear();
+                        RegionHandleRequestsInService = false;
+                        return true;
+                    }
+                    currentUUID = RegionHandleRequests.Dequeue();
+                }
+            }
+            return true; // actually unreached
        }
        private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack)
@@ -10000,7 +10173,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;
@@ -10015,8 +10188,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;
@@ -10060,10 +10232,55 @@ 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)
        {
@@ -10490,6 +10707,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                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.GodLevel >= 200)
+                        {
+                            groupProfileReply.GroupData.OpenEnrollment = true;
+                            groupProfileReply.GroupData.MembershipFee = 0;
+                        }
+                    }
+                }
                OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
            }
            return true;
@@ -11063,11 +11294,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)
@@ -11181,10 +11417,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;
        }
@@ -11487,12 +11724,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="simclient"></param>
        /// <param name="packet"></param>
        /// <returns></returns>
-        protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
+        // TODO: Convert old handler to use new method
+        /*protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
        {
            AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
            if (cachedtex.AgentData.SessionID != SessionId)
                return false;
+            
            List<CachedTextureRequestArg> requestArgs = new List<CachedTextureRequestArg>();
@@ -11505,23 +11744,173 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                requestArgs.Add(arg);
            }
-            try
+            CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+            if (handlerCachedTextureRequest != null)
            {
-                CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+                handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
-                if (handlerCachedTextureRequest != null)
+            }
+            return true;
+        }*/
+        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;
+            m_cachedTextureSerial++;
+            cachedresp.WearableData =
+                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
+            //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>();
+           // var item = fac.GetBakedTextureFaces(AgentId);
+            //WearableCacheItem[] items = fac.GetCachedItems(AgentId);
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            //bakedTextureModule = null;
+            int maxWearablesLoop = cachedtex.WearableData.Length;
+            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
+                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
+            if (bakedTextureModule != null && cache != null)
+            {
+                // 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
+                WearableCacheItem[] cacheItems = null;
+                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;
+                        }
+                        /*
+                         * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
+                         * 
+                        catch (System.Net.Sockets.SocketException)
+                        {
+                            cacheItems = null;
+                        }
+                        catch (WebException)
+                        {
+                            cacheItems = null;
+                        }
+                        catch (InvalidOperationException)
+                        {
+                            cacheItems = null;
+                        } */
+                        catch (Exception)
+                        {
+                            cacheItems = null;
+                        }
+                        
+                    }
+                    else if (p.Appearance.WearableCacheItems != null)
+                    {
+                        cacheItems = p.Appearance.WearableCacheItems;
+                    }
+                if (cache != null && cacheItems != null)
                {
-                    handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+                    foreach (WearableCacheItem item in cacheItems)
+                    {
+                       
+                        if (cache.GetCached(item.TextureID.ToString()) == null)
+                        {
+                            item.TextureAsset.Temporary = true;
+                            cache.Store(item.TextureAsset);
+                        }
+                    }
+                }
+               
+                if (cacheItems != null)
+                {
+                   
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        WearableCacheItem item =
+                            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)
+                        {
+                            
+                            cachedresp.WearableData[i].TextureID = item.TextureID;
+                        }
+                        else
+                        {
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                        //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
                }
            }
-            catch (Exception e)
+            else
            {
-                m_log.ErrorFormat("[CLIENT VIEW]: AgentTextureCached packet handler threw an exception, {0}", e);
+                if (cache == null)
-                return false;
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                        if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        else
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                                // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
+                }
            }
-            
+            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.
@@ -11585,209 +11974,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
+  
+                             * 0x08 LINK_SET
+                             * 0x10 UNIFORM for scale
+                             */
-                        switch (block.Type)
+                            // translate to internal changes
-                        {
+                            // not all cases .. just the ones older code did
-                            case 1:
-                                Vector3 pos1 = new Vector3(block.Data, 0);
-                                UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                            switch (block.Type)
-                                if (handlerUpdatePrimSinglePosition != null)
+                            {
-                                {
+                                case 1: //change position sp
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                                    udata.position = new Vector3(block.Data, 0);
-                                    handlerUpdatePrimSinglePosition(localId, pos1, this);
-                                }
-                                break;
-                            case 2:
+                                    udata.change = ObjectChangeType.primP;
-                                Quaternion rot1 = new Quaternion(block.Data, 0, true);
+                                    updatehandler(localId, udata, this);
+                                    break;
-                                UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
+                                case 2: // rotation sp
-                                if (handlerUpdatePrimSingleRotation != null)
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
-                                {
-                                    // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
-                                    handlerUpdatePrimSingleRotation(localId, rot1, this);
-                                }
-                                break;
-                            case 3:
+                                    udata.change = ObjectChangeType.primR;
-                                Vector3 rotPos = new Vector3(block.Data, 0);
+                                    updatehandler(localId, udata, this);
-                                Quaternion rot2 = new Quaternion(block.Data, 12, true);
+                                    break;
-                                UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition;
+                                case 3: // position plus rotation
-                                if (handlerUpdatePrimSingleRotationPosition != null)
+                                    udata.position = new Vector3(block.Data, 0);
-                                {
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
-                                    // 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:
+                                    udata.change = ObjectChangeType.primPR;
-                            case 20:
+                                    updatehandler(localId, udata, this);
-                                Vector3 scale4 = new Vector3(block.Data, 0);
+                                    break;
-                                UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale;
+                                case 4: // scale sp
-                                if (handlerUpdatePrimScale != null)
+                                    udata.scale = new Vector3(block.Data, 0);
-                                {
+                                    udata.change = ObjectChangeType.primS;
-                                    //                                     m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
-                                    handlerUpdatePrimScale(localId, scale4, this);
-                                }
-                                break;
-                            case 5:
+                                    updatehandler(localId, udata, this);
-                                Vector3 scale1 = new Vector3(block.Data, 12);
+                                    break;
-                                Vector3 pos11 = new Vector3(block.Data, 0);
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                case 0x14: // uniform scale sp 
-                                if (handlerUpdatePrimScale != null)
+                                    udata.scale = new Vector3(block.Data, 0);
-                                {
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale1, this);
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                                    udata.change = ObjectChangeType.primUS;
-                                    if (handlerUpdatePrimSinglePosition != null)
+                                    updatehandler(localId, udata, this);
-                                    {
+                                    break;
-                                        handlerUpdatePrimSinglePosition(localId, pos11, this);
-                                    }
-                                }
-                                break;
-                            case 9:
+                                case 5: // scale and position sp
-                                Vector3 pos2 = new Vector3(block.Data, 0);
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
-                                UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition;
+                                    udata.change = ObjectChangeType.primPS;
+                                    updatehandler(localId, udata, this);
+                                    break;
-                                if (handlerUpdateVector != null)
+                                case 0x15: //uniform scale and position
-                                {
+                                    udata.position = new Vector3(block.Data, 0);
-                                    handlerUpdateVector(localId, pos2, this);
+                                    udata.scale = new Vector3(block.Data, 12);
-                                }
-                                break;
-                            case 10:
+                                    udata.change = ObjectChangeType.primPUS;
-                                Quaternion rot3 = new Quaternion(block.Data, 0, true);
+                                    updatehandler(localId, udata, this);
+                                    break;
-                                UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
+                                // now group related (bit 4)
-                                if (handlerUpdatePrimRotation != null)
+                                case 9: //( 8 + 1 )group position
-                                {
+                                    udata.position = new Vector3(block.Data, 0);
-                                    //  Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
-                                    handlerUpdatePrimRotation(localId, rot3, this);
-                                }
-                                break;
-                            case 11:
+                                    udata.change = ObjectChangeType.groupP;
-                                Vector3 pos3 = new Vector3(block.Data, 0);
+                                    updatehandler(localId, udata, this);
-                                Quaternion rot4 = new Quaternion(block.Data, 12, true);
+                                    break;
-                                handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
+                                case 0x0A: // (8 + 2) group rotation
-                                if (handlerUpdatePrimGroupRotation != null)
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
-                                {
-                                    //  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;
+                                    udata.change = ObjectChangeType.groupR;
-                                if (handlerUpdatePrimGroupScale != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    //                                     m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
-                                    handlerUpdatePrimGroupScale(localId, scale7, this);
-                                }
-                                break;
-                            case 13:
+                                case 0x0B: //( 8 + 2 + 1) group rotation and position
-                                Vector3 scale2 = new Vector3(block.Data, 12);
+                                    udata.position = new Vector3(block.Data, 0);
-                                Vector3 pos4 = new Vector3(block.Data, 0);
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                    udata.change = ObjectChangeType.groupPR;
-                                if (handlerUpdatePrimScale != null)
+                                    updatehandler(localId, udata, this);
-                                {
+                                    break;
-                                    //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)
+                                case 0x0C: // (8 + 4) group scale
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                                    // only afects root prim and only sent by viewer editor object tab scaling
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                                    // mouse edition only allows uniform scaling
-                                    if (handlerUpdatePrimSinglePosition != null)
+                                    // SL MAY CHANGE THIS in viewers
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos4, this);
-                                    }
-                                }
-                                break;
-                            case 29:
+                                    udata.scale = new Vector3(block.Data, 0);
-                                Vector3 scale5 = new Vector3(block.Data, 12);
-                                Vector3 pos5 = new Vector3(block.Data, 0);
-                                handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
+                                    udata.change = ObjectChangeType.groupS;
-                                if (handlerUpdatePrimGroupScale != null)
+                                    updatehandler(localId, udata, this);
-                                {
-                                    // 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)
+                                    break;
-                                    {
-                                        handlerUpdateVector(localId, pos5, this);
-                                    }
-                                    part.IgnoreUndoUpdate = false;
+                                case 0x0D: //(8 + 4 + 1) group scale and position
-                                }
+                                    // exception as above
-                                break;
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
-                            case 21:
+                                    udata.change = ObjectChangeType.groupPS;
-                                Vector3 scale6 = new Vector3(block.Data, 12);
+                                    updatehandler(localId, udata, this);
-                                Vector3 pos6 = new Vector3(block.Data, 0);
+                                    break;
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
+                                case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
-                                if (handlerUpdatePrimScale != null)
+                                    udata.scale = new Vector3(block.Data, 0);
-                                {
-                                    part.StoreUndoState(false);
-                                    part.IgnoreUndoUpdate = true;
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+                                    udata.change = ObjectChangeType.groupUS;
-                                    handlerUpdatePrimScale(localId, scale6, this);
+                                    updatehandler(localId, udata, this);
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
+                                    break;
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos6, this);
-                                    }
-                                    part.IgnoreUndoUpdate = false;
+                                case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
-                                }
+                                    udata.position = new Vector3(block.Data, 0);
-                                break;
+                                    udata.scale = new Vector3(block.Data, 12);
-                            default:
+                                    udata.change = ObjectChangeType.groupPUS;
-                                m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
+                                    updatehandler(localId, udata, this);
-                                break;
+                                    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;
        }
@@ -11848,9 +12175,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SetChildAgentThrottle(byte[] throttles)
        {
            m_udpClient.SetThrottles(throttles);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
        }
        /// <summary>
+        /// Sets the throttles from values supplied by the client
+        /// </summary>
+        /// <param name="throttles"></param>
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+            m_udpClient.ForceThrottleSetting(throttle,setting);
+            //m_udpClient.SetThrottles(throttles);
+            
+        }
+        /// <summary>
        /// Get the current throttles for this client as a packed byte array
        /// </summary>
        /// <param name="multiplier">Unused</param>
@@ -12231,7 +12575,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>
@@ -12297,7 +12644,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)