1 files changed, 664 insertions, 415 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5ee1596..06f1301 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event ModifyTerrain OnModifyTerrain;
        public event Action<IClientAPI> OnRegionHandShakeReply;
        public event GenericCall1 OnRequestWearables;
+        public event CachedTextureRequest OnCachedTextureRequest;
        public event SetAppearance OnSetAppearance;
        public event AvatarNowWearing OnAvatarNowWearing;
        public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -95,6 +96,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
        public event UpdateAgent OnPreAgentUpdate;
        public event UpdateAgent OnAgentUpdate;
+        public event UpdateAgent OnAgentCameraUpdate;
        public event AgentRequestSit OnAgentRequestSit;
        public event AgentSit OnAgentSit;
        public event AvatarPickerRequest OnAvatarPickerRequest;
@@ -335,6 +337,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private bool m_VelocityInterpolate = false;
        private const uint MaxTransferBytesPerPacket = 600;
+        private volatile bool m_justEditedTerrain = false;
        /// <value>
        /// List used in construction of data blocks for an object update packet.  This is to stop us having to
@@ -355,7 +358,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //        protected HashSet<uint> m_attachmentsSent;
        private bool m_deliverPackets = true;
-        private int m_animationSequenceNumber = 1;
        private bool m_SendLogoutPacketWhenClosing = true;
        /// <summary>
@@ -367,7 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// This does mean that agent updates must be processed synchronously, at least for each client, and called methods
        /// cannot retain a reference to it outside of that method.
        /// </remarks>
-        private AgentUpdateArgs m_lastAgentUpdateArgs;
+        private AgentUpdateArgs m_thisAgentUpdateArgs = new AgentUpdateArgs();
        protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>();
        protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
@@ -416,6 +419,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } }
        public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); }
+        public int PingTimeMS
+        {
+            get
+            {
+                if (UDPClient != null)
+                    return UDPClient.PingTimeMS;
+                return 0;
+            }
+        }
        /// <summary>
        /// Entity update queues
        /// </summary>
@@ -437,7 +450,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public string Name { get { return FirstName + " " + LastName; } }
        public uint CircuitCode { get { return m_circuitCode; } }
-        public int NextAnimationSequenceNumber { get { return m_animationSequenceNumber++; } }
+        public int NextAnimationSequenceNumber
+        {
+            get { return m_udpServer.NextAnimationSequenceNumber; }
+        }
        /// <summary>
        /// As well as it's function in IClientAPI, in LLClientView we are locking on this property in order to
@@ -458,6 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            set { m_disableFacelights = value; }
        }
        public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
       
@@ -504,6 +521,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_udpServer = udpServer;
            m_udpClient = udpClient;
            m_udpClient.OnQueueEmpty += HandleQueueEmpty;
+            m_udpClient.HasUpdates += HandleHasUpdates;
            m_udpClient.OnPacketStats += PopulateStats;
            m_prioritizer = new Prioritizer(m_scene);
@@ -533,7 +551,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // We still perform a force close inside the sync lock since this is intended to attempt close where
                // there is some unidentified connection problem, not where we have issues due to deadlock
                if (!IsActive && !force)
+                {
+                    m_log.DebugFormat(
+                        "[CLIENT]: Not attempting to close inactive client {0} in {1} since force flag is not set", 
+                        Name, m_scene.Name);
                    return;
+                }
                IsActive = false;
                CloseWithoutChecks(sendStop);
@@ -709,12 +733,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                //there is a local handler for this packet type
                if (pprocessor.Async)
                {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.AsyncRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.AsyncRequests[packet.Type.ToString()] = 0;
+                    cinfo.AsyncRequests[packet.Type.ToString()]++;
                    object obj = new AsyncPacketProcess(this, pprocessor.method, packet);
                    Util.FireAndForget(ProcessSpecificPacketAsync, obj);
                    result = true;
                }
                else
                {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.SyncRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.SyncRequests[packet.Type.ToString()] = 0;
+                    cinfo.SyncRequests[packet.Type.ToString()]++;
                    result = pprocessor.method(this, packet);
                }
            }
@@ -729,6 +763,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                }
                if (found)
                {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.GenericRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.GenericRequests[packet.Type.ToString()] = 0;
+                    cinfo.GenericRequests[packet.Type.ToString()]++;
                    result = method(this, packet);
                }
            }
@@ -758,7 +797,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public virtual void Start()
        {
-            m_scene.AddNewClient(this, PresenceType.User);
+            m_scene.AddNewAgent(this, PresenceType.User);
            RefreshGroupMembership();
        }
@@ -820,14 +859,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
            handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
-            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
+            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
-//            OutPacket(handshake, ThrottleOutPacketType.Task);
+            handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
-            // use same as MoveAgentIntoRegion (both should be task )
+            handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
+            handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
            OutPacket(handshake, ThrottleOutPacketType.Unknown);
        }
        public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
        {
+            m_thisAgentUpdateArgs.CameraAtAxis.X = float.MinValue;
+            m_thisAgentUpdateArgs.ControlFlags = uint.MaxValue;
            AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
            mov.SimData.ChannelVersion = m_channelVersion;
            mov.AgentData.SessionID = m_sessionId;
@@ -1210,9 +1255,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    LLHeightFieldMoronize(map);
                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
-                layerpack.Header.Reliable = true;
+                
+                // When a user edits the terrain, so much data is sent, the data queues up fast and presents a sub optimal editing experience.  
+                // To alleviate this issue, when the user edits the terrain, we start skipping the queues until they're done editing the terrain.
+                // We also make them unreliable because it's extremely likely that multiple packets will be sent for a terrain patch area 
+                // invalidating previous packets for that area.
-                OutPacket(layerpack, ThrottleOutPacketType.Task);
+                // It's possible for an editing user to flood themselves with edited packets but the majority of use cases are such that only a 
+                // tiny percentage of users will be editing the terrain.     Other, non-editing users will see the edits much slower.
+                
+                // One last note on this topic, by the time users are going to be editing the terrain, it's extremely likely that the sim will 
+                // have rezzed already and therefore this is not likely going to cause any additional issues with lost packets, objects or terrain 
+                // patches.
+                // m_justEditedTerrain is volatile, so test once and duplicate two affected statements so we only have one cache miss.
+                if (m_justEditedTerrain)
+                {
+                    layerpack.Header.Reliable = false;
+                    OutPacket(layerpack,
+                               ThrottleOutPacketType.Unknown );
+                }
+                else
+                {
+                    layerpack.Header.Reliable = true;
+                    OutPacket(layerpack,
+                               ThrottleOutPacketType.Task);
+                }
            }
            catch (Exception e)
            {
@@ -1405,6 +1473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            mapReply.AgentData.AgentID = AgentId;
            mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
+            mapReply.Size = new MapBlockReplyPacket.SizeBlock[mapBlocks2.Length];
            mapReply.AgentData.Flags = flag;
            for (int i = 0; i < mapBlocks2.Length; i++)
@@ -1419,6 +1488,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags;
                mapReply.Data[i].Access = mapBlocks2[i].Access;
                mapReply.Data[i].Agents = mapBlocks2[i].Agents;
+                // TODO: hookup varregion sim size here
+                mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
+                mapReply.Size[i].SizeX = 256;
+                mapReply.Size[i].SizeY = 256;
            }
            OutPacket(mapReply, ThrottleOutPacketType.Land);
        }
@@ -1578,9 +1652,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pc.PingID.OldestUnacked = 0;
            OutPacket(pc, ThrottleOutPacketType.Unknown);
+            UDPClient.m_lastStartpingTimeMS = Util.EnvironmentTickCount();
        }
-        public void SendKillObject(ulong regionHandle, List<uint> localIDs)
+        public void SendKillObject(List<uint> localIDs)
        {
 //            foreach (uint id in localIDs)
 //                m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
@@ -2594,11 +2669,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
            avatarSitResponse.SitObject.ID = TargetID;
-            if (CameraAtOffset != Vector3.Zero)
+            avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
-            {
+            avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
-                avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
-                avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
-            }
            avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook;
            avatarSitResponse.SitTransform.AutoPilot = autopilot;
            avatarSitResponse.SitTransform.SitPosition = OffsetPos;
@@ -3630,6 +3702,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            avp.Sender.IsTrial = false;
            avp.Sender.ID = agentID;
            avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
+            // this need be use in future
+ //           avp.AppearanceData[0].AppearanceVersion = 0;
+ //           avp.AppearanceData[0].CofVersion = 0;
            //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
            OutPacket(avp, ThrottleOutPacketType.Task);
        }
@@ -3751,8 +3828,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                SceneObjectPart e = (SceneObjectPart)entity;
                SceneObjectGroup g = e.ParentGroup;
-                if (g.RootPart.Shape.State > 30) // HUD
+                if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId)
-                    if (g.OwnerID != AgentId)
                        return; // Don't send updates for other people's HUDs
            }
@@ -3762,43 +3838,64 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation));
        }
-        /// <summary>
+        /*  dont use this
-        /// Requeue an EntityUpdate when it was not acknowledged by the client. 
+            udp packet resent must be done at udp level only
-        /// We will update the priority and put it in the correct queue, merging update flags 
+            re map from a packet to original updates just doesnt work                           
-        /// with any other updates that may be queued for the same entity. 
-        /// The original update time is used for the merged update.
-        /// </summary>
-        private void ResendPrimUpdate(EntityUpdate update)
-        {
-            // If the update exists in priority queue, it will be updated.
-            // If it does not exist then it will be added with the current (rather than its original) priority
-            uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity);
-            lock (m_entityUpdates.SyncRoot)
+                /// <summary>
-                m_entityUpdates.Enqueue(priority, update);
+                /// Requeue an EntityUpdate when it was not acknowledged by the client. 
-        }
+                /// We will update the priority and put it in the correct queue, merging update flags 
+                /// with any other updates that may be queued for the same entity. 
+                /// The original update time is used for the merged update.
+                /// </summary>
+                private void ResendPrimUpdate(EntityUpdate update)
+                {
+                    // If the update exists in priority queue, it will be updated.
+                    // If it does not exist then it will be added with the current (rather than its original) priority
+                    uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity);
-        /// <summary>
+                    lock (m_entityUpdates.SyncRoot)
-        /// Requeue a list of EntityUpdates when they were not acknowledged by the client. 
+                        m_entityUpdates.Enqueue(priority, update);
-        /// We will update the priority and put it in the correct queue, merging update flags 
+                }
-        /// with any other updates that may be queued for the same entity. 
-        /// The original update time is used for the merged update.
-        /// </summary>
-        private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
-        {
-            // m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber);
-            // Remove the update packet from the list of packets waiting for acknowledgement
-            // because we are requeuing the list of updates. They will be resent in new packets
-            // with the most recent state and priority.
-            m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
-            // Count this as a resent packet since we are going to requeue all of the updates contained in it
+                /// <summary>
-            Interlocked.Increment(ref m_udpClient.PacketsResent);
+                /// Requeue a list of EntityUpdates when they were not acknowledged by the client. 
+                /// We will update the priority and put it in the correct queue, merging update flags 
+                /// with any other updates that may be queued for the same entity. 
+                /// The original update time is used for the merged update.
+                /// </summary>
+                private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
+                {
+                    // m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber);
+                    // Remove the update packet from the list of packets waiting for acknowledgement
+                    // because we are requeuing the list of updates. They will be resent in new packets
+                    // with the most recent state and priority.
+                    m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
+                    // Count this as a resent packet since we are going to requeue all of the updates contained in it
+                    Interlocked.Increment(ref m_udpClient.PacketsResent);           
+                    // We're not going to worry about interlock yet since its not currently critical that this total count
+                    // is 100% correct
+                    m_udpServer.PacketsResentCount++;
+                    foreach (EntityUpdate update in updates)
+                        ResendPrimUpdate(update);
+                }
+        */
+//        OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseAgentUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+//
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> objectUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> compressedUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
-            foreach (EntityUpdate update in updates)
-                ResendPrimUpdate(update);
-        }
        private void ProcessEntityUpdates(int maxUpdates)
        {
@@ -3812,6 +3909,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
            OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//            objectUpdateBlocks.Value.Clear();
+//            compressedUpdateBlocks.Value.Clear();
+//            terseUpdateBlocks.Value.Clear();
+//            terseAgentUpdateBlocks.Value.Clear();
+//            objectUpdates.Value.Clear();
+//            compressedUpdates.Value.Clear();
+//            terseUpdates.Value.Clear();
+//            terseAgentUpdates.Value.Clear();
            // Check to see if this is a flush
            if (maxUpdates <= 0)
            {
@@ -3846,8 +3952,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (part.ParentGroup.IsAttachment)
                    {   // Someone else's HUD, why are we getting these?
-                        if (part.ParentGroup.OwnerID != AgentId &&
+                        if (part.ParentGroup.OwnerID != AgentId && part.ParentGroup.HasPrivateAttachmentPoint)
-                            part.ParentGroup.RootPart.Shape.State > 30)
                            continue;
                        ScenePresence sp;
                        // Owner is not in the sim, don't update it to
@@ -4098,12 +4203,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                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); });
+//                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
+                // use default udp retry 
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
            }
            #endregion Packet Sending
        }
+        // hack.. dont use
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+            if (ent is SceneObjectPart)
+            {
+                SceneObjectPart part = (SceneObjectPart)ent;
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = 1;
+                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+                ObjectUpdatePacket.ObjectDataBlock blk = CreatePrimUpdateBlock(part, this.m_agentId);
+                if (parentID.HasValue)
+                {
+                    blk.ParentID = parentID.Value;
+                }
+                packet.ObjectData[0] = blk;
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+        }
+        
        public void ReprioritizeUpdates()
        {
            lock (m_entityUpdates.SyncRoot)
@@ -4140,8 +4273,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
        {
+//            if (!m_udpServer.IsRunningOutbound)
+//                return;
            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
            {
+//                if (!m_udpServer.IsRunningOutbound)
+//                    return;
                if (m_maxUpdates == 0 || m_LastQueueFill == 0)
                {
                    m_maxUpdates = m_udpServer.PrimUpdatesPerCallback;
@@ -4167,6 +4306,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                ImageManager.ProcessImageQueue(m_udpServer.TextureSendLimit);
        }
+        internal bool HandleHasUpdates(ThrottleOutPacketTypeFlags categories)
+        {
+            bool hasUpdates = false;
+            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
+            {
+                if (m_entityUpdates.Count > 0)
+                    hasUpdates = true;
+                else if (m_entityProps.Count > 0)
+                    hasUpdates = true;                   
+            }
+            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
+            {
+                if (ImageManager.HasUpdates())
+                    hasUpdates = true;
+            }
+            return hasUpdates;
+        }
        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
        {
            AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
@@ -4312,6 +4472,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // Count this as a resent packet since we are going to requeue all of the updates contained in it
            Interlocked.Increment(ref m_udpClient.PacketsResent);
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            m_udpServer.PacketsResentCount++;
            foreach (ObjectPropertyUpdate update in updates)
                ResendPropertyUpdate(update);
        }
@@ -4499,6 +4663,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            SceneObjectPart root = sop.ParentGroup.RootPart;
            block.TouchName = Util.StringToBytes256(root.TouchName);
+            // SL 3.3.4, at least, appears to read this information as a concatenated byte[] stream of UUIDs but
+            // it's not yet clear whether this is actually used.  If this is done in the future then a pre-cached
+            // copy is really needed since it's less efficient to be constantly recreating this byte array.
+//            using (MemoryStream memStream = new MemoryStream())
+//            {
+//                using (BinaryWriter binWriter = new BinaryWriter(memStream))
+//                {
+//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+//                    {
+//                        Primitive.TextureEntryFace teFace = sop.Shape.Textures.FaceTextures[i];
+//
+//                        UUID textureID;
+//
+//                        if (teFace != null)
+//                            textureID = teFace.TextureID;
+//                        else
+//                            textureID = sop.Shape.Textures.DefaultTexture.TextureID;
+//
+//                        binWriter.Write(textureID.GetBytes());
+//                    }
+//
+//                    block.TextureID = memStream.ToArray();
+//                }
+//            }
+           
            block.TextureID = new byte[0]; // TextureID ???
            block.SitName = Util.StringToBytes256(root.SitName);
            block.OwnerMask = root.OwnerMask;
@@ -4839,7 +5029,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
                if (eq != null)
                {
-                    eq.ParcelProperties(updateMessage, this.AgentId);
+                    OSD message_body = updateMessage.Serialize();
+                    // Add new fields here until OMV has them
+                    OSDMap bodyMap = (OSDMap)message_body;
+                    OSDArray parcelDataArray = (OSDArray)bodyMap["ParcelData"];
+                    OSDMap parcelData = (OSDMap)parcelDataArray[0];
+                    parcelData["SeeAVs"] = OSD.FromBoolean(landData.SeeAVs);
+                    parcelData["AnyAVSounds"] = OSD.FromBoolean(landData.AnyAVSounds);
+                    parcelData["GroupAVSounds"] = OSD.FromBoolean(landData.GroupAVSounds);
+                    OSDMap message = new OSDMap();
+                    message.Add("message", OSD.FromString("ParcelProperties"));
+                    message.Add("body", message_body);
+                    eq.Enqueue (message, this.AgentId);
+                    //eq.ParcelProperties(updateMessage, this.AgentId);
                } 
                else 
                {
@@ -4877,7 +5079,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendForceClientSelectObjects(List<uint> ObjectIDs)
        {
-            m_log.WarnFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
+//            m_log.DebugFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
            
            bool firstCall = true;
            const int MAX_OBJECTS_PER_PACKET = 251;
@@ -4997,33 +5199,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                position = presence.OffsetPosition;
                rotation = presence.Rotation;
+                angularVelocity = presence.AngularVelocity;
-                if (presence.ParentID != 0)
+                rotation = presence.Rotation;
-                {
-                    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;
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
+                // attachPoint = presence.State; // Core: commented
                collisionPlane = presence.CollisionPlane;
                velocity = presence.Velocity;
                acceleration = Vector3.Zero;
-                // Interestingly, sending this to non-zero will cause the client's avatar to start moving & accelerating
-                // in that direction, even though we don't model this on the server.  Implementing this in the future
-                // may improve movement smoothness.
-//                acceleration = new Vector3(1, 0, 0);
-                
                if (sendTexture)
                    textureEntry = presence.Appearance.Texture.GetBytes();
                else
@@ -5034,7 +5221,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                SceneObjectPart part = (SceneObjectPart)entity;
                attachPoint = part.ParentGroup.AttachmentPoint;
+                attachPoint = ((attachPoint % 16) * 16 + (attachPoint / 16));
 //                m_log.DebugFormat(
 //                    "[LLCLIENTVIEW]: Sending attachPoint {0} for {1} {2} to {3}",
 //                    attachPoint, part.Name, part.LocalId, Name);
@@ -5062,7 +5249,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pos += 4;
            // Avatar/CollisionPlane
-            data[pos++] = (byte)((attachPoint % 16) * 16 + (attachPoint / 16)); ;
+            data[pos++] = (byte) attachPoint;
            if (avatar)
            {
                data[pos++] = 1;
@@ -5132,30 +5319,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Vector3 offsetPosition = data.OffsetPosition;
            Quaternion rotation = data.Rotation;
            uint parentID = data.ParentID;
+  
-            if (parentID != 0)
+//            m_log.DebugFormat(
-            {
+//                "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);
-                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);
-            offsetPosition.ToBytes(objectData, 16);
            Vector3 velocity = new Vector3(0, 0, 0);
            Vector3 acceleration = new Vector3(0, 0, 0);
+            rotation.Normalize();
+            Vector3 vrot = new Vector3(rotation.X, rotation.Y, rotation.Z);
+            data.CollisionPlane.ToBytes(objectData, 0);
+            offsetPosition.ToBytes(objectData, 16);
            velocity.ToBytes(objectData, 28);
            acceleration.ToBytes(objectData, 40);
-//            data.Velocity.ToBytes(objectData, 28);
+            vrot.ToBytes(objectData, 52);
-//            data.Acceleration.ToBytes(objectData, 40);
+            data.AngularVelocity.ToBytes(objectData, 64);
-            rotation.ToBytes(objectData, 52);
-            //data.AngularVelocity.ToBytes(objectData, 64);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5168,7 +5348,13 @@ 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 = parentID;
+            SceneObjectPart parentPart = data.ParentPart;
+            if (parentPart != null)
+                update.ParentID = parentPart.ParentGroup.LocalId;
+            else
+                update.ParentID = 0;
            update.PathCurve = 16;
            update.PathScaleX = 100;
            update.PathScaleY = 100;
@@ -5205,15 +5391,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            data.RelativePosition.ToBytes(objectData, 0);
            data.Velocity.ToBytes(objectData, 12);
            data.Acceleration.ToBytes(objectData, 24);
-            try
-            {
+            Quaternion rotation = data.RotationOffset;
-                data.RotationOffset.ToBytes(objectData, 36);
+            rotation.Normalize();
-            }
+            Vector3 vrot = new Vector3(rotation.X, rotation.Y, rotation.Z);
-            catch (Exception e)
+            vrot.ToBytes(objectData, 36);
-            {
-                m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString());
-                OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36);
-            }
            data.AngularVelocity.ToBytes(objectData, 48);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5387,7 +5569,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
            AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
            AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
-            AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply);
+            AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
            AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest);
            AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance);
            AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing);
@@ -5448,8 +5630,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.ScriptAnswerYes, HandleScriptAnswerYes, false);
            AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
            AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
-            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage);
+            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
-            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest);
+            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
            AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
            AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
            AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket);
@@ -5481,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
            AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
            AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
-            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
+            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest, false);
            AddLocalPacketHandler(PacketType.ParcelInfoRequest, HandleParcelInfoRequest);
            AddLocalPacketHandler(PacketType.ParcelAccessListRequest, HandleParcelAccessListRequest, false);
            AddLocalPacketHandler(PacketType.ParcelAccessListUpdate, HandleParcelAccessListUpdate, false);
@@ -5594,82 +5776,146 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Packet Handlers
+        public int TotalAgentUpdates { get; set; }
        #region Scene/Avatar
-        private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
+        // Threshold for body rotation to be a significant agent update
+        // use the abs of cos
+        private const float QDELTABody = 1.0f - 0.0001f;
+        private const float QDELTAHead = 1.0f - 0.0001f;
+        // Threshold for camera rotation to be a significant agent update
+        private const float VDELTA = 0.01f;
+        /// <summary>
+        /// This checks the update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
        {
-            if (OnAgentUpdate != null)
+            return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+        }
+        /// <summary>
+        /// This checks the movement/state update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            float qdelta1 = Math.Abs(Quaternion.Dot(x.BodyRotation, m_thisAgentUpdateArgs.BodyRotation));
+            //qdelta2 = Math.Abs(Quaternion.Dot(x.HeadRotation, m_thisAgentUpdateArgs.HeadRotation));
+            bool movementSignificant =
+                (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
+                || (x.ControlFlags != (byte)AgentManager.ControlFlags.NONE) // significant if user supplying any movement update commands
+                || (x.Flags != m_thisAgentUpdateArgs.Flags)                 // significant if Flags changed
+                || (x.State != m_thisAgentUpdateArgs.State)                 // significant if Stats changed
+                || (qdelta1 < QDELTABody)                                   // significant if body rotation above(below cos) threshold
+                // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
+                // || (qdelta2 < QDELTAHead)                               // significant if head rotation above(below cos) threshold
+                || (x.Far != m_thisAgentUpdateArgs.Far)                     // significant if far distance changed
+            ;
+            //if (movementSignificant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
+                //    qdelta1, qdelta2);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
+                //    x.ControlFlags, x.Flags, x.Far, x.State);
+            //}
+            return movementSignificant;
+        }
+        /// <summary>
+        /// This checks the camera update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            float vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            float vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+            float vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+            float vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
+            bool cameraSignificant =
+                (vdelta1 > VDELTA) ||
+                (vdelta2 > VDELTA) ||
+                (vdelta3 > VDELTA) ||
+                (vdelta4 > VDELTA)
+            ;
+            //if (cameraSignificant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+                //    x.CameraAtAxis, x.CameraCenter);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+                //    x.CameraLeftAxis, x.CameraUpAxis);
+            //}
+            return cameraSignificant;
+        }
+        private bool HandleAgentUpdate(IClientAPI sender, Packet packet)
+        {
+            // We got here, which means that something in agent update was significant
+            AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+            AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
+            if (x.AgentID != AgentId || x.SessionID != SessionId)
            {
-                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+                PacketPool.Instance.ReturnPacket(packet);
+                return false;
+            }
-                #region Packet Session and User Check
+            TotalAgentUpdates++;
-                if (agentUpdate.AgentData.SessionID != SessionId || agentUpdate.AgentData.AgentID != AgentId)
-                {
-                    PacketPool.Instance.ReturnPacket(packet);
-                    return false;
-                }
-                #endregion
-                bool update = false;
+            bool movement = CheckAgentMovementUpdateSignificance(x);
-                AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
+            bool camera = CheckAgentCameraUpdateSignificance(x);
-                if (m_lastAgentUpdateArgs != null)
-                {
-                    // These should be ordered from most-likely to
-                    // least likely to change. I've made an initial
-                    // guess at that.
-                    update =
-                       (
-                        (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
-                        (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
-                        (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
-                        (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) ||
-                        (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
-                        (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
-                        (x.AgentID != m_lastAgentUpdateArgs.AgentID)
-                       );
-                }
-                else
-                {
-                    m_lastAgentUpdateArgs = new AgentUpdateArgs();
-                    update = true;
-                }
-                if (update)
+            // Was there a significant movement/state change?
-                {
+            if (movement)
-//                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
+            {
+                m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
+                m_thisAgentUpdateArgs.ControlFlags = x.ControlFlags;
+                m_thisAgentUpdateArgs.Far = x.Far;
+                m_thisAgentUpdateArgs.Flags = x.Flags;
+                m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation;
+//                m_thisAgentUpdateArgs.SessionID = x.SessionID;
+                m_thisAgentUpdateArgs.State = x.State;
-                    m_lastAgentUpdateArgs.AgentID = x.AgentID;
+                UpdateAgent handlerAgentUpdate = OnAgentUpdate;
-                    m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
+                UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
-                    m_lastAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
-                    m_lastAgentUpdateArgs.CameraCenter = x.CameraCenter;
-                    m_lastAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
-                    m_lastAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
-                    m_lastAgentUpdateArgs.ControlFlags = x.ControlFlags;
-                    m_lastAgentUpdateArgs.Far = x.Far;
-                    m_lastAgentUpdateArgs.Flags = x.Flags;
-                    m_lastAgentUpdateArgs.HeadRotation = x.HeadRotation;
-                    m_lastAgentUpdateArgs.SessionID = x.SessionID;
-                    m_lastAgentUpdateArgs.State = x.State;
-                    UpdateAgent handlerAgentUpdate = OnAgentUpdate;
+                if (handlerPreAgentUpdate != null)
-                    UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
+                    OnPreAgentUpdate(this, m_thisAgentUpdateArgs);
-                    if (handlerPreAgentUpdate != null)
+                if (handlerAgentUpdate != null)
-                        OnPreAgentUpdate(this, m_lastAgentUpdateArgs);
+                    OnAgentUpdate(this, m_thisAgentUpdateArgs);
-                    if (handlerAgentUpdate != null)
+                handlerAgentUpdate = null;
-                        OnAgentUpdate(this, m_lastAgentUpdateArgs);
+                handlerPreAgentUpdate = null;
+            }
-                    handlerAgentUpdate = null;
+            // Was there a significant camera(s) change?
-                    handlerPreAgentUpdate = null;
+            if (camera)
-                }
+            {
+                m_thisAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
+                m_thisAgentUpdateArgs.CameraCenter = x.CameraCenter;
+                m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
+                m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
+                UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate;
+                if (handlerAgentCameraUpdate != null)
+                    handlerAgentCameraUpdate(this, m_thisAgentUpdateArgs);
+                handlerAgentCameraUpdate = null;
            }
            PacketPool.Instance.ReturnPacket(packet);
@@ -6260,6 +6506,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            //m_log.Info("[LAND]: LAND:" + modify.ToString());
            if (modify.ParcelData.Length > 0)
            {
+                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore, 
+                // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit.
+                m_justEditedTerrain = true; // Prevent terrain packet (Land layer) from being queued, make it unreliable
                if (OnModifyTerrain != null)
                {
                    for (int i = 0; i < modify.ParcelData.Length; i++)
@@ -6275,6 +6524,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        }
                    }
                }
+                m_justEditedTerrain = false; // Queue terrain packet (Land layer) if necessary, make it reliable again
            }
            return true;
@@ -6343,7 +6593,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    
                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
                    for (int i=0; i<appear.WearableData.Length;i++)
-                        cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
+                        cacheitems[i] = new WearableCacheItem(){
+                            CacheId = appear.WearableData[i].CacheID,
+                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)                           
+                        };
                    
@@ -6549,8 +6802,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
-        private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack)
+      private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack)
        {
+            m_log.DebugFormat("[LLClientView] HandleCompleteAgentMovement");
            Action<IClientAPI, bool> handlerCompleteMovementToRegion = OnCompleteMovementToRegion;
            if (handlerCompleteMovementToRegion != null)
            {
@@ -6636,6 +6891,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                }
                #endregion
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
                AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
                if (handlerAgentRequestSit != null)
@@ -6660,6 +6921,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                }
                #endregion
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
                AgentSit handlerAgentSit = OnAgentSit;
                if (handlerAgentSit != null)
                {
@@ -6669,6 +6936,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return true;
        }
+        /// <summary>
+        /// Used when a child agent gets a sit response which should not be fulfilled.
+        /// </summary>
+        private void SendCantSitBecauseChildAgentResponse()
+        {
+            SendAlertMessage("Try moving closer.  Can't sit on object because it is not in the same region as you.");
+        }
        private bool HandleSoundTrigger(IClientAPI sender, Packet Pack)
        {
            SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack;
@@ -7879,129 +8154,145 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
            TransferRequestPacket transfer = (TransferRequestPacket)Pack;
-            //m_log.Debug("Transfer Request: " + transfer.ToString());
-            // Validate inventory transfers
-            // Has to be done here, because AssetCache can't do it
-            //
            UUID taskID = UUID.Zero;
            if (transfer.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
            {
-                taskID = new UUID(transfer.TransferInfo.Params, 48);
-                UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
-                UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
-//                m_log.DebugFormat(
-//                    "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
-//                    requestID, itemID, taskID, Name);
                if (!(((Scene)m_scene).Permissions.BypassPermissions()))
                {
-                    if (taskID != UUID.Zero) // Prim
+                    // We're spawning a thread because the permissions check can block this thread
+                    Util.FireAndForget(delegate
                    {
-                        SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
+                        // This requests the asset if needed
+                        HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer);
+                    });
+                    return true;
+                }
+            }
+            else if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            {
+                //TransferRequestPacket does not include covenant uuid?
+                //get scene covenant uuid
+                taskID = m_scene.RegionInfo.RegionSettings.Covenant;
+            }
-                        if (part == null)
+            // This is non-blocking
-                        {
+            MakeAssetRequest(transfer, taskID);
-                            m_log.WarnFormat(
-                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist",
-                                Name, requestID, itemID, taskID);
-                            return true;
-                        }
-                        TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
+            return true;
-                        if (tii == null)
+        }
-                        {
-                            m_log.WarnFormat(
-                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist",
-                                Name, requestID, itemID, taskID);
-                            return true;
-                        }
-                        if (tii.Type == (int)AssetType.LSLText)
+        private void HandleSimInventoryTransferRequestWithPermsCheck(IClientAPI sender, TransferRequestPacket transfer)
-                        {
+        {
-                            if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
+            UUID taskID = new UUID(transfer.TransferInfo.Params, 48);
-                                return true;
+            UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
-                        }
+            UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
-                        else if (tii.Type == (int)AssetType.Notecard)
-                        {
-                            if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
-                                return true;
-                        }
-                        else
-                        {
-                            // TODO: Change this code to allow items other than notecards and scripts to be successfully
-                            // shared with group.  In fact, this whole block of permissions checking should move to an IPermissionsModule
-                            if (part.OwnerID != AgentId)
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
-                                    Name, requestID, itemID, taskID, part.OwnerID);
-                                return true;
-                            }
-                            if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+            //m_log.DebugFormat(
-                            {
+            //    "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
-                                m_log.WarnFormat(
+            //    requestID, itemID, taskID, Name);
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set",
-                                    Name, requestID, itemID, taskID);
-                                return true;
-                            }
-                            if (tii.OwnerID != AgentId)
+            //m_log.Debug("Transfer Request: " + transfer.ToString());
-                            {
+            // Validate inventory transfers
-                                m_log.WarnFormat(
+            // Has to be done here, because AssetCache can't do it
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}",
+            //
-                                    Name, requestID, itemID, taskID, tii.OwnerID);
+            if (taskID != UUID.Zero) // Prim
-                                return true;
+            {
-                            }
+                SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
-                            if ((
+                if (part == null)
-                                tii.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                {
-                                    != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                    m_log.WarnFormat(
-                            {
+                        "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist",
-                                m_log.WarnFormat(
+                        Name, requestID, itemID, taskID);
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer",
+                    return;
-                                    Name, requestID, itemID, taskID);
+                }
-                                return true;
-                            }
-                            if (tii.AssetID != requestID)
+                TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
-                            {
+                if (tii == null)
-                                m_log.WarnFormat(
+                {
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}",
+                    m_log.WarnFormat(
-                                    Name, requestID, itemID, taskID, tii.AssetID);
+                        "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist",
-                                return true;
+                        Name, requestID, itemID, taskID);
-                            }
+                    return;
-                        }
+                }
+                if (tii.Type == (int)AssetType.LSLText)
+                {
+                    if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
+                        return;
+                }
+                else if (tii.Type == (int)AssetType.Notecard)
+                {
+                    if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
+                        return;
+                }
+                else
+                {
+                    // TODO: Change this code to allow items other than notecards and scripts to be successfully
+                    // shared with group.  In fact, this whole block of permissions checking should move to an IPermissionsModule
+                    if (part.OwnerID != AgentId)
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
+                            Name, requestID, itemID, taskID, part.OwnerID);
+                        return;
                    }
-                    else // Agent
+                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                    {
-                        IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+                        m_log.WarnFormat(
-                        if (invAccess != null)
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set",
-                        {
+                            Name, requestID, itemID, taskID);
-                            if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
+                        return;
-                                return false;
+                    }
-                        }
-                        else
+                    if (tii.OwnerID != AgentId)
-                        {
+                    {
-                            return false;
+                        m_log.WarnFormat(
-                        }
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}",
+                            Name, requestID, itemID, taskID, tii.OwnerID);
+                        return;
+                    }
+                    if ((
+                        tii.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                            != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer",
+                            Name, requestID, itemID, taskID);
+                        return;
+                    }
+                    if (tii.AssetID != requestID)
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}",
+                            Name, requestID, itemID, taskID, tii.AssetID);
+                        return;
                    }
                }
            }
-            else
+            else // Agent
-                if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            {
+                IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+                if (invAccess != null)
                {
-                    //TransferRequestPacket does not include covenant uuid?
+                    if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
-                    //get scene covenant uuid
+                        return;
-                    taskID = m_scene.RegionInfo.RegionSettings.Covenant;
                }
+                else
+                {
+                    return;
+                }
+            }
+            // Permissions out of the way, let's request the asset
            MakeAssetRequest(transfer, taskID);
-            return true;
        }
        private bool HandleAssetUploadRequest(IClientAPI sender, Packet Pack)
        {
            AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
@@ -11732,8 +12023,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
        /// <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.
        /// </summary>
        /// <remarks>
        /// At the moment, we always reply that there is no cached texture.
@@ -11741,6 +12030,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="simclient"></param>
        /// <param name="packet"></param>
        /// <returns></returns>
+        // 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>();
+            for (int i = 0; i < cachedtex.WearableData.Length; i++)
+            {
+                CachedTextureRequestArg arg = new CachedTextureRequestArg();
+                arg.BakedTextureIndex = cachedtex.WearableData[i].TextureIndex;
+                arg.WearableHashID = cachedtex.WearableData[i].ID;
+                
+                requestArgs.Add(arg);
+            }
+            CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+            if (handlerCachedTextureRequest != null)
+            {
+                handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+            }
+            return true;
+        }*/
        protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
        {
            //m_log.Debug("texture cached: " + packet.ToString());
@@ -11749,156 +12067,105 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (cachedtex.AgentData.SessionID != SessionId)
                return false;
-            
            // TODO: don't create new blocks if recycling an old packet
            cachedresp.AgentData.AgentID = AgentId;
            cachedresp.AgentData.SessionID = m_sessionId;
-            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
+            cachedresp.AgentData.SerialNum = cachedtex.AgentData.SerialNum;
-            m_cachedTextureSerial++;
            cachedresp.WearableData =
                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
-            //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)
+            int cacheHits = 0;
-            {
-                // 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;
+            // 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
-                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;
-                        }
-                        /*
+            WearableCacheItem[] cacheItems = null;
-                         * 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)
+            ScenePresence p = m_scene.GetScenePresence(AgentId);
-                {
-                    foreach (WearableCacheItem item in cacheItems)
-                    {
-                       
-                        if (cache.GetCached(item.TextureID.ToString()) == null)
-                        {
-                            item.TextureAsset.Temporary = true;
-                            cache.Store(item.TextureAsset);
-                        }
+            if (p != null && p.Appearance != null)
+            {
+                cacheItems = p.Appearance.WearableCacheItems;
+            }
-                    }
+            if (cacheItems != null)
-                }
+            {
-               
+                for (int i = 0; i < maxWearablesLoop; i++)
-                if (cacheItems != null)
                {
-                   
+                    int idx = cachedtex.WearableData[i].TextureIndex;
-                    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] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
+                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                        cachedresp.WearableData[i].HostName = new byte[0];
+                    cachedresp.WearableData[i].HostName = new byte[0];
-                        if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+                    if (cachedtex.WearableData[i].ID == cacheItems[idx].CacheId)
-                        {
+                    {
-                            
+                        cachedresp.WearableData[i].TextureID = cacheItems[idx].TextureID;
-                            cachedresp.WearableData[i].TextureID = item.TextureID;
+                        cacheHits++;
-                        }
-                        else
-                        {
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        }
                    }
-                }
+                    else
-                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];
                    }
                }
            }
            else
            {
-                if (cache == null)
+                for (int i = 0; i < maxWearablesLoop; i++)
                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
+                    cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                    {
+                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                    cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                    //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                    cachedresp.WearableData[i].HostName = new byte[0];
-                            //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;
+            m_log.DebugFormat("texture cached: hits {0}", cacheHits);
-                        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.
+        /// </summary>
+        /// <param name="avatar"></param>
+        /// <param name="serial"></param>
+        /// <param name="cachedTextures"></param>
+        /// <returns></returns>
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+            ScenePresence presence = avatar as ScenePresence;
+            if (presence == null)
+                return;
+            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
+            // TODO: don't create new blocks if recycling an old packet
+            cachedresp.AgentData.AgentID = m_agentId;
+            cachedresp.AgentData.SessionID = m_sessionId;
+            cachedresp.AgentData.SerialNum = serial;
+            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[cachedTextures.Count];
+            for (int i = 0; i < cachedTextures.Count; i++)
+            {
+                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                cachedresp.WearableData[i].TextureIndex = (byte)cachedTextures[i].BakedTextureIndex;
+                cachedresp.WearableData[i].TextureID = cachedTextures[i].BakedTextureID;
+                cachedresp.WearableData[i].HostName = new byte[0];
+            }
+            cachedresp.Header.Zerocoded = true;
+            OutPacket(cachedresp, ThrottleOutPacketType.Task);
+        }
        protected bool HandleMultipleObjUpdate(IClientAPI simClient, Packet packet)
        {
            MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
@@ -11924,8 +12191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (part == null)
                    {
                        // It's a ghost! tell the client to delete it from view.
-                        simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
+                        simClient.SendKillObject(new List<uint> { localId });
-                                                 new List<uint> { localId });
                    }
                    else
                    {
@@ -12299,6 +12565,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            shape.PCode = addPacket.ObjectData.PCode;
            shape.State = addPacket.ObjectData.State;
+            shape.LastAttachPoint = addPacket.ObjectData.State;
            shape.PathBegin = addPacket.ObjectData.PathBegin;
            shape.PathEnd = addPacket.ObjectData.PathEnd;
            shape.PathScaleX = addPacket.ObjectData.PathScaleX;
@@ -12329,7 +12596,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ClientInfo info = m_udpClient.GetClientInfo();
            info.proxyEP = null;
-            info.agentcircuit = RequestClientInfo();
+            if (info.agentcircuit == null)
+                info.agentcircuit = RequestClientInfo();
            return info;
        }
@@ -12712,11 +12980,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            OutPacket(dialog, ThrottleOutPacketType.Task);
        }
-        public void StopFlying(ISceneEntity p)
+        public void SendAgentTerseUpdate(ISceneEntity p)
        {
            if (p is ScenePresence)
            {
-                ScenePresence presence = p as ScenePresence;
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", 
+//                    p.Name, Name, Scene.Name);
                // It turns out to get the agent to stop flying, you have to feed it stop flying velocities
                // There's no explicit message to send the client to tell it to stop flying..   it relies on the
                // velocity, collision plane and avatar height
@@ -12724,34 +12995,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
                // when the avatar stands up
-                Vector3 pos = presence.AbsolutePosition;
-                if (presence.Appearance.AvatarHeight != 127.0f)
-                    pos += new Vector3(0f, 0f, (presence.Appearance.AvatarHeight/6f));
-                else
-                    pos += new Vector3(0f, 0f, (1.56f/6f));
-                presence.AbsolutePosition = pos;
-                // attach a suitable collision plane regardless of the actual situation to force the LLClient to land.
-                // Collision plane below the avatar's position a 6th of the avatar's height is suitable.
-                // Mind you, that this method doesn't get called if the avatar's velocity magnitude is greater then a
-                // certain amount..   because the LLClient wouldn't land in that situation anyway.
-                // why are we still testing for this really old height value default???
-                if (presence.Appearance.AvatarHeight != 127.0f)
-                    presence.CollisionPlane = new Vector4(0, 0, 0, pos.Z - presence.Appearance.AvatarHeight/6f);
-                else
-                    presence.CollisionPlane = new Vector4(0, 0, 0, pos.Z - (1.56f/6f));
                ImprovedTerseObjectUpdatePacket.ObjectDataBlock block =
                    CreateImprovedTerseBlock(p, false);
                const float TIME_DILATION = 1.0f;
                ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
                ImprovedTerseObjectUpdatePacket packet
                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
                        PacketType.ImprovedTerseObjectUpdate);