18 files changed, 995 insertions, 659 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 5beb37d..91df64d 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -431,6 +431,8 @@ namespace OpenSim.Framework
            // The code to pack textures, visuals, wearables and attachments
            // should be removed; packed appearance contains the full appearance
            // This is retained for backward compatibility only
+/*  then lets remove
            if (Appearance.Texture != null)
            {
                byte[] rawtextures = Appearance.Texture.GetBytes();
@@ -459,7 +461,7 @@ namespace OpenSim.Framework
                args["attachments"] = attachs;
            }
            // End of code to remove
+*/
            if ((Controllers != null) && (Controllers.Length > 0))
            {
                OSDArray controls = new OSDArray(Controllers.Length);
@@ -647,58 +649,71 @@ namespace OpenSim.Framework
            //        AgentTextures[i++] = o.AsUUID();
            //}
-            Appearance = new AvatarAppearance();
-            // The code to unpack textures, visuals, wearables and attachments
+            // packed_appearence should contain all appearance information
-            // should be removed; packed appearance contains the full appearance
+            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
-            // This is retained for backward compatibility only
-            if (args["texture_entry"] != null)
            {
-                byte[] rawtextures = args["texture_entry"].AsBinary();
+                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] got packed appearance");
-                Primitive.TextureEntry textures = new Primitive.TextureEntry(rawtextures,0,rawtextures.Length);
+                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
-                Appearance.SetTextureEntries(textures);
            }
+            else
+            {
+                // if missing try the old pack method
+                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance, checking old method");
-            if (args["visual_params"] != null)
+                Appearance = new AvatarAppearance();
-                Appearance.SetVisualParams(args["visual_params"].AsBinary());
-            if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+                // The code to unpack textures, visuals, wearables and attachments
-            {
+                // should be removed; packed appearance contains the full appearance
-                OSDArray wears = (OSDArray)(args["wearables"]);
+                // This is retained for backward compatibility only
+                if (args["texture_entry"] != null)
+                {
+                    byte[] rawtextures = args["texture_entry"].AsBinary();
+                    Primitive.TextureEntry textures = new Primitive.TextureEntry(rawtextures, 0, rawtextures.Length);
+                    Appearance.SetTextureEntries(textures);
+                }
-                int count = wears.Count;
+                if (args["visual_params"] != null)
-                if (count > AvatarWearable.MAX_WEARABLES)
+                    Appearance.SetVisualParams(args["visual_params"].AsBinary());
-                    count = AvatarWearable.MAX_WEARABLES;
-                for (int i = 0; i < count / 2; i++) 
+                if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
                {
-                    AvatarWearable awear = new AvatarWearable((OSDArray)wears[i]);
+                    OSDArray wears = (OSDArray)(args["wearables"]);
-                    Appearance.SetWearable(i,awear);
+                    int count = wears.Count;
+                    if (count > AvatarWearable.MAX_WEARABLES)
+                        count = AvatarWearable.MAX_WEARABLES;
+                    for (int i = 0; i < count / 2; i++)
+                    {
+                        AvatarWearable awear = new AvatarWearable((OSDArray)wears[i]);
+                        Appearance.SetWearable(i, awear);
+                    }
                }
-            }
-            if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+                if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
-            {
-                OSDArray attachs = (OSDArray)(args["attachments"]);
-                foreach (OSD o in attachs)
                {
-                    if (o.Type == OSDType.Map)
+                    OSDArray attachs = (OSDArray)(args["attachments"]);
+                    foreach (OSD o in attachs)
                    {
-                        // We know all of these must end up as attachments so we
+                        if (o.Type == OSDType.Map)
-                        // append rather than replace to ensure multiple attachments
+                        {
-                        // per point continues to work
+                            // We know all of these must end up as attachments so we
-//                        m_log.DebugFormat("[CHILDAGENTDATAUPDATE]: Appending attachments for {0}", AgentID);
+                            // append rather than replace to ensure multiple attachments
-                        Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o));
+                            // per point continues to work
+                            //                        m_log.DebugFormat("[CHILDAGENTDATAUPDATE]: Appending attachments for {0}", AgentID);
+                            Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o));
+                        }
                    }
                }
+                // end of code to remove
            }
-            // end of code to remove
+/* moved above
            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
            else
                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance");
+*/
            if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array)
            {
                OSDArray controls = (OSDArray)(args["controllers"]);
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 22cc79d..d73802e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -755,6 +755,8 @@ namespace OpenSim.Framework
        /// </summary>
        bool IsActive { get; set; }
+        int PingTimeMS { get; }
        /// <summary>
        /// Set if the client is closing due to a logout request
        /// </summary>
@@ -1114,6 +1116,8 @@ namespace OpenSim.Framework
        /// <param name="localID"></param>
        void SendKillObject(List<uint> localID);
+        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
        void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
        void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index e4f1111..d6c39a7 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -62,7 +62,9 @@ namespace OpenSim.Framework
        private uint m_nextQueue = 0;
        private uint m_countFromQueue = 0;
        // first queues are imediate, so no counts 
-        private uint[] m_queueCounts = {0, 0, 8, 4, 4, 2, 2, 2, 2, 1, 1, 1};
+//        private uint[] m_queueCounts = { 0, 0,          8,  4,  4, 2,  2,   2,  2,  1,  1, 1 };
+        private uint[] m_queueCounts = {0,   0,   8,      8,  5,  4, 3,  2,   1,  1,  1,  1};
+        // this is                     ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
        // next request is a counter of the number of updates queued, it provides
        // a total ordering on the updates coming through the queue and is more
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 33ef8e0..86e5293 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework
        /// Number of milliseconds a call can take before it is considered
        /// a "long" call for warning & debugging purposes
        /// </summary>
-        public const int LongCallTime = 3000;
+        public const int LongCallTime = 500;
        /// <summary>
        /// The maximum length of any data logged because of a long request time.
@@ -208,6 +208,9 @@ namespace OpenSim.Framework
            string errorMessage = "unknown error";
            int tickstart = Util.EnvironmentTickCount();
            int tickdata = 0;
+            int tickcompressdata = 0;
+            int tickJsondata = 0;
+            int compsize = 0;
            string strBuffer = null;
            try
@@ -225,6 +228,8 @@ namespace OpenSim.Framework
                {
                    strBuffer = OSDParser.SerializeJsonString(data);
+                    tickJsondata = Util.EnvironmentTickCountSubtract(tickstart);
                    if (DebugLevel >= 5)
                        LogOutgoingDetail(strBuffer);
@@ -243,13 +248,19 @@ namespace OpenSim.Framework
                                // gets written on the strteam upon Dispose()
                            }
                            byte[] buf = ms.ToArray();
+                            tickcompressdata = Util.EnvironmentTickCountSubtract(tickstart);
                            request.ContentLength = buf.Length;   //Count bytes to send
+                            compsize = buf.Length;
                            using (Stream requestStream = request.GetRequestStream())
                                requestStream.Write(buf, 0, (int)buf.Length);
                        }
                    }
                    else
                    {
+                        tickcompressdata = tickJsondata;
+                        compsize = buffer.Length;
                        request.ContentType = "application/json";
                        request.ContentLength = buffer.Length;   //Count bytes to send
                        using (Stream requestStream = request.GetRequestStream())
@@ -291,12 +302,16 @@ namespace OpenSim.Framework
                int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                if (tickdiff > LongCallTime)
                    m_log.InfoFormat(
-                        "[WEB UTIL]: Slow ServiceOSD request {0} {1} {2} took {3}ms, {4}ms writing, {5}",
+                        "[WEB UTIL]: Slow ServiceOSD request {0} {1} {2} took {3}ms, {4}ms writing({5} at Json; {6} at comp), {7} bytes ({8} uncomp): {9}",
                        reqnum,
                        method,
                        url,
                        tickdiff,
                        tickdata,
+                        tickJsondata,
+                        tickcompressdata,
+                        compsize,
+                        strBuffer != null ? strBuffer.Length : 0,
                        strBuffer != null
                            ? (strBuffer.Length > MaxRequestDiagLength ? strBuffer.Remove(MaxRequestDiagLength) : strBuffer)
                            : "");
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 85049c9..e1e3d87 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -978,15 +978,25 @@ namespace OpenSim
            cdt.AddColumn("Circuit code", 12);
            cdt.AddColumn("Endpoint", 23);
            cdt.AddColumn("Active?", 7);
+            cdt.AddColumn("ChildAgent?", 7);
+            cdt.AddColumn("ping(ms)", 8);
            SceneManager.ForEachScene(
                s => s.ForEachClient(
-                    c => cdt.AddRow(
+                    c =>
-                        s.Name,
+                        {
-                        c.Name,
+                            bool child = false;
-                        c.CircuitCode.ToString(),
+                            if(c.SceneAgent != null && c.SceneAgent.IsChildAgent)
-                        c.RemoteEndPoint.ToString(),                
+                                child = true;
-                        c.IsActive.ToString())));
+                            cdt.AddRow(
+                            s.Name,
+                            c.Name,
+                            c.CircuitCode.ToString(),
+                            c.RemoteEndPoint.ToString(),
+                            c.IsActive.ToString(),
+                            child.ToString(),
+                            c.PingTimeMS);
+                        }));
            MainConsole.Instance.Output(cdt.ToString());
        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 59d1c69..06f1301 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -358,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>
@@ -419,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>
@@ -440,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
@@ -461,6 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            set { m_disableFacelights = value; }
        }
        public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
       
@@ -1638,6 +1652,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pc.PingID.OldestUnacked = 0;
            OutPacket(pc, ThrottleOutPacketType.Unknown);
+            UDPClient.m_lastStartpingTimeMS = Util.EnvironmentTickCount();
        }
        public void SendKillObject(List<uint> localIDs)
@@ -3813,8 +3828,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            {
                SceneObjectPart e = (SceneObjectPart)entity;
                SceneObjectGroup g = e.ParentGroup;
-                if (g.RootPart.Shape.State > 30 && g.RootPart.Shape.State < 39) // HUD
+                if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId)
-                    if (g.OwnerID != AgentId)
                        return; // Don't send updates for other people's HUDs
            }
@@ -3824,47 +3838,53 @@ 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);
-            // We're not going to worry about interlock yet since its not currently critical that this total count
+                    // Remove the update packet from the list of packets waiting for acknowledgement
-            // is 100% correct
+                    // because we are requeuing the list of updates. They will be resent in new packets
-            m_udpServer.PacketsResentCount++;
+                    // with the most recent state and priority.
+                    m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
-            foreach (EntityUpdate update in updates)
+                    // Count this as a resent packet since we are going to requeue all of the updates contained in it
-                ResendPrimUpdate(update);
+                    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>>();
@@ -3932,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 && part.ParentGroup.RootPart.Shape.State < 39)
                            continue;
                        ScenePresence sp;
                        // Owner is not in the sim, don't update it to
@@ -4184,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)
@@ -5278,16 +5325,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            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();
@@ -5343,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();
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index bd4e617..fe31bd9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -163,6 +163,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private int m_maxRTO = 60000;
        public bool m_deliverPackets = true;
+        public int m_lastStartpingTimeMS;
+        public int m_pingMS;
+        public int PingTimeMS
+        {
+            get
+            {
+                if (m_pingMS < 10)
+                    return 10;
+                if(m_pingMS > 2000)
+                    return 2000;
+                return m_pingMS;
+            }
+        }
        /// <summary>
        /// This is the percentage of the udp texture queue to add to the task queue since
        /// textures are now generally handled through http.
@@ -225,6 +240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // Initialize this to a sane value to prevent early disconnects
            TickLastPacketReceived = Environment.TickCount & Int32.MaxValue;
+            m_pingMS = (int)(3.0 * server.TickCountResolution); // so filter doesnt start at 0; 
        }
        /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index fe79f87..3b0312d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -293,6 +293,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <summary>Flag to signal when clients should send pings</summary>
        protected bool m_sendPing;
+        private int m_animationSequenceNumber;
+        public int NextAnimationSequenceNumber
+        {
+            get
+            {
+                m_animationSequenceNumber++;
+                if (m_animationSequenceNumber > 2147482624)
+                    m_animationSequenceNumber = 1;
+                return m_animationSequenceNumber;
+            }
+        }
        private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
        /// <summary>
@@ -369,16 +384,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // Measure the resolution of Environment.TickCount
            TickCountResolution = 0f;
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 10; i++)
            {
                int start = Environment.TickCount;
                int now = start;
                while (now == start)
                    now = Environment.TickCount;
-                TickCountResolution += (float)(now - start) * 0.2f;
+                TickCountResolution += (float)(now - start) * 0.1f;
            }
-            m_log.Info("[LLUDPSERVER]: Average Environment.TickCount resolution: " + TickCountResolution + "ms");
            TickCountResolution = (float)Math.Ceiling(TickCountResolution);
+            m_log.Info("[LLUDPSERVER]: Average Environment.TickCount resolution: " + TickCountResolution + "ms");
            #endregion Environment.TickCount Measurement
@@ -386,6 +401,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            int sceneThrottleBps = 0;
            bool usePools = false;
+           
            IConfig config = configSource.Configs["ClientStack.LindenUDP"];
            if (config != null)
            {
@@ -435,6 +452,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_throttle = new TokenBucket(null, sceneThrottleBps);
            ThrottleRates = new ThrottleRates(configSource);
+            Random rnd = new Random(Util.EnvironmentTickCount());
+            m_animationSequenceNumber = rnd.Next(11474826);
            if (usePools)
                EnablePools();
        }
@@ -1128,6 +1148,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pc.PingID.OldestUnacked = 0;
            SendPacket(udpClient, pc, ThrottleOutPacketType.Unknown, false, null);
+            udpClient.m_lastStartpingTimeMS = Util.EnvironmentTickCount();
        }
        public void CompletePing(LLUDPClient udpClient, byte pingID)
@@ -1567,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // We don't need to do anything else with ping checks
                StartPingCheckPacket startPing = (StartPingCheckPacket)packet;
                CompletePing(udpClient, startPing.PingID.PingID);
+                
                if ((Environment.TickCount - m_elapsedMSSinceLastStatReport) >= 3000)
                {
                    udpClient.SendPacketStats();
@@ -1577,7 +1598,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
            else if (packet.Type == PacketType.CompletePingCheck)
            {
-                // We don't currently track client ping times
+                int t = Util.EnvironmentTickCountSubtract(udpClient.m_lastStartpingTimeMS);
+                int c = udpClient.m_pingMS;
+                c = 800 * c + 200 * t;
+                c /= 1000;
+                udpClient.m_pingMS = c;
                return;
            }
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index de8925d..498cc2f 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -120,10 +120,16 @@ namespace OpenSim.Region.CoreModules.Framework
        public void CreateCaps(UUID agentId, uint circuitCode)
        {
+//            int ts = Util.EnvironmentTickCount();
+/*  this as no business here...
+ * must be done elsewhere ( and is )
            int flags = m_scene.GetUserFlags(agentId);
+            m_log.ErrorFormat("[CreateCaps]: banCheck {0} ", Util.EnvironmentTickCountSubtract(ts));
            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                return;
+*/
            Caps caps;
            String capsObjectPath = GetCapsPath(agentId);
@@ -132,19 +138,27 @@ namespace OpenSim.Region.CoreModules.Framework
                if (m_capsObjects.ContainsKey(circuitCode))
                {
                    Caps oldCaps = m_capsObjects[circuitCode];
-                    
-                    //m_log.WarnFormat(
+//                    if (capsObjectPath == oldCaps.CapsObjectPath)
-                    //    "[CAPS]: Recreating caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ", 
+//                    {
-                    //    agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
+//                        m_log.WarnFormat(
+//                           "[CAPS]: Reusing caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ",
+//                            agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
+//                        return;
+//                    }
                }
                caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
                        (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
                        capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
+//                m_log.ErrorFormat("[CreateCaps]: new caps {0} ", Util.EnvironmentTickCountSubtract(ts));
                m_capsObjects[circuitCode] = caps;
            }
            m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
+//            m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts));
        }
        public void RemoveCaps(UUID agentId, uint circuitCode)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 71148ea..781fc40 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -430,7 +430,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            }
            // TODO: Get proper AVG Height
-            float localAVHeight = 1.56f;
+            float localHalfAVHeight = 0.8f;
+            if (sp.Appearance != null)
+                localHalfAVHeight = sp.Appearance.AvatarHeight / 2;
            float posZLimit = 22;
            // TODO: Check other Scene HeightField
@@ -439,10 +442,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
            }
-            float newPosZ = posZLimit + localAVHeight;
+            posZLimit += localHalfAVHeight + 0.1f;
-            if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
+            if ((position.Z < posZLimit) && !(Single.IsInfinity(posZLimit) || Single.IsNaN(posZLimit)))
            {
-                position.Z = newPosZ;
+                position.Z = posZLimit;
            }
            if (sp.Flying)
@@ -720,7 +724,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
            agentCircuit.startpos = position;
            agentCircuit.child = true;
-            agentCircuit.Appearance = sp.Appearance;
+            
+//            agentCircuit.Appearance = sp.Appearance;
+//            agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false);
+            agentCircuit.Appearance = new AvatarAppearance();
+            agentCircuit.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
            if (currentAgentCircuit != null)
            {
                agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs;
@@ -971,10 +980,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            }
            // May need to logout or other cleanup
-            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, true); // until logout use is checked
            // Well, this is it. The agent is over there.
-            KillEntity(sp.Scene, sp.LocalId);
+//            KillEntity(sp.Scene, sp.LocalId);
+            sp.HasMovedAway();
            // Now let's make it officially a child agent
            sp.MakeChildAgent();
@@ -1137,11 +1149,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            // abandoned without proper close by viewer but then re-used by an incoming connection.
            sp.CloseChildAgents(newRegionX, newRegionY);
+            sp.HasMovedAway();
            // May need to logout or other cleanup
-            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, true);
            // Well, this is it. The agent is over there.
-            KillEntity(sp.Scene, sp.LocalId);
+//            KillEntity(sp.Scene, sp.LocalId);
            // Now let's make it officially a child agent
            sp.MakeChildAgent();
@@ -1253,7 +1267,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
        {
            if (sp.Scene.AttachmentsModule != null)
-                sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true);
+                sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, logout);
        }
        protected void KillEntity(Scene scene, uint localID)
@@ -1381,10 +1395,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        #region Agent Crossings
        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos)
        {
+            string r = String.Empty;
+            return GetDestination(scene, agentID, pos, out xDest, out yDest, out version, out newpos, out r);
+        }
+        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos, out string reason)
+        {
            version = String.Empty;
+            reason = String.Empty;
            newpos = pos;
 //            m_log.DebugFormat(
@@ -1498,8 +1518,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            }
            GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
+           
-            string reason;
            if (!scene.SimulationService.QueryAccess(neighbourRegion, agentID, newpos, out version, out reason))
            {
                if (r == null)
@@ -1525,11 +1544,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            uint y;
            Vector3 newpos;
            string version;
+            string reason;
-            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos);
+            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos, out reason);
            if (neighbourRegion == null)
            {
-                agent.ControllingClient.SendAlertMessage("Cannot region cross into void");
+                if (reason == String.Empty)
+                    agent.ControllingClient.SendAlertMessage("Cannot cross to region");
+                else
+                    agent.ControllingClient.SendAlertMessage("Cannot cross to region: " + reason); 
                return false;
            }
@@ -1656,10 +1679,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
        {
+            int ts = Util.EnvironmentTickCount();
            try
            {
                AgentData cAgent = new AgentData(); 
                agent.CopyTo(cAgent);
+//                agent.Appearance.WearableCacheItems = null;
                cAgent.Position = pos + agent.Velocity;
                if (isFlying)
                    cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
@@ -1686,6 +1714,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                    return false;
                }
+            m_log.DebugFormat("[CrossAgentIntoNewRegionMain] ok, time {0}ms",Util.EnvironmentTickCountSubtract(ts));
            }
            catch (Exception e)
            {
@@ -1703,6 +1733,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
            bool isFlying, string version)
        {
            agent.ControllingClient.RequestClientInfo();
            string agentcaps;
@@ -1714,6 +1745,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            }
            // No turning back
            agent.IsChildAgent = true;
            string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
@@ -1737,12 +1771,25 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                            capsPath);
            }
+            // Backwards compatibility. Best effort
+            if (version == "Unknown" || version == string.Empty)
+            {
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
+                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
+            }
            // SUCCESS!
            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
            // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+            // this may need the attachments
+            agent.parcelRegionCross();
+            AgentHasMovedAway(agent, true);
            agent.MakeChildAgent();
            // FIXME: Possibly this should occur lower down after other commands to close other agents,
@@ -1756,16 +1803,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //            agent.SendOtherAgentsAvatarDataToMe();
 //            agent.SendOtherAgentsAppearanceToMe();
-            agent.parcelRegionCross(false);
-            // Backwards compatibility. Best effort
-            if (version == "Unknown" || version == string.Empty)
-            {
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
-                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
-                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-            }
            // Next, let's close the child agent connections that are too far away.
            uint neighbourx;
            uint neighboury;
@@ -1777,7 +1814,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            agent.CloseChildAgents(neighbourx, neighboury);
-            AgentHasMovedAway(agent, false);
+ 
            // the user may change their profile information in other region,
            // so the userinfo in UserProfileCache is not reliable any more, delete it
@@ -1817,7 +1854,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        #region Enable Child Agent
        /// <summary>
-        /// This informs a single neighbouring region about agent "avatar".
+        /// This informs a single neighbouring region about agent "avatar", and avatar about it
        /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
        /// </summary>
        /// <param name="sp"></param>
@@ -1833,8 +1870,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            agent.startpos = new Vector3(128, 128, 70);
            agent.child = true;
-            //agent.Appearance = sp.Appearance;      
+            agent.Appearance = new AvatarAppearance();
-            agent.Appearance = new AvatarAppearance(sp.Appearance, true, false);  // guess this should be a lot less      
+            agent.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
            agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
@@ -1866,6 +1903,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                agent.Id0 = currentAgentCircuit.Id0;
            }
+            Thread.Sleep(200);  // the original delay that was at InformClientOfNeighbourAsync start
            IPEndPoint external = region.ExternalEndPoint;
            if (external != null)
            {
@@ -1884,6 +1923,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        /// <summary>
        /// This informs all neighbouring regions about agent "avatar".
+        /// and as important informs the avatar about then
        /// </summary>
        /// <param name="sp"></param>
        public void EnableChildAgents(ScenePresence sp)
@@ -1900,81 +1940,77 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                m_log.Debug("[ENTITY TRANSFER MODULE]: m_regionInfo was null in EnableChildAgents, is this a NPC?");
            }
-            /// We need to find the difference between the new regions where there are no child agents
+            LinkedList<ulong> previousRegionNeighbourHandles;
-            /// and the regions where there are already child agents. We only send notification to the former.
-            List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region
+            Dictionary<ulong, string> seeds;
-            neighbourHandles.Add(sp.Scene.RegionInfo.RegionHandle);  // add this region too
-            List<ulong> previousRegionNeighbourHandles;
            if (sp.Scene.CapsModule != null)
            {
-                previousRegionNeighbourHandles =
+                seeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
-                    new List<ulong>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID).Keys);
+                previousRegionNeighbourHandles = new LinkedList<ulong>(seeds.Keys);
            }
            else
            {
-                previousRegionNeighbourHandles = new List<ulong>();
-            }
-            List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles);
-            List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles);
-//            Dump("Current Neighbors", neighbourHandles);
-//            Dump("Previous Neighbours", previousRegionNeighbourHandles);
-//            Dump("New Neighbours", newRegions);
-//            Dump("Old Neighbours", oldRegions);
-            /// Update the scene presence's known regions here on this region
-            sp.DropOldNeighbours(oldRegions);
-            /// Collect as many seeds as possible
-            Dictionary<ulong, string> seeds;
-            if (sp.Scene.CapsModule != null)
-                seeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
-            else
                seeds = new Dictionary<ulong, string>();
+                previousRegionNeighbourHandles = new LinkedList<ulong>();
+            }
-            //m_log.Debug(" !!! No. of seeds: " + seeds.Count);
            if (!seeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
                seeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
-            /// Create the necessary child agents
+            AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+            List<ulong> newneighbours = new List<ulong>();
            List<AgentCircuitData> cagents = new List<AgentCircuitData>();
+            ulong currentRegionHandler = sp.Scene.RegionInfo.RegionHandle;
            foreach (GridRegion neighbour in neighbours)
            {
-                if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
+                ulong handler = neighbour.RegionHandle;
-                {
-                    AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
-                    agent.BaseFolder = UUID.Zero;
-                    agent.InventoryFolder = UUID.Zero;
-                    agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour);
-                    agent.child = true;
-                    // agent.Appearance = sp.Appearance;
-                    agent.Appearance = new AvatarAppearance(sp.Appearance, true, false);  // guess this should be a lot less
-                    if (currentAgentCircuit != null)
-                    {
-                        agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
-                        agent.IPAddress = currentAgentCircuit.IPAddress;
-                        agent.Viewer = currentAgentCircuit.Viewer;
-                        agent.Channel = currentAgentCircuit.Channel;
-                        agent.Mac = currentAgentCircuit.Mac;
-                        agent.Id0 = currentAgentCircuit.Id0;
-                    }
-                    if (newRegions.Contains(neighbour.RegionHandle))
+                if (handler == currentRegionHandler)
-                    {
+                    continue;
-                        agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
-                        sp.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
+                AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
-                        seeds.Add(neighbour.RegionHandle, agent.CapsPath);
+                agent.BaseFolder = UUID.Zero;
-                    }
+                agent.InventoryFolder = UUID.Zero;
-                    else
+                agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour);
-                    {
+                agent.child = true;
-                        agent.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, neighbour.RegionHandle);
+                agent.Appearance = new AvatarAppearance();
-                    }
+                agent.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
+                if (currentAgentCircuit != null)
+                {
+                    agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                    agent.IPAddress = currentAgentCircuit.IPAddress;
+                    agent.Viewer = currentAgentCircuit.Viewer;
+                    agent.Channel = currentAgentCircuit.Channel;
+                    agent.Mac = currentAgentCircuit.Mac;
+                    agent.Id0 = currentAgentCircuit.Id0;
+                }
-                    cagents.Add(agent);
+                if (previousRegionNeighbourHandles.Contains(handler))
+                {
+                    previousRegionNeighbourHandles.Remove(handler);
+                    agent.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, handler);
                }
+                else
+                {
+                    newneighbours.Add(handler);
+                    agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
+                    sp.AddNeighbourRegion(handler, agent.CapsPath);
+                    seeds.Add(handler, agent.CapsPath);
+                }
+                cagents.Add(agent);
+            }
+            //sp.DropOldNeighbours(previousRegionNeighbourHandles);
+            foreach (ulong handle in previousRegionNeighbourHandles)
+            {
+                sp.RemoveNeighbourRegion(handle);
+                Scene.CapsModule.DropChildSeed(sp.UUID, handle);
            }
            /// Update all child agent with everyone's seeds
@@ -1987,34 +2023,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, seeds);
            }
            sp.KnownRegions = seeds;
            //avatar.Scene.DumpChildrenSeeds(avatar.UUID);
            //avatar.DumpKnownRegions();
-            bool newAgent = false;
+            Util.FireAndForget(delegate
-            int count = 0;
-            foreach (GridRegion neighbour in neighbours)
            {
-                //m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
+                Thread.Sleep(200);  // the original delay that was at InformClientOfNeighbourAsync start
-                // Don't do it if there's already an agent in that region
+                int count = 0;
-                if (newRegions.Contains(neighbour.RegionHandle))
+                bool newagent;
-                    newAgent = true;
-                else
-                    newAgent = false;
-//                    continue;
-                if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
+                foreach (GridRegion neighbour in neighbours)
                {
                    try
                    {
-                        // Let's put this back at sync, so that it doesn't clog 
+                        newagent = newneighbours.Contains(neighbour.RegionHandle);
-                        // the network, especially for regions in the same physical server.
+                        InformClientOfNeighbourAsync(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newagent);
-                        // We're really not in a hurry here.
-                        InformClientOfNeighbourAsync(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent);
-                        //InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-                        //d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent,
-                        //              InformClientOfNeighbourCompleted,
-                        //              d);
                    }
                    catch (ArgumentOutOfRangeException)
@@ -2022,9 +2047,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                        m_log.ErrorFormat(
                           "[ENTITY TRANSFER MODULE]: Neighbour Regions response included the current region in the neighbour list.  The following region will not display to the client: {0} for region {1} ({2}, {3}).",
                           neighbour.ExternalHostName,
-                           neighbour.RegionHandle,
+                            neighbour.RegionHandle,
-                           neighbour.RegionLocX,
+                        neighbour.RegionLocX,
-                           neighbour.RegionLocY);
+                       neighbour.RegionLocY);
                    }
                    catch (Exception e)
                    {
@@ -2041,11 +2066,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                        // XXX: Well, decided to swallow the exception instead for now.  Let us see how that goes.
                        // throw e;
                    }
+                    count++;
                }
-                count++;
+            });
-            }
        }
        Vector3 CalculateOffset(ScenePresence sp, GridRegion neighbour)
@@ -2079,11 +2103,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        private void InformClientOfNeighbourAsync(ScenePresence sp, AgentCircuitData a, GridRegion reg,
                                                  IPEndPoint endPoint, bool newAgent)
        {
-            // Let's wait just a little to give time to originating regions to catch up with closing child agents
+             Scene scene = sp.Scene;
-            // after a cross here
+             if (!newAgent)
-            Thread.Sleep(500);
+                 return;
-            Scene scene = sp.Scene;
            m_log.DebugFormat(
                "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
@@ -2097,6 +2119,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            if (regionAccepted && newAgent)
            {
+                // give  time for createAgent to finish, since it is async and does grid services access              
+                Thread.Sleep(500);
                if (m_eqModule != null)
                {
                    #region IP Translation for NAT
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index ecd6a09..668087f 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -557,6 +557,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
        /// <param name="objectIDs"></param>
        public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs)
        {
+/*
            if (m_scenePresence.IsChildAgent)
                return;
@@ -571,6 +572,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                { 
                    client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs); 
                });
+ */
+            m_scenePresence.SendAnimPack(animations, seqs, objectIDs);
        }
        public void SendAnimPackToClient(IClientAPI client)
@@ -602,7 +605,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
            m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
-            SendAnimPack(animIDs, sequenceNums, objectIDs);
+//            SendAnimPack(animIDs, sequenceNums, objectIDs);
+            m_scenePresence.SendAnimPack(animIDs, sequenceNums, objectIDs);
        }
        public string GetAnimName(UUID animId)
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index ddae073..c0405ad 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -91,6 +91,11 @@ namespace OpenSim.Region.Framework.Scenes
                return 0;
            uint priority;
+            // HACK 
+            return GetPriorityByBestAvatarResponsiveness(client, entity);
            
            switch (m_scene.UpdatePrioritizationScheme)
            {
@@ -157,30 +162,31 @@ namespace OpenSim.Region.Framework.Scenes
        private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
        {
-            uint pqueue = ComputeDistancePriority(client,entity,false);
+            uint pqueue = 2; // keep compiler happy
            ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
            if (presence != null)
            {
-                if (!presence.IsChildAgent)
+                // All avatars other than our own go into pqueue 1
+                if (entity is ScenePresence)
+                    return 1;
+                if (entity is SceneObjectPart)
                {
-                    // All avatars other than our own go into pqueue 1
+                    // Attachments are high priority, 
-                    if (entity is ScenePresence)
+                    if (((SceneObjectPart)entity).ParentGroup.IsAttachment)
-                        return 1;
+                        return 2;
-                    
-                    if (entity is SceneObjectPart)
+                    pqueue = ComputeDistancePriority(client, entity, false);
-                    {
-                        // Attachments are high priority, 
+                    // Non physical prims are lower priority than physical prims
-                        if (((SceneObjectPart)entity).ParentGroup.IsAttachment)
+                    PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
-                            return 1;
+                    if (physActor == null || !physActor.IsPhysical)
+                        pqueue++;
-                        // Non physical prims are lower priority than physical prims
-                        PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
-                        if (physActor == null || !physActor.IsPhysical)
-                            pqueue++;
-                    }
                }
            }
+            else
+                pqueue = ComputeDistancePriority(client, entity, false);
            return pqueue;
        }
@@ -227,16 +233,28 @@ namespace OpenSim.Region.Framework.Scenes
            // And convert the distance to a priority queue, this computation gives queues
            // at 10, 20, 40, 80, 160, 320, 640, and 1280m
-            uint pqueue = PriorityQueue.NumberOfImmediateQueues;
+            uint pqueue = PriorityQueue.NumberOfImmediateQueues + 1; // reserve attachments queue
            uint queues = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues;
-            
+/*            
            for (int i = 0; i < queues - 1; i++)
            {
                if (distance < 30 * Math.Pow(2.0,i))
                    break;
                pqueue++;
            }
-            
+*/
+            if (distance > 10f)
+            {
+                float tmp = (float)Math.Log((double)distance) * 1.4426950408889634073599246810019f - 3.3219280948873623478703194294894f;
+                // for a map identical to original:
+                // now 
+                // 1st constant is 1/(log(2)) (natural log) so we get log2(distance)
+                // 2st constant makes it be log2(distance/10)
+                pqueue += (uint)tmp;
+                if (pqueue > queues - 1)
+                    pqueue = queues - 1;
+            }
            // If this is a root agent, then determine front & back
            // Bump up the priority queue (drop the priority) for any objects behind the avatar
            if (useFrontBack && ! presence.IsChildAgent)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index dd0c828..f5be7a7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -295,6 +295,18 @@ namespace OpenSim.Region.Framework.Scenes
            return myID;
        }
+        public uint AllocatePresenceLocalId()
+        {
+            uint myID;
+            _primAllocateMutex.WaitOne();
+            myID = ++m_lastAllocatedLocalId;
+            ++m_lastAllocatedLocalId;
+            _primAllocateMutex.ReleaseMutex();
+            return myID;
+        }
        
        #region Module Methods
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 28758a9..dd5ee65 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2636,6 +2636,16 @@ namespace OpenSim.Region.Framework.Scenes
                m_rootPart.UpdateFlag = UpdateRequired.TERSE;
            }
+            if (IsAttachment)
+            {
+                ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);
+                if (sp != null)
+                {
+                    sp.SendAttachmentScheduleUpdate(this);
+                    return;
+                }
+            }
            SceneObjectPart[] parts = m_parts.GetArray();
            for (int i = 0; i < parts.Length; i++)
            {
@@ -2697,6 +2707,16 @@ namespace OpenSim.Region.Framework.Scenes
                return;
 //            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);            
+            if (IsAttachment)
+            {
+                ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);
+                if (sp != null)
+                {
+                    sp.SendAttachmentUpdate(this,UpdateRequired.FULL);
+                    return;
+                }
+            }
            
            RootPart.SendFullUpdateToAllClients();
@@ -2720,6 +2740,16 @@ namespace OpenSim.Region.Framework.Scenes
            if (IsDeleted)
                return;
+            if (IsAttachment)
+            {
+                ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);
+                if (sp != null)
+                {
+                    sp.SendAttachmentUpdate(RootPart, UpdateRequired.TERSE);
+                    return;
+                }
+            }
            RootPart.SendTerseUpdateToAllClients();
        }
@@ -2739,6 +2769,16 @@ namespace OpenSim.Region.Framework.Scenes
            if (IsDeleted)
                return;
+            if (IsAttachment)
+            {
+                ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);
+                if (sp != null)
+                {
+                    sp.SendAttachmentUpdate(this, UpdateRequired.TERSE);
+                    return;
+                }
+            }
            SceneObjectPart[] parts = m_parts.GetArray();
            for (int i = 0; i < parts.Length; i++)
                parts[i].SendTerseUpdateToAllClients();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0f67d07..5bfc640 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -969,7 +969,7 @@ namespace OpenSim.Region.Framework.Scenes
            m_name = String.Format("{0} {1}", Firstname, Lastname);
            m_scene = world;
            m_uuid = client.AgentId;
-            LocalId = m_scene.AllocateLocalId();
+            LocalId = m_scene.AllocatePresenceLocalId();
            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
            if (account != null)
@@ -1268,79 +1268,6 @@ namespace OpenSim.Region.Framework.Scenes
            m_scene.SwapRootAgentCount(false);
-            // The initial login scene presence is already root when it gets here
-            // and it has already rezzed the attachments and started their scripts.
-            // We do the following only for non-login agents, because their scripts
-            // haven't started yet.
-/* moved down
-            if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
-            {
-                // Viewers which have a current outfit folder will actually rez their own attachments.  However,
-                // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
-                if (Scene.AttachmentsModule != null)
-                    Util.FireAndForget(
-                        o => 
-                        { 
-//                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
-//                                System.Threading.Thread.Sleep(7000); 
-                            Scene.AttachmentsModule.RezAttachments(this); 
-                        });
-            }
-            else
-            {
-                // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
-                // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
-                // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
-                // not transporting the required data.
-                //
-                // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
-                // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
-                // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
-                // not transporting the required data.
-                //
-                // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of 
-                // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
-                // which needs to lock m_attachments.  ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
-                //
-                // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
-                // But XEngine starts all scripts unsuspended.  Starting them suspended will not currently work because script rezzing
-                // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the 
-                // script is rezzed.  This means the ResumeScripts() does absolutely nothing when using XEngine.
-                //
-                // One cannot simply iterate over attachments in a fire and forget thread because this would no longer
-                // be locked, allowing race conditions if other code changes the attachments list.
-                List<SceneObjectGroup> attachments = GetAttachments();
-                if (attachments.Count > 0)
-                {
-                    m_log.DebugFormat(
-                        "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
-                    // Resume scripts  this possible should also be moved down after sending the avatar to viewer ?
-                    foreach (SceneObjectGroup sog in attachments)
-                    {
-// sending attachments before the avatar ?
-// moved to completemovement where it already was
-//                        sog.ScheduleGroupForFullUpdate();
-                        sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                        sog.ResumeScripts();
-                    }
-                }
-            }
-*/
-/* 
-            SendAvatarDataToAllAgents();
-            // send the animations of the other presences to me
-            m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
-            {
-                if (presence != this)
-                    presence.Animator.SendAnimPackToClient(ControllingClient);
-            });
-*/
            // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
            // stall on the border crossing since the existing child agent will still have the last movement
@@ -1400,7 +1327,7 @@ namespace OpenSim.Region.Framework.Scenes
            else
                Animator.ResetAnimations();
-            
+           
 //            m_log.DebugFormat(
 //                 "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1754,7 +1681,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </param>
        public void CompleteMovement(IClientAPI client, bool openChildAgents)
        {
-//            DateTime startTime = DateTime.Now;
+            int ts = Util.EnvironmentTickCount();
            m_log.InfoFormat(
                "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
@@ -1767,6 +1694,7 @@ namespace OpenSim.Region.Framework.Scenes
                // Make sure it's not a login agent. We don't want to wait for updates during login
                if (!isNPC && (m_teleportFlags & TeleportFlags.ViaLogin) == 0)
                {
                    // Let's wait until UpdateAgent (called by departing region) is done
                    if (!WaitForUpdateAgent(client))
                        // The sending region never sent the UpdateAgent data, we have to refuse
@@ -1786,6 +1714,9 @@ namespace OpenSim.Region.Framework.Scenes
                    AbsolutePosition = pos;
                }
 */
+                m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
                if (!MakeRootAgent(AbsolutePosition, flying))
                {
@@ -1796,6 +1727,8 @@ namespace OpenSim.Region.Framework.Scenes
                    return;
                }
+                m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                Vector3 look = Lookat;
                if ((Math.Abs(look.X) < 0.01) && (Math.Abs(look.Y) < 0.01))
                {
@@ -1806,6 +1739,17 @@ namespace OpenSim.Region.Framework.Scenes
                        look = new Vector3(0.99f, 0.042f, 0);
                }
+                if (!IsChildAgent)
+                {
+                    InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46);
+                    if (cof == null)
+                        COF = UUID.Zero;
+                    else
+                        COF = cof.ID;
+                    m_log.DebugFormat("[ScenePresence]: CompleteMovement COF for {0} is {1}", client.AgentId, COF);
+                }
                // Tell the client that we're totally ready
                ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
@@ -1816,6 +1760,8 @@ namespace OpenSim.Region.Framework.Scenes
                //            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
+                m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                if (!string.IsNullOrEmpty(m_callbackURI))
                {
                    // We cannot sleep here since this would hold up the inbound packet processing thread, as
@@ -1844,6 +1790,8 @@ namespace OpenSim.Region.Framework.Scenes
 //                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
 //            }
+                m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                m_previusParcelHide = false;
                m_previusParcelUUID = UUID.Zero;
                m_currentParcelHide = false;
@@ -1856,15 +1804,11 @@ namespace OpenSim.Region.Framework.Scenes
                if (!IsChildAgent)
                {
-                    newhide = m_currentParcelHide;
-                    m_currentParcelHide = false;
-                    // take this region out of children Neighbours list
-                    // possible should be done elsewhere
-                    DropThisRootRegionFromNeighbours();
                    ValidateAndSendAppearanceAndAgentData();
+                    m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+                 
                    // attachments
                    if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
                    {
@@ -1877,23 +1821,40 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                    else
                    {
-                        List<SceneObjectGroup> attachments = GetAttachments();
+                        if (m_attachments.Count > 0)
-                        if (attachments.Count > 0)
                        {
                            m_log.DebugFormat(
                                "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
                            // Resume scripts  this possible should also be moved down after sending the avatar to viewer ?
-                            foreach (SceneObjectGroup sog in attachments)
+                            foreach (SceneObjectGroup sog in m_attachments)
                            {
-                                sog.ScheduleGroupForFullUpdate();
+                                sog.SendFullUpdateToClient(ControllingClient);
+                                SendFullUpdateToClient(ControllingClient);
+                                if (!sog.HasPrivateAttachmentPoint)
+                                {
+                                    // sog.ScheduleGroupForFullUpdate();
+                                    m_scene.ForEachScenePresence(delegate(ScenePresence p)
+                                    {
+                                        if (p == this)
+                                            return;
+                                        if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                                            return;
+                                        sog.SendFullUpdateToClient(p.ControllingClient);
+                                        SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path
+                                    });
+                                }
                                sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
                                sog.ResumeScripts();
                            }
                        }
                    }
+                    m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                    // Create child agents in neighbouring regions
                    if (openChildAgents)
                    {
@@ -1903,10 +1864,14 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }
+                m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                // send the rest of the world
-                if (m_teleportFlags > 0 && !isNPC)
+                if (m_teleportFlags > 0 && !isNPC || m_currentParcelHide)
                    SendInitialDataToMe();
+                m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                if (!IsChildAgent)
                {
 // moved from makeroot missing in sendInitialDataToMe 
@@ -1923,6 +1888,8 @@ namespace OpenSim.Region.Framework.Scenes
                    IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                    if (friendsModule != null)
                        friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+                    m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                    }
                }
            }
@@ -1931,11 +1898,13 @@ namespace OpenSim.Region.Framework.Scenes
                m_inTransit = false;
            }
            // if hide force a check
-            if (!IsChildAgent && newhide)
+ //           if (!IsChildAgent && newhide)
-            {
+ //           {
-                ParcelLoginCheck(m_currentParcelUUID);
+ //               ParcelLoginCheck(m_currentParcelUUID);
-                m_currentParcelHide = newhide;
+ //               m_currentParcelHide = newhide;
-            }
+ //           }
+            m_log.DebugFormat("[CompleteMovement] end: {0}ms", Util.EnvironmentTickCountSubtract(ts));
        }
        /// <summary>
@@ -2776,34 +2745,15 @@ namespace OpenSim.Region.Framework.Scenes
            if (satOnObject)
            {
-//                SendAvatarDataToAllAgents();
                m_requestedSitTargetID = 0;
                part.RemoveSittingAvatar(UUID);
                part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
-            }
-            else if (PhysicsActor == null)
+                SendAvatarDataToAllAgents();
-                AddToPhysicalScene(false);
+            }
            Animator.TrySetMovementAnimation("STAND");
-            if (satOnObject)
-            {
-                ILandObject land = m_scene.LandChannel.GetLandObject(AbsolutePosition.X,AbsolutePosition.Y);
-                if (land != null)
-                {
-                    UUID parcelID = land.LandData.GlobalID;
-                    if (m_currentParcelUUID != parcelID)
-                        currentParcelUUID = parcelID;
-                    else
-                        SendAvatarDataToAllAgents();
-                }
-                else
-                    SendAvatarDataToAllAgents();
-            }
            TriggerScenePresenceUpdated();
        }
@@ -3078,11 +3028,14 @@ namespace OpenSim.Region.Framework.Scenes
            ParentPart = part;
            ParentID = part.LocalId;
+            SendAvatarDataToAllAgents();
            if(status == 3)
                Animator.TrySetMovementAnimation("SIT_GROUND");
            else
                Animator.TrySetMovementAnimation("SIT");
-            SendAvatarDataToAllAgents();
            part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
        }
@@ -3182,13 +3135,14 @@ namespace OpenSim.Region.Framework.Scenes
                Velocity = Vector3.Zero;
                RemoveFromPhysicalScene();
+                SendAvatarDataToAllAgents();
                String sitAnimation = "SIT";
                if (!String.IsNullOrEmpty(part.SitAnimation))
                {
                    sitAnimation = part.SitAnimation;
                }
                Animator.TrySetMovementAnimation(sitAnimation);
-                SendAvatarDataToAllAgents();
                TriggerScenePresenceUpdated();
            }
        }
@@ -3349,8 +3303,30 @@ namespace OpenSim.Region.Framework.Scenes
        #region Update Client(s)
+        public void SendUpdateToAgent(ScenePresence p)
+        {
+            IClientAPI remoteClient = p.ControllingClient;
+            if (remoteClient.IsActive)
+            {
+                //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
+                remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate);
+                m_scene.StatsReporter.AddAgentUpdates(1);
+            }
+        }
+        public void SendFullUpdateToClient(IClientAPI remoteClient)
+        {
+            if (remoteClient.IsActive)
+            {
+                //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
+                remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate);
+                m_scene.StatsReporter.AddAgentUpdates(1);
+            }
+        }
        // this is diferente from SendTerseUpdateToClient
-        // this sends bypassing ententies updates 
+        // this sends bypassing entities updates 
        public void SendAgentTerseUpdate(ISceneEntity p)
        {
            ControllingClient.SendAgentTerseUpdate(p);
@@ -3377,7 +3353,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
-        public void SendTerseUpdateToAgentClient(ScenePresence p)
+        public void SendTerseUpdateToAgent(ScenePresence p)
        {
            IClientAPI remoteClient = p.ControllingClient;
@@ -3396,6 +3372,18 @@ namespace OpenSim.Region.Framework.Scenes
            m_scene.StatsReporter.AddAgentUpdates(1);
        }
+        public void SendTerseUpdateToAgentNF(ScenePresence p)
+        {
+            IClientAPI remoteClient = p.ControllingClient;
+            if (remoteClient.IsActive)
+            {
+                //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
+                remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate);
+                m_scene.StatsReporter.AddAgentUpdates(1);
+            }
+        }
        // vars to support reduced update frequency when velocity is unchanged
        private Vector3 lastVelocitySentToAllClients = Vector3.Zero;
        private Vector3 lastPositionSentToAllClients = Vector3.Zero;
@@ -3437,7 +3425,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                Console.WriteLine("Scheduled update for {0} in {1}", Name, Scene.Name);
 //                m_scene.ForEachClient(SendTerseUpdateToClient);
-                m_scene.ForEachScenePresence(SendTerseUpdateToAgentClient);
+                m_scene.ForEachScenePresence(SendTerseUpdateToAgent);
            }
            TriggerScenePresenceUpdated();
        }
@@ -3478,16 +3466,14 @@ namespace OpenSim.Region.Framework.Scenes
                        landch.sendClientInitialLandInfo(ControllingClient);
                    }
                }
-                SendOtherAgentsAvatarDataToMe();
-                SendOtherAgentsAppearanceToMe();
+                SendOtherAgentsAvatarFullToMe();
                EntityBase[] entities = Scene.Entities.GetEntities();
                foreach (EntityBase e in entities)
                {
                    if (e != null && e is SceneObjectGroup)
                        ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                }
            });
        }
@@ -3508,40 +3494,56 @@ namespace OpenSim.Region.Framework.Scenes
            // to see if all the baked textures are already here. 
            if (m_scene.AvatarFactory != null)
                cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
-            
            // If we aren't using a cached appearance, then clear out the baked textures
            if (!cachedappearance)
            {
-//                Appearance.ResetAppearance();
-// save what ????
-// maybe needed so the tryretry repair works?
                if (m_scene.AvatarFactory != null)
                    m_scene.AvatarFactory.QueueAppearanceSave(UUID);
            }
+            bool newhide = m_currentParcelHide;
+            m_currentParcelHide = false;
-            // This agent just became root. We are going to tell everyone about it. The process of
-            // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it
-            // again here... this comes after the cached appearance check because the avatars
-            // appearance goes into the avatar update packet
            SendAvatarDataToAllAgents();
-            // This invocation always shows up in the viewer logs as an error.  Is it needed?
+            if (newhide)
-            // send all information we have
+            {
-            // possible not needed since viewer should ask about it
+                ParcelLoginCheck(m_currentParcelUUID);
-            // least it all ask for baked
+                m_currentParcelHide = true;
+            }
            SendAppearanceToAgent(this);
-            // If we are using the the cached appearance then send it out to everyone
+            m_inTransit = false;
-            // send even grays
-            if (cachedappearance)
+            SendAppearanceToAllOtherAgents();
+            if(Animator!= null)
+                Animator.SendAnimPack();
+        }
+        
+        /// <summary>
+        /// Send avatar full data appearance and animations for all other root agents to this agent, this agent
+        /// can be either a child or root
+        /// </summary>
+        public void SendOtherAgentsAvatarFullToMe()
+        {
+            int count = 0;
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
            {
-//                m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.Name);
+                // only send information about other root agents
-                // If the avatars baked textures are all in the cache, then we have a 
+                if (scenePresence.UUID == UUID)
-                // complete appearance... send it out, if not, then we'll send it when
+                    return;
-                // the avatar finishes updating its appearance
-                SendAppearanceToAllOtherAgents();
+                scenePresence.SendAvatarDataToAgent(this);
-            }
+                scenePresence.SendAppearanceToAgent(this);
+                scenePresence.SendAnimPackToAgent(this);
+                // for now attachments are sent with all SOG
+                count++;
+            });
+            m_scene.StatsReporter.AddAgentUpdates(count);
        }
        /// <summary>
@@ -3566,33 +3568,12 @@ namespace OpenSim.Region.Framework.Scenes
            m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
            {
-               SendAvatarDataToAgent(scenePresence);
+                SendAvatarDataToAgent(scenePresence);
-               count++;
+                count++;
            });
            m_scene.StatsReporter.AddAgentUpdates(count);
        }
-        
-        /// <summary>
-        /// Send avatar data for all other root agents to this agent, this agent
-        /// can be either a child or root
-        /// </summary>
-        public void SendOtherAgentsAvatarDataToMe()
-        {
-            int count = 0;
-            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
-                        {
-                            // only send information about other root agents
-                            if (scenePresence.UUID == UUID)
-                                return;
-                            scenePresence.SendAvatarDataToAgent(this);
-                            count++;
-                        });
-            m_scene.StatsReporter.AddAgentUpdates(count);
-        }
        /// <summary>
        /// Send avatar data to an agent.
@@ -3604,7 +3585,11 @@ namespace OpenSim.Region.Framework.Scenes
            if (ParcelHideThisAvatar && currentParcelUUID != avatar.currentParcelUUID && avatar.GodLevel < 200)
                return;
            avatar.ControllingClient.SendAvatarDataImmediate(this);
-            Animator.SendAnimPackToClient(avatar.ControllingClient);
+        }
+        public void SendAvatarDataToAgentNF(ScenePresence avatar)
+        {
+            avatar.ControllingClient.SendAvatarDataImmediate(this);
        }
        /// <summary>
@@ -3639,28 +3624,6 @@ namespace OpenSim.Region.Framework.Scenes
        }
        /// <summary>
-        /// Send appearance from all other root agents to this agent. this agent
-        /// can be either root or child
-        /// </summary>
-        public void SendOtherAgentsAppearanceToMe()
-        {
-//            m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID);
-            int count = 0;
-            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
-                        {
-                            // only send information about other root agents
-                            if (scenePresence.UUID == UUID)
-                                return;
-                                             
-                            scenePresence.SendAppearanceToAgent(this);
-                            count++;
-                        });
-            m_scene.StatsReporter.AddAgentUpdates(count);
-        }
-        /// <summary>
        /// Send appearance data to an agent.
        /// </summary>
        /// <param name="avatar"></param>
@@ -3674,6 +3637,30 @@ namespace OpenSim.Region.Framework.Scenes
                UUID, Appearance.VisualParams, Appearance.Texture.GetBytes());           
        }
+        public void SendAnimPackToAgent(ScenePresence p)
+        {
+            if (IsChildAgent || Animator == null)
+                return;
+            if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                return;
+            Animator.SendAnimPackToClient(p.ControllingClient);
+        }
+        public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs)
+        {
+            if (IsChildAgent)
+                return;
+            m_scene.ForEachScenePresence(delegate(ScenePresence p)
+            {
+                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                    return;
+                p.ControllingClient.SendAnimations(animations, seqs, ControllingClient.AgentId, objectIDs);
+            });
+        }
        #endregion
        #region Significant Movement Method
@@ -4072,19 +4059,7 @@ namespace OpenSim.Region.Framework.Scenes
            cAgent.Far = DrawDistance;
            // Throttles 
-            float multiplier = 1;
+            cAgent.Throttles = ControllingClient.GetThrottlesPacked(1);
-/* this is also used to send to new main regions not children
- 
-            int childRegions = KnownRegionCount;
-            if (childRegions != 0)
-                multiplier = 1f / childRegions;
-            // Minimum throttle for a child region is 1/4 of the root region throttle
-            if (multiplier <= 0.25f)
-                multiplier = 0.25f;
-*/
-            cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier);
            cAgent.HeadRotation = m_headrotation;
            cAgent.BodyRotation = Rotation;
@@ -4193,13 +4168,15 @@ namespace OpenSim.Region.Framework.Scenes
            }
            catch { }
+            Animator.ResetAnimations();
+           
            // FIXME: Why is this null check necessary?  Where are the cases where we get a null Anims object?
-            if (cAgent.Anims != null)
-                Animator.Animations.FromArray(cAgent.Anims);
            if (cAgent.DefaultAnim != null)
                Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero);
            if (cAgent.AnimState != null)
                Animator.Animations.SetImplicitDefaultAnimation(cAgent.AnimState.AnimID, cAgent.AnimState.SequenceNum, UUID.Zero);
+            if (cAgent.Anims != null)
+                Animator.Animations.FromArray(cAgent.Anims);
            if (Scene.AttachmentsModule != null)
                Scene.AttachmentsModule.CopyAttachments(cAgent, this);
@@ -4653,15 +4630,245 @@ namespace OpenSim.Region.Framework.Scenes
            return validated;
        }
+        public void SendAttachmentsToAllAgents()
+        {
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup sog in m_attachments)
+                {
+                    m_scene.ForEachScenePresence(delegate(ScenePresence p)
+                    {
+                        if (p != this && sog.HasPrivateAttachmentPoint)
+                            return;
+                        if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                            return;
+                        sog.SendFullUpdateToClient(p.ControllingClient);
+                        SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path
+                    });
+                }
+            }
+        }
-        public void SendAttachmentsToClient(IClientAPI client)
+        // send attachments to a client without filters except for huds
+        // for now they are checked in several places down the line...
+        public void SendAttachmentsToAgentNF(ScenePresence p)
        {
            lock (m_attachments)
            {
-                foreach (SceneObjectGroup gobj in m_attachments)
+                foreach (SceneObjectGroup sog in m_attachments)
                {
-                    gobj.SendFullUpdateToClient(client);
+                    if (p == this || !sog.HasPrivateAttachmentPoint)
+                    {
+                        sog.SendFullUpdateToClient(p.ControllingClient);
+                    }
                }
+                SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path
+            }
+        }
+        public void SendAttachmentScheduleUpdate(SceneObjectGroup sog)
+        {
+            if (IsChildAgent || IsInTransit)
+                return;
+            SceneObjectPart[] origparts = sog.Parts;
+            SceneObjectPart[] parts = new SceneObjectPart[origparts.Length];
+            PrimUpdateFlags[] flags = new PrimUpdateFlags[origparts.Length];
+            SceneObjectPart rootpart = sog.RootPart;
+            UpdateRequired rootreq = sog.RootPart.UpdateFlag;
+            int j = 0;
+            bool allterse = true;
+            for (int i = 0; i < origparts.Length; i++)
+            {
+                switch (origparts[i].UpdateFlag)
+                {
+                    case UpdateRequired.TERSE:
+                        flags[j] = PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
+                        | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity;
+                        parts[j] = origparts[i];
+                        j++;
+                        break;
+                    case UpdateRequired.FULL:
+                        flags[j] = PrimUpdateFlags.FullUpdate;
+                        parts[j] = origparts[i];
+                        j++;
+                        allterse = false;
+                        break;
+                }
+                origparts[i].UpdateFlag = 0;
+            }
+            if (j == 0)
+                return;
+            if (rootreq == UpdateRequired.NONE)
+            {
+                if (allterse)
+                    rootreq = UpdateRequired.TERSE;
+                else
+                    rootreq = UpdateRequired.FULL;
+            }
+            PrimUpdateFlags rootflag = PrimUpdateFlags.FullUpdate;
+            if (rootreq == UpdateRequired.TERSE)
+                rootflag = PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
+                        | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity;
+            int nparts = j;
+            bool priv = sog.HasPrivateAttachmentPoint;
+            List<ScenePresence> allPresences = m_scene.GetScenePresences();
+            foreach (ScenePresence p in allPresences)
+            {
+                if (p != this)
+                {
+                    if (priv ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        continue;
+                }
+                p.ControllingClient.SendEntityUpdate(rootpart, rootflag);
+                for (int i = 0; i < nparts; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    if (part == rootpart)
+                        continue;
+                    p.ControllingClient.SendEntityUpdate(part, flags[i]);
+                }
+            }
+        }
+        public void SendAttachmentUpdate(SceneObjectGroup sog, UpdateRequired UpdateFlag)
+        {
+            if (IsChildAgent || IsInTransit)
+                return;
+            PrimUpdateFlags flag;
+            switch (UpdateFlag)
+            {
+                case UpdateRequired.TERSE:
+                    flag = PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
+                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity;
+                    break;
+                case UpdateRequired.FULL:
+                    flag = PrimUpdateFlags.FullUpdate;
+                    break;
+                default:
+                    return;
+            }
+            SceneObjectPart[] parts = sog.Parts;
+            SceneObjectPart rootpart = sog.RootPart;
+            bool priv = sog.HasPrivateAttachmentPoint;
+            List<ScenePresence> allPresences = m_scene.GetScenePresences();
+            foreach (ScenePresence p in allPresences)
+            {
+                if (p != this)
+                {
+                    if (priv ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        continue;
+                }
+                p.ControllingClient.SendEntityUpdate(rootpart, flag);
+                rootpart.UpdateFlag = 0;
+                for (int i = 0; i < parts.Length; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    if (part == rootpart)
+                        continue;
+                    p.ControllingClient.SendEntityUpdate(part, flag);
+                    part.UpdateFlag = 0;
+                }
+            }
+        }
+        public void SendAttachmentScheduleUpdate(SceneObjectPart part)
+        {
+            if (IsChildAgent || IsInTransit)
+                return;
+            PrimUpdateFlags flag;
+            switch (part.UpdateFlag)
+            {
+                case UpdateRequired.TERSE:
+                    flag = PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
+                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity;
+                    break;
+                case UpdateRequired.FULL:
+                    flag = PrimUpdateFlags.FullUpdate;
+                    break;
+                default:
+                    return;
+            }
+            bool priv = part.ParentGroup.HasPrivateAttachmentPoint;
+            List<ScenePresence> allPresences = m_scene.GetScenePresences();
+            foreach (ScenePresence p in allPresences)
+            {
+                if (p != this)
+                {
+                    if (priv ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        continue;
+                }
+                p.ControllingClient.SendEntityUpdate(part, flag);
+                part.UpdateFlag = 0;
+            }
+        }
+        public void SendAttachmentUpdate(SceneObjectPart part, UpdateRequired UpdateFlag)
+        {
+            if (IsChildAgent || IsInTransit)
+                return;
+            PrimUpdateFlags flag;
+            switch (UpdateFlag)
+            {
+                case UpdateRequired.TERSE:
+                    flag = PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
+                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity;
+                    break;
+                case UpdateRequired.FULL:
+                    flag = PrimUpdateFlags.FullUpdate;
+                    break;
+                default:
+                    return;
+            }
+            bool priv = part.ParentGroup.HasPrivateAttachmentPoint;
+            List<ScenePresence> allPresences = m_scene.GetScenePresences();
+            foreach (ScenePresence p in allPresences)
+            {
+                if (p != this)
+                {
+                    if ( priv ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        continue;
+                }
+                p.ControllingClient.SendEntityUpdate(part, flag);
+                part.UpdateFlag = 0;
            }
        }
@@ -5410,217 +5617,58 @@ namespace OpenSim.Region.Framework.Scenes
        private void parcelGodCheck(UUID currentParcelID, bool isGod)
        {
-            List<ScenePresence> allpresences = null;
+            List<ScenePresence> allpresences = m_scene.GetScenePresences();
-            allpresences = m_scene.GetScenePresences();
-            if (isGod)
-            {
-                List<ScenePresence> viewsToSendme = new List<ScenePresence>();
-                foreach (ScenePresence p in allpresences)
-                {
-                    if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                        continue;
-                    if (p.ParcelHideThisAvatar && p.currentParcelUUID != currentParcelID)
+            foreach (ScenePresence p in allpresences)
-                    {
-                        viewsToSendme.Add(p); // i see them
-                    }
-                }
-                if (viewsToSendme.Count > 0)
-                {
-                    foreach (ScenePresence p in viewsToSendme)
-                    {
-                        if (p.IsChildAgent)
-                            continue;
-                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
-                        ControllingClient.SendAvatarDataImmediate(p);
-                        p.SendAppearanceToAgent(this);
-                        p.SendAttachmentsToClient(ControllingClient);
-                        if (p.Animator != null)
-                            p.Animator.SendAnimPackToClient(ControllingClient);
-                    }
-                }
-            }
-            else
            {
-                List<ScenePresence> killsToSendme = new List<ScenePresence>();
+                if (p.IsDeleted || p.IsChildAgent || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
+                    continue;
-                foreach (ScenePresence p in allpresences)
-                {
-                    if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                        continue;
-                    if (p.ParcelHideThisAvatar && p.currentParcelUUID != currentParcelID)
-                    {
-                        killsToSendme.Add(p);
-                    }
-                }
-                if (killsToSendme.Count > 0)
+                if (p.ParcelHideThisAvatar && p.currentParcelUUID != currentParcelID)
                {
-                    foreach (ScenePresence p in killsToSendme)
+                    if (isGod)
-                    {
+                        p.SendViewTo(this);
-                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                    else
-                        try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
+                        p.SendKillTo(this);
-                        catch (NullReferenceException) { }
-                    }
                }
            }
        }
        private void ParcelLoginCheck(UUID currentParcelID)
        {
-            List<ScenePresence> killsToSendto = new List<ScenePresence>();
+            List<ScenePresence> allpresences = m_scene.GetScenePresences();
-            List<ScenePresence> killsToSendme = new List<ScenePresence>();
-            List<ScenePresence> viewsToSendto = new List<ScenePresence>();
-            List<ScenePresence> viewsToSendme = new List<ScenePresence>();
-            List<ScenePresence> allpresences = null;
-            allpresences = m_scene.GetScenePresences();
            foreach (ScenePresence p in allpresences)
            {
                if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
                    continue;
               
-                if (currentParcelID != p.currentParcelUUID)
+                if (currentParcelID != p.currentParcelUUID && p.GodLevel < 200)
                {
-                    if (p.GodLevel < 200)
+                    SendKillTo(p);
-                        killsToSendto.Add(p);
-                    if (GodLevel < 200 && p.ParcelHideThisAvatar)
-                        killsToSendme.Add(p);
-                }
-                else
-                {
-                    viewsToSendto.Add(p);
-                    viewsToSendme.Add(p);
-                }
-            }
-            allpresences.Clear();
-            // send the things
-            // kill main avatar object
-            if (killsToSendto.Count > 0 && PresenceType != PresenceType.Npc)
-            {
-                foreach (ScenePresence p in killsToSendto)
-                {
-                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
-                    try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
-                    catch (NullReferenceException) { }
-                }
-            }
-            if (killsToSendme.Count > 0)
-            {
-                foreach (ScenePresence p in killsToSendme)
-                {
-                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
-                    try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
-                    catch (NullReferenceException) { }
-                }
-            }
-            if (viewsToSendto.Count > 0 && PresenceType != PresenceType.Npc)
-            {
-                foreach (ScenePresence p in viewsToSendto)
-                {
-                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
-                    p.ControllingClient.SendAvatarDataImmediate(this);
-                    SendAppearanceToAgent(p);
-                    SendAttachmentsToClient(p.ControllingClient);
-                    if (Animator != null)
-                        Animator.SendAnimPackToClient(p.ControllingClient);
-                }
-            }
-            if (viewsToSendme.Count > 0)
-            {
-                foreach (ScenePresence p in viewsToSendme)
-                {
-                    m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
-                    if (p.IsChildAgent)
-                        continue;
-                    ControllingClient.SendAvatarDataImmediate(p);
-                    p.SendAppearanceToAgent(this);
-                    p.SendAttachmentsToClient(ControllingClient);
-                    if (p.Animator != null)
-                        p.Animator.SendAnimPackToClient(ControllingClient);
                }
            }
        }
+ 
-        public void parcelRegionCross(bool abort)
+        public void parcelRegionCross()
        {
-            if (!ParcelHideThisAvatar)
+            if (!ParcelHideThisAvatar || GodLevel >= 200)
                return;
            List<ScenePresence> allpresences = null;
            allpresences = m_scene.GetScenePresences();
-            if (abort)
+            foreach (ScenePresence p in allpresences)
            {
-                List<ScenePresence> viewsToSendme = new List<ScenePresence>();
+                if (p.IsDeleted || p == this || p.IsChildAgent || p.ControllingClient == null || !p.ControllingClient.IsActive)
+                    continue;
-                foreach (ScenePresence p in allpresences)
-                {
-                    if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                        continue;
-                    if (p.currentParcelUUID == m_currentParcelUUID)
-                    {
-                        viewsToSendme.Add(p);
-                    }
-                }
-                if (viewsToSendme.Count > 0)
+                if (p.currentParcelUUID == m_currentParcelUUID)
                {
-                    foreach (ScenePresence p in viewsToSendme)
+                    p.SendKillTo(this);
-                    {
-                        if (p.IsChildAgent)
-                            continue;
-//                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
-                        ControllingClient.SendAvatarDataImmediate(p);
-                        p.SendAppearanceToAgent(this);
-                        p.SendAttachmentsToClient(ControllingClient);
-                        if (p.Animator != null)
-                            p.Animator.SendAnimPackToClient(ControllingClient);
-                    }
-                }
-            }
-            else
-            {
-                if (GodLevel >= 200)
-                    return;
-                List<ScenePresence> killsToSendme = new List<ScenePresence>();
-                foreach (ScenePresence p in allpresences)
-                {
-                    if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                        continue;
-                    if (p.currentParcelUUID == m_currentParcelUUID)
-                    {
-                        killsToSendme.Add(p);
-                    }
-                }
-                if (killsToSendme.Count > 0)
-                {
-                    foreach (ScenePresence p in killsToSendme)
-                    {
-                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
-                        try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
-                        catch (NullReferenceException) { }
-                    }
                }
            }
        }
- 
        private void ParcelCrossCheck(UUID currentParcelID,UUID previusParcelID,
                            bool currentParcelHide, bool previusParcelHide, bool oldhide,bool check)
@@ -5631,10 +5679,7 @@ namespace OpenSim.Region.Framework.Scenes
            List<ScenePresence> viewsToSendme = new List<ScenePresence>();
            List<ScenePresence> allpresences = null;
-            if (IsInTransit)
+            if (IsInTransit || IsChildAgent)
-                return;
-            if (IsChildAgent)
                return;
            if (check)
@@ -5743,7 +5788,7 @@ namespace OpenSim.Region.Framework.Scenes
                        {
                            if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
                                continue;
-                            // only those old parcel need receive kills
+                            // only those old parcel need kills
                            if (previusParcelID == p.currentParcelUUID && GodLevel < 200)
                            {
                                killsToSendme.Add(p);  // i dont see them
@@ -5760,37 +5805,32 @@ namespace OpenSim.Region.Framework.Scenes
            }
            // send the things
-            // kill main avatar object
-            if (killsToSendto.Count > 0 && PresenceType != PresenceType.Npc)
+            if (killsToSendto.Count > 0)
            {
                foreach (ScenePresence p in killsToSendto)
                {
                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
-                    try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
+                    SendKillTo(p);
-                    catch (NullReferenceException) { }
                }
            }
-            if (killsToSendme.Count > 0 )
+            if (killsToSendme.Count > 0)
            {
+                m_log.Debug("[AVATAR]: killtoMe: " + Lastname + " " + killsToSendme.Count.ToString());
                foreach (ScenePresence p in killsToSendme)
                {
-                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: killToMe: " + Lastname + " " + p.Lastname);
-                    try {ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
+                    p.SendKillTo(this);
-                    catch (NullReferenceException) { }                    
                }
            }
-            if (viewsToSendto.Count > 0 && PresenceType != PresenceType.Npc)
+            if (viewsToSendto.Count > 0)
            {
                foreach (ScenePresence p in viewsToSendto)
                {
-                    p.ControllingClient.SendAvatarDataImmediate(this);
+                    SendViewTo(p);
-//                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
-                    SendAppearanceToAgent(p);
-                    SendAttachmentsToClient(p.ControllingClient);
-                    if (Animator != null)
-                        Animator.SendAnimPackToClient(p.ControllingClient);
                }
            }
@@ -5801,13 +5841,48 @@ namespace OpenSim.Region.Framework.Scenes
                    if (p.IsChildAgent)
                        continue;
 //                   m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
-                    ControllingClient.SendAvatarDataImmediate(p);
+                    p.SendViewTo(this);
-                    p.SendAppearanceToAgent(this);
-                    p.SendAttachmentsToClient(ControllingClient);
-                    if (p.Animator != null)
-                        p.Animator.SendAnimPackToClient(ControllingClient);
                }
            }
        }
+        public void HasMovedAway()
+        {
+            List<ScenePresence> allpresences = m_scene.GetScenePresences();
+            foreach (ScenePresence p in allpresences)
+            {
+                if (p == this)
+                    continue;
+                SendKillTo(p);
+                p.SendKillTo(this);
+            }
+            if (Scene.AttachmentsModule != null)
+                Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
+        }
+        public void SendFullKillsTo(ScenePresence p)
+        {
+            List<uint> ids = new List<uint>();
+            foreach (SceneObjectGroup sog in m_attachments)
+                p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
+            ids.Add(LocalId);
+            p.ControllingClient.SendKillObject(ids);
+        }
+        public void SendKillTo(ScenePresence p)
+        {
+            foreach (SceneObjectGroup sog in m_attachments)
+                p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
+            p.ControllingClient.SendKillObject(new List<uint> { LocalId });
+        }
+        public void SendViewTo(ScenePresence p)
+        {
+            SendAvatarDataToAgentNF(p);
+            SendAppearanceToAgent(p);
+            if (Animator != null)
+                Animator.SendAnimPackToClient(p.ControllingClient);
+            SendAttachmentsToAgentNF(p);
+        }
    }
 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 373ed41..2112b71 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -58,6 +58,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public ISceneAgent SceneAgent { get; set; }
+        public int PingTimeMS { get { return 0; } }
        private string m_username;
        private string m_nick;
@@ -1700,5 +1702,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        {
        }
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+        }
    }
 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index c88ccc5..fa1d38a 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
            get { return m_scene; }
        }
+        public int PingTimeMS { get { return 0; } }
        public UUID OwnerID
        {
            get { return m_ownerID; }
@@ -1270,5 +1272,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        {
        }
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+        }
    }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 52e0134..2758030 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -379,6 +379,8 @@ namespace OpenSim.Tests.Common.Mock
            get { return FirstName + " " + LastName; }
        }
+        public int PingTimeMS { get { return 0; } }
        public bool IsActive
        {
            get { return true; }
@@ -534,6 +536,10 @@ namespace OpenSim.Tests.Common.Mock
            ReceivedKills.AddRange(localID);
        }
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+        }
        public virtual void SetChildAgentThrottle(byte[] throttle)
        {
        }