14 files changed, 224 insertions, 59 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c9ef173..ec238ef 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -365,6 +365,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </value>
        protected HashSet<uint> m_killRecord;
        
+//      protected HashSet<uint> m_attachmentsQueued;
+//      protected HashSet<uint> m_attachmentsSent;
+        
        private int m_moneyBalance;
        private int m_animationSequenceNumber = 1;
        private bool m_SendLogoutPacketWhenClosing = true;
@@ -456,6 +459,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_primFullUpdates = new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(m_scene.Entities.Count);
            m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
            m_killRecord = new HashSet<uint>();
+//          m_attachmentsQueued = new HashSet<uint>();
+//          m_attachmentsSent = new HashSet<uint>();
            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
            m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>();
@@ -3400,6 +3405,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data);
            OutPacket(objupdate, ThrottleOutPacketType.Task);
+            
+            // We need to record the avatar local id since the root prim of an attachment points to this.
+//          m_attachmentsSent.Add(data.AvatarLocalID);
        }
        /// <summary>
@@ -3522,6 +3530,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                return;
            ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data);
+            
+//          if (data.attachment)
+//              m_attachmentsQueued.Add(data.localID);
            lock (m_primFullUpdates.SyncRoot)
                m_primFullUpdates.Enqueue(data.priority, objectData, data.localID);
@@ -3548,15 +3559,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    ObjectUpdatePacket.ObjectDataBlock block = m_primFullUpdates.Dequeue();
                    if (!m_killRecord.Contains(block.ID))
-                    {
+                    {                                                
+//                      if (m_attachmentsQueued.Contains(block.ID))
+//                      {
+//                          string text = Util.FieldToString(block.Text);
+//                          if (text.IndexOf("\n") >= 0)
+//                              text = text.Remove(text.IndexOf("\n"));
+//                            
+//                          if (m_attachmentsSent.Contains(block.ParentID))
+//                          {
+//                              m_log.DebugFormat(
+//                                  "[CLIENT]: Sending full info about attached prim {0} text {1}",
+//                                  block.ID, text);
+//                                
+//                                m_fullUpdateDataBlocksBuilder.Add(block);
+//                                
+//                                m_attachmentsSent.Add(block.ID);
+//                            }
+//                            else
+//                            {
+//                                m_log.DebugFormat(
+//                                    "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet", 
+//                                    block.ID, text, block.ParentID);
+//                                
+//                                lock (m_primFullUpdates.SyncRoot)
+//                                    m_primFullUpdates.Enqueue(double.MaxValue, block, block.ID);                                
+//                            }
+//                        }
+//                        else
+//                        {
                        m_fullUpdateDataBlocksBuilder.Add(block);
-                        
+//                        }
-//                    string text = Util.FieldToString(outPacket.ObjectData[i].Text);
-//                    if (text.IndexOf("\n") >= 0)
-//                        text = text.Remove(text.IndexOf("\n"));
-//                    m_log.DebugFormat(
-//                        "[CLIENT]: Sending full info about prim {0} text {1} to client {2}", 
-//                        outPacket.ObjectData[i].ID, text, Name);
                    }
 //                    else
 //                    {
@@ -4505,6 +4538,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SendPrimitiveData data)
        {
+//          if (data.attachment)
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Creating prim update block for {0}, parent {1}, priority {2}", 
+//                    data.localID, data.parentID, data.priority); 
+                                  
            byte[] objectData = new byte[60];
            data.pos.ToBytes(objectData, 0);
            data.vel.ToBytes(objectData, 12);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index d68c683..0730f8b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            {
                if (s.RegionInfo.RegionHandle == regionHandle)
                {
-                    //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
+//                    m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
                    if (isLocalCall)
                    {
                        // We need to make a local copy of the object
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 26d3372..79b3cfd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2450,6 +2450,8 @@ namespace OpenSim.Region.Framework.Scenes
                return;
            }
+//            m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
+//            Console.WriteLine("HERE X");
            ScenePresence presence;
            if (TryGetAvatar(remoteClient.AgentId, out presence))
            {
@@ -2457,9 +2459,12 @@ namespace OpenSim.Region.Framework.Scenes
                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                item = InventoryService.GetItem(item);
                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
+//                Console.WriteLine("HERE Y");
                if (m_AvatarFactory != null)
                    m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+//                Console.WriteLine("HERE Z");
            }
        }
@@ -2642,4 +2647,4 @@ namespace OpenSim.Region.Framework.Scenes
            m_sceneGraph.LinkObjects(root, children);
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index ac04dc7..adc9496 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    if (((SceneObjectGroup)ent).LocalId == primLocalID)
                    {
+//                        m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name);
                        ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
                        return;
                    }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 637ebff..7089368 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1850,9 +1850,31 @@ namespace OpenSim.Region.Framework.Scenes
        /// true if the object was added, false if an object with the same uuid was already in the scene
        /// </returns>
        public bool AddRestoredSceneObject(
+            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
+        {
+            return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
+        }        
+        /// <summary>
+        /// Add an object into the scene that has come from storage
+        /// </summary>
+        ///
+        /// <param name="sceneObject"></param>
+        /// <param name="attachToBackup">
+        /// If true, changes to the object will be reflected in its persisted data
+        /// If false, the persisted data will not be changed even if the object in the scene is changed
+        /// </param>
+        /// <param name="alreadyPersisted">
+        /// If true, we won't persist this object until it changes
+        /// If false, we'll persist this object immediately
+        /// </param>
+        /// <returns>
+        /// true if the object was added, false if an object with the same uuid was already in the scene
+        /// </returns>
+        public bool AddRestoredSceneObject(
            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
        {
-            return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted);
+            return AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
        }
        /// <summary>
@@ -1886,7 +1908,7 @@ namespace OpenSim.Region.Framework.Scenes
        }        
        /// <summary>
-        /// Delete every object from the scene
+        /// Delete every object from the scene.  This does not include attachments worn by avatars.
        /// </summary>
        public void DeleteAllSceneObjects()
        {
@@ -1897,7 +1919,11 @@ namespace OpenSim.Region.Framework.Scenes
                foreach (EntityBase e in entities)
                {
                    if (e is SceneObjectGroup)
-                        DeleteSceneObject((SceneObjectGroup)e, false);
+                    {
+                        SceneObjectGroup sog = (SceneObjectGroup)e;
+                        if (!sog.IsAttachment)
+                            DeleteSceneObject((SceneObjectGroup)e, false);
+                    }
                }
            }
        }
@@ -2461,7 +2487,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <returns></returns>
        public bool IncomingCreateObject(ISceneObject sog)
        {
-            //m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
+//            m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
            SceneObjectGroup newObject;
            try
            {
@@ -2533,10 +2559,12 @@ namespace OpenSim.Region.Framework.Scenes
            if (sceneObject.IsAttachmentCheckFull()) // Attachment
            {
+//                m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId);
+                
                sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
                sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
-                AddRestoredSceneObject(sceneObject, false, false);
+                AddRestoredSceneObject(sceneObject, false, false, false);
                // Handle attachment special case
                SceneObjectPart RootPrim = sceneObject.RootPart;
@@ -2544,6 +2572,8 @@ namespace OpenSim.Region.Framework.Scenes
                // Fix up attachment Parent Local ID
                ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
+//                Console.WriteLine("AAAA");
                //uint parentLocalID = 0;
                if (sp != null)
                {
@@ -2562,20 +2592,25 @@ namespace OpenSim.Region.Framework.Scenes
                    //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
                    m_log.DebugFormat(
                        "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
-                    
+                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);                    
                    AttachObject(
                        sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
-                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+                    
-                    grp.SendGroupFullUpdate();
+                    //grp.SendGroupFullUpdate();
                }
                else
                {
                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                    RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
                }
+//                Console.WriteLine("BBBB");
            }
            else
            {
+//                m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId);
+                
                AddRestoredSceneObject(sceneObject, true, false);
                if (!Permissions.CanObjectEntry(sceneObject.UUID,
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 2f6a0db..67fa13d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1383,7 +1383,9 @@ namespace OpenSim.Region.Framework.Scenes
                // now we have a child agent in this region. Request all interesting data about other (root) agents
                agent.SendInitialFullUpdateToAllClients();
+//                Console.WriteLine("SCS 1");
                agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
+//                Console.WriteLine("SCS 2");                
                //                    m_scene.SendKillObject(m_localId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 59a2f41..bdab696 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -216,11 +216,15 @@ namespace OpenSim.Region.Framework.Scenes
        /// If true, we won't persist this object until it changes
        /// If false, we'll persist this object immediately
        /// </param>
+        /// <param name="sendClientUpdate">
+        /// If true, we send updates to the client to tell it about this object
+        /// If false, we leave it up to the caller to do this
+        /// </param>
        /// <returns>
        /// true if the object was added, false if an object with the same uuid was already in the scene
        /// </returns>
        protected internal bool AddRestoredSceneObject(
-            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
+            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
        {
            if (!alreadyPersisted)
            {
@@ -228,8 +232,29 @@ namespace OpenSim.Region.Framework.Scenes
                sceneObject.HasGroupChanged = true;
            }
-            return AddSceneObject(sceneObject, attachToBackup, true);
+            return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
        }
+        
+//        /// <summary>
+//        /// Add an object into the scene that has come from storage
+//        /// </summary>
+//        /// <param name="sceneObject"></param>
+//        /// <param name="attachToBackup">
+//        /// If true, changes to the object will be reflected in its persisted data
+//        /// If false, the persisted data will not be changed even if the object in the scene is changed
+//        /// </param>
+//        /// <param name="alreadyPersisted">
+//        /// If true, we won't persist this object until it changes
+//        /// If false, we'll persist this object immediately
+//        /// </param>
+//        /// <returns>
+//        /// true if the object was added, false if an object with the same uuid was already in the scene
+//        /// </returns>
+//        protected internal bool AddRestoredSceneObject(
+//            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
+//        {
+//            AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
+//        }
        /// <summary>
        /// Add a newly created object to the scene.  This will both update the scene, and send information about the
@@ -611,11 +636,13 @@ namespace OpenSim.Region.Framework.Scenes
        protected internal bool AttachObject(
            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
        {
+//            Console.WriteLine("HERE A");
            SceneObjectGroup group = GetGroupByPrim(objectLocalID);
            if (group != null)
            {
                if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
                {
+//                    Console.WriteLine("HERE -1");
                    // If the attachment point isn't the same as the one previously used
                    // set it's offset position = 0 so that it appears on the attachment point
                    // and not in a weird location somewhere unknown.
@@ -654,9 +681,12 @@ namespace OpenSim.Region.Framework.Scenes
                        itemId = group.GetFromItemID();
                    }
+//                    Console.WriteLine("HERE 0");
                    m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
+//                    Console.WriteLine("HERE 1");
                    group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
+//                    Console.WriteLine("HERE 2");
                    // In case it is later dropped again, don't let
                    // it get cleaned up
                    //
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 602b811..451c6f9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1494,6 +1494,10 @@ namespace OpenSim.Region.Framework.Scenes
        public void SendFullUpdateToClient(IClientAPI remoteClient)
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId);
+            
            SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
            lock (m_parts)
@@ -1513,8 +1517,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="part"></param>
        internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
        {
-//            m_log.DebugFormat(
+//            if (IsAttachment)
-//                "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
+//                m_log.DebugFormat(
+//                    "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
            
            if (m_rootPart.UUID == part.UUID)
            {
@@ -1994,7 +1999,8 @@ namespace OpenSim.Region.Framework.Scenes
        public void ScheduleFullUpdateToAvatar(ScenePresence presence)
        {
-//            m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
+//            if (IsAttachment)
+//                m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
            
            RootPart.AddFullUpdateToAvatar(presence);
@@ -2026,7 +2032,8 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void ScheduleGroupForFullUpdate()
        {
-//            m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
+//            if (IsAttachment)
+//                m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
            
            checkAtTargets();
            RootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a85a4b3..19ff288 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,16 +1259,17 @@ namespace OpenSim.Region.Framework.Scenes
        /// Tell all scene presences that they should send updates for this part to their clients
        /// </summary>
        public void AddFullUpdateToAllAvatars()
-        {
+        {                        
            ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
            for (int i = 0; i < avatars.Length; i++)
-            {
+                AddFullUpdateToAvatar(avatars[i]);
-                avatars[i].SceneViewer.QueuePartForUpdate(this);
-            }
        }
        public void AddFullUpdateToAvatar(ScenePresence presence)
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
+            
            presence.SceneViewer.QueuePartForUpdate(this);
        }
@@ -1287,13 +1288,14 @@ namespace OpenSim.Region.Framework.Scenes
        {
            ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
            for (int i = 0; i < avatars.Length; i++)
-            {
+                AddTerseUpdateToAvatar(avatars[i]);
-                avatars[i].SceneViewer.QueuePartForUpdate(this);
-            }
        }
        public void AddTerseUpdateToAvatar(ScenePresence presence)
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
+            
            presence.SceneViewer.QueuePartForUpdate(this);
        }
@@ -2727,7 +2729,8 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void ScheduleFullUpdate()
        {
-//            m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
+//            if (IsAttachment)
+//                m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
            
            if (m_parentGroup != null)
            {
@@ -2840,6 +2843,10 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="remoteClient"></param>
        public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
+            
            m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
        }
@@ -2848,6 +2855,10 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void SendFullUpdateToAllClients()
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
+            
            ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
            for (int i = 0; i < avatars.Length; i++)
            {
@@ -2859,6 +2870,10 @@ namespace OpenSim.Region.Framework.Scenes
        public void SendFullUpdateToAllClientsExcept(UUID agentID)
        {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
+            
            ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
            for (int i = 0; i < avatars.Length; i++)
            {
@@ -2914,10 +2929,27 @@ namespace OpenSim.Region.Framework.Scenes
                //isattachment = ParentGroup.RootPart.IsAttachment;
            byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
-            remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
-                                               lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
+            double priority = ParentGroup.GetUpdatePriority(remoteClient);
-                                               m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
+            if (IsRoot && IsAttachment)
-                                               AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient)));
+            {
+                if (double.MinValue == priority)
+                {
+                    m_log.WarnFormat(
+                        "[SOP]: Couldn't raise update priority of root part for attachment {0} {1} because priority is already highest value",
+                        Name, LocalId);
+                }
+                else
+                {
+                    priority = double.MinValue;
+                }
+            }
+            remoteClient.SendPrimitiveToClient(
+                            new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
+                lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
+                m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
+                AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, priority));
        }
        /// <summary>
@@ -2965,6 +2997,9 @@ namespace OpenSim.Region.Framework.Scenes
            {
                if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
                {
+//                    if (IsAttachment)
+//                        m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
+                    
                    AddFullUpdateToAllAvatars();
                    ClearUpdateSchedule();
                }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4973663..51cdf1b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3873,6 +3873,8 @@ namespace OpenSim.Region.Framework.Scenes
        private double UpdatePriority(UpdatePriorityData data)
        {
+//          m_log.DebugFormat("[SCENE PRESENCE]: Reprioritizing updates to client {0} for {1}", Name, data.localID);
+                        
            EntityBase entity;
            SceneObjectGroup group;
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e4296ef..23663dd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -39,6 +40,8 @@ namespace OpenSim.Region.Framework.Scenes
 {
    public class SceneViewer : ISceneViewer
    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        protected ScenePresence m_presence;
        protected UpdateQueue m_partsUpdateQueue = new UpdateQueue();
        protected Queue<SceneObjectGroup> m_pendingObjects;
@@ -60,6 +63,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="part"></param>
        public void QueuePartForUpdate(SceneObjectPart part)
        {
+//            if (part.IsAttachment)
+//                m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId);
+            
            lock (m_partsUpdateQueue)
            {
                m_partsUpdateQueue.Enqueue(part);
@@ -134,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                    else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
                    {
-//                            m_log.DebugFormat(
+//                            m_log.DebugFormat(AddFullUpdateToAvatar
 //                                "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
 //                                part.Name, part.UUID, part.TimeStampTerse);
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c653e98..672109b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -146,6 +146,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
                c.Sender = null;
                c.SenderUUID = UUID.Zero;
+                c.Scene = m_scene;
                m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}",
                                 m_scene.RegionInfo.RegionName, c.Message, m_channelNotify);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index d8c0ba5..959164b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -32,7 +32,7 @@ using System.Globalization;
 using System.Reflection;
 using System.IO;
 using Microsoft.CSharp;
-using Microsoft.JScript;
+//using Microsoft.JScript;
 using Microsoft.VisualBasic;
 using log4net;
 using OpenSim.Region.Framework.Interfaces;
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
        private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
-        private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
+//        private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
        private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
        private static YP2CSConverter YP_Converter = new YP2CSConverter();
@@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                case enumCompileType.vb:
                    compileScript = CreateVBCompilerScript(compileScript);
                    break;
-                case enumCompileType.js:
+//                case enumCompileType.js:
-                    compileScript = CreateJSCompilerScript(compileScript);
+//                    compileScript = CreateJSCompilerScript(compileScript);
-                    break;
+//                    break;
                case enumCompileType.yp:
                    compileScript = CreateYPCompilerScript(compileScript);
                    break;
@@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            }
        }
-        private static string CreateJSCompilerScript(string compileScript)
+//        private static string CreateJSCompilerScript(string compileScript)
-        {
+//        {
-            compileScript = String.Empty +
+//            compileScript = String.Empty +
-                "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
+//                "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
-                "package SecondLife {\r\n" +
+//                "package SecondLife {\r\n" +
-                "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
+//                "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
-                compileScript +
+//                compileScript +
-                "} }\r\n";
+//                "} }\r\n";
-            return compileScript;
+//            return compileScript;
-        }
+//        }
        private static string CreateCSCompilerScript(string compileScript)
        {
@@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                        }
                    } while (!complete);
                    break;
-                case enumCompileType.js:
+//                case enumCompileType.js:
-                    results = JScodeProvider.CompileAssemblyFromSource(
+//                    results = JScodeProvider.CompileAssemblyFromSource(
-                        parameters, Script);
+//                        parameters, Script);
-                    break;
+//                    break;
                case enumCompileType.yp:
                    results = YPcodeProvider.CompileAssemblyFromSource(
                        parameters, Script);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index d30d2dc..18351ad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                m_CurrentResult = null;
            }
-            return true;
+            return false;
        }
        public void SetState(string state)
@@ -991,7 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
        public string GetXMLState()
        {
            bool run = Running;
-            Stop(100);
+            bool stopped = Stop(100);
            Running = run;
            // We should not be doing this, but since we are about to
@@ -1002,6 +1002,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
            // Force an update of the in-memory plugin data
            //
+            if (!stopped)
+                return String.Empty;
            PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
            return ScriptSerializer.Serialize(this);