Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

9 files changed, 136 insertions, 145 deletions

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 7509686..eae6d6f 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -94,19 +94,15 @@ namespace OpenSim.Region.Framework.Scenes
                 m_inventoryDeletes.Enqueue(dtis);
             }
 
-            if (Enabled)
-                lock (m_inventoryTicker)
-                    m_inventoryTicker.Start();
-
-            // Visually remove it, even if it isnt really gone yet.  This means that if we crash before the object
-            // has gone to inventory, it will reappear in the region again on restart instead of being lost.
-            // This is not ideal since the object will still be available for manipulation when it should be, but it's
-            // better than losing the object for now.
             if (permissionToDelete)
             {
                 foreach (SceneObjectGroup g in objectGroups)
                     g.DeleteGroupFromScene(false);
             }
+
+            if (Enabled)
+                lock (m_inventoryTicker)
+                    m_inventoryTicker.Start();
         }
 
         private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index f76f882..edc8886 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -539,7 +539,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <see cref="SceneObjectPart.TriggerScriptChangedEvent"/>
         /// </remarks>
         public event ScriptChangedEvent OnScriptChangedEvent;
-        public delegate void ScriptChangedEvent(uint localID, uint change);
+        public delegate void ScriptChangedEvent(uint localID, uint change, object data);
 
         public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed);
 
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void TriggerOnScriptChangedEvent(uint localID, uint change)
+        public void TriggerOnScriptChangedEvent(uint localID, uint change, object parameter = null)
         {
             ScriptChangedEvent handlerScriptChangedEvent = OnScriptChangedEvent;
             if (handlerScriptChangedEvent != null)
@@ -1194,7 +1194,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     try
                     {
-                        d(localID, change);
+                        d(localID, change, parameter);
                     }
                     catch (Exception e)
                     {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e6e0354..debcad3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2110,7 +2110,7 @@ namespace OpenSim.Region.Framework.Scenes
             // build a list of eligible objects
             List<uint> deleteIDs = new List<uint>();
             List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
-            List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
+            List<SceneObjectGroup> takeCopyGroups = new List<SceneObjectGroup>();
             List<SceneObjectGroup> takeDeleteGroups = new List<SceneObjectGroup>();
 
             ScenePresence sp = null;
@@ -2119,11 +2119,10 @@ namespace OpenSim.Region.Framework.Scenes
             else if(action != DeRezAction.Return)
                 return; // only Return can be called without a client
 
-            // Start with true for both, then remove the flags if objects
-            // that we can't derez are part of the selection
-            bool permissionToTake = true;
-            bool permissionToTakeCopy = true;
-            bool permissionToDelete = true;
+            // this is not as 0.8x code
+            // 0.8x did refuse all operation is not allowed on all objects
+            // this will do it on allowed objects
+            // current viewers only ask if all allowed
 
             foreach (uint localID in localIDs)
             {
@@ -2136,8 +2135,8 @@ namespace OpenSim.Region.Framework.Scenes
                     continue;
                 }
 
-                // Already deleted by someone else
-                if (part.ParentGroup.IsDeleted)
+                SceneObjectGroup grp = part.ParentGroup;
+                if (grp == null || grp.IsDeleted)
                 {
                     //Client still thinks the object exists, kill it
                     deleteIDs.Add(localID);
@@ -2145,132 +2144,105 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // Can't delete child prims
-                if (part != part.ParentGroup.RootPart)
+                if (part != grp.RootPart)
                     continue;
 
-                SceneObjectGroup grp = part.ParentGroup;
                 if (grp.IsAttachment)
-                    continue;
+                {
+                    if(!sp.IsGod || action != DeRezAction.Return || action != DeRezAction.Delete)
+                        continue;
+                    // this may break the attachment, but its a security action
+                    // viewers don't allow it anyways
+                }
 
                 // If child prims have invalid perms, fix them
                 grp.AdjustChildPrimPermissions(false);
 
-                if (remoteClient == null)
+                switch (action)
                 {
-                    // Autoreturn has a null client. Nothing else does. So
-                    // allow only returns
-                    if (action != DeRezAction.Return)
+                    case DeRezAction.SaveToExistingUserInventoryItem:
                     {
-                        m_log.WarnFormat(
-                            "[AGENT INVENTORY]: Ignoring attempt to {0} {1} {2} without a client",
-                            action, grp.Name, grp.UUID);
-                        return;
+                        if (Permissions.CanTakeCopyObject(grp, sp))
+                            takeCopyGroups.Add(grp);
+                        break;
                     }
 
-                    permissionToTakeCopy = false;
-                }
-                else
-                {
-                    if (action == DeRezAction.TakeCopy)
+                    case DeRezAction.TakeCopy:
                     {
-                        if (!Permissions.CanTakeCopyObject(grp, sp))
-                            permissionToTakeCopy = false;
+                        if (Permissions.CanTakeCopyObject(grp, sp))
+                            takeCopyGroups.Add(grp);
+                        break;
                     }
-                    else
+
+                    case DeRezAction.Take:
                     {
-                        permissionToTakeCopy = false;
+                        if (Permissions.CanTakeObject(grp, sp))
+                            takeDeleteGroups.Add(grp);
+                        break;
                     }
-                    if (!Permissions.CanTakeObject(grp, sp))
-                        permissionToTake = false;
-
-                    if (!Permissions.CanDeleteObject(grp, remoteClient))
-                        permissionToDelete = false;
-                }
-
-                // Handle god perms
-                if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
-                {
-                    permissionToTake = true;
-                    permissionToTakeCopy = true;
-                    permissionToDelete = true;
-                }
-
-                // If we're re-saving, we don't even want to delete
-                if (action == DeRezAction.SaveToExistingUserInventoryItem)
-                    permissionToDelete = false;
 
-                // if we want to take a copy, we also don't want to delete
-                // Note: after this point, the permissionToTakeCopy flag
-                // becomes irrelevant. It already includes the permissionToTake
-                // permission and after excluding no copy items here, we can
-                // just use that.
-                if (action == DeRezAction.TakeCopy)
-                {
-                    // If we don't have permission, stop right here
-                    if (!permissionToTakeCopy)
+                    case DeRezAction.GodTakeCopy:
                     {
-                        remoteClient.SendAlertMessage("You don't have permission to take the object");
-                        return;
+                        if((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
+                            takeCopyGroups.Add(grp);
+                        break;
                     }
 
-                    permissionToTake = true;
-                    // Don't delete
-                    permissionToDelete = false;
-                }
-
-                if (action == DeRezAction.Return)
-                {
-                    if (remoteClient != null)
+                    case DeRezAction.Delete:
                     {
-                        if (Permissions.CanReturnObjects(
-                                        null,
-                                        remoteClient,
-                                        new List<SceneObjectGroup>() {grp}))
+                        if (Permissions.CanDeleteObject(grp, remoteClient))
                         {
-                            permissionToTake = true;
-                            permissionToDelete = true;
-                            if(AddToReturns)
-                                AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition,
-                                        "parcel owner return");
+                            if(m_useTrashOnDelete || (sp.IsGod && grp.OwnerID != sp.UUID))
+                                takeDeleteGroups.Add(grp);
+                            else
+                                deleteGroups.Add(grp);
                         }
+                        break;
                     }
-                    else // Auto return passes through here with null agent
+
+                    case DeRezAction.Return:
                     {
-                        permissionToTake = true;
-                        permissionToDelete = true;
+                        if (remoteClient != null)
+                        {
+                            if (Permissions.CanReturnObjects( null, remoteClient, new List<SceneObjectGroup>() {grp}))
+                            {
+                                takeDeleteGroups.Add(grp);
+                                if (AddToReturns)
+                                    AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition,
+                                            "parcel owner return");
+                            }
+                        }
+                        else // Auto return passes through here with null agent
+                        {
+                            takeDeleteGroups.Add(grp);
+                        }
+                        break;
                     }
-                }
 
-                if (permissionToDelete)
-                {
-                    if (permissionToTake)
-                        takeDeleteGroups.Add(grp);
-                    else
-                        deleteGroups.Add(grp);
-                    deleteIDs.Add(grp.LocalId);
+                    default:
+                        break;
                 }
-                else if(permissionToTake)
-                    takeGroups.Add(grp);
             }
 
-             SendKillObject(deleteIDs);
+            if(deleteIDs.Count > 0)
+                SendKillObject(deleteIDs);
 
             if (takeDeleteGroups.Count > 0)
             {
-                m_asyncSceneObjectDeleter.DeleteToInventory(
-                        action, destinationID, takeDeleteGroups, remoteClient,
-                        true);
+                m_asyncSceneObjectDeleter.DeleteToInventory(action, destinationID, takeDeleteGroups,
+                        remoteClient, true);
             }
-            if (takeGroups.Count > 0)
+
+            if (takeCopyGroups.Count > 0)
             {
-                m_asyncSceneObjectDeleter.DeleteToInventory(
-                        action, destinationID, takeGroups, remoteClient,
-                        false);
+                m_asyncSceneObjectDeleter.DeleteToInventory(action, destinationID, takeCopyGroups,
+                        remoteClient, false);
             }
+
             if (deleteGroups.Count > 0)
             {
                 foreach (SceneObjectGroup g in deleteGroups)
-                    DeleteSceneObject(g, true);
+                    DeleteSceneObject(g, false);
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b526fe9..ea037be 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1913,9 +1913,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (parentGroup.OwnerID == child.OwnerID)
                     {
-                        parentGroup.LinkToGroup(child);
-
                         child.DetachFromBackup();
+                        parentGroup.LinkToGroup(child);
 
                         // this is here so physics gets updated!
                         // Don't remove!  Bad juju!  Stay away! or fix physics!
@@ -1943,7 +1942,6 @@ namespace OpenSim.Region.Framework.Scenes
 */
                 parentGroup.AdjustChildPrimPermissions(false);
                 parentGroup.HasGroupChanged = true;
-                parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
                 parentGroup.ScheduleGroupForFullAnimUpdate();
                 Monitor.Exit(m_linkLock);
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index bf217a5..8899e96 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // We're adding this to a prim we don't own. Force
                 // owner change
                 taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
-
+                taskItem.LastOwnerID = item.Owner;
             }
             else
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a23ebbf..312ce26 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3242,8 +3242,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup.Scene.GetNumberOfClients() == 0)
                 return;
 
-            ParentGroup.QueueForUpdateCheck();
-
             bool isfull = false;
             if (ParentGroup.IsAttachment)
             {
@@ -3254,6 +3252,8 @@ namespace OpenSim.Region.Framework.Scenes
             lock (UpdateFlagLock)
                 UpdateFlag |= update;
 
+            ParentGroup.QueueForUpdateCheck();
+
             ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, isfull);
         }
 
@@ -4439,10 +4439,10 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectSerializer.SOPToXml2(xmlWriter, this, new Dictionary<string, object>());
         }
 
-        public void TriggerScriptChangedEvent(Changed val)
+        public void TriggerScriptChangedEvent(Changed val, object data = null)
         {
             if (ParentGroup != null && ParentGroup.Scene != null)
-                ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val);
+                ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val, data);
         }
 
         public void TrimPermissions()
@@ -5130,11 +5130,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (changeFlags == 0)
                 return;
-            m_shape.TextureEntry = newTex.GetBytes();
+            m_shape.TextureEntry = newTex.GetBytes(9);
             TriggerScriptChangedEvent(changeFlags);
             ParentGroup.HasGroupChanged = true;
-            ScheduleFullUpdate();
-
+            ScheduleUpdate(PrimUpdateFlags.Textures);
         }
 
         /// <summary>
@@ -5160,10 +5159,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (changeFlags == 0)
                 return;
 
-            m_shape.TextureEntry = newTex.GetBytes();
+            m_shape.TextureEntry = newTex.GetBytes(9);
             TriggerScriptChangedEvent(changeFlags);
             ParentGroup.HasGroupChanged = true;
-            ScheduleFullUpdate();
+            ScheduleUpdate(PrimUpdateFlags.Textures);
         }
 
         internal void UpdatePhysicsSubscribedEvents()
@@ -5575,20 +5574,26 @@ namespace OpenSim.Region.Framework.Scenes
         // handle osVolumeDetect
         public void ScriptSetVolumeDetect(bool makeVolumeDetect)
         {
+            if(ParentGroup.IsDeleted)
+                return;
+
             if(_parentID == 0)
             {
-                // if root prim do it via SOG
+                // if root prim do it is like llVolumeDetect
                 ParentGroup.ScriptSetVolumeDetect(makeVolumeDetect);
                 return;
             }
 
-            bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
-            bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
-            bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
+            if(ParentGroup.IsVolumeDetect)
+                return; // entire linkset is phantom already
+
+            bool wasUsingPhysics = ParentGroup.UsesPhysics;
+            bool wasTemporary = ParentGroup.IsTemporary;
+            bool wasPhantom = ParentGroup.IsPhantom;
 
             if(PhysActor != null)
                 PhysActor.Building = true;
-            UpdatePrimFlags(wasUsingPhysics,wasTemporary,wasPhantom,makeVolumeDetect,false);
+            UpdatePrimFlags(wasUsingPhysics, wasTemporary, wasPhantom, makeVolumeDetect, false);
         }
 
         protected static int m_animationSequenceNumber = (int)(Util.GetTimeStampTicks() & 0x5fffafL);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 4934b83..a0f8959 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -815,10 +815,10 @@ namespace OpenSim.Region.Framework.Scenes
             m_items.LockItemsForWrite(true);
             m_items.Add(item.ItemID, item);
             m_items.LockItemsForWrite(false);
-                if (allowedDrop)
-                    m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
-                else
-                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+            if (allowedDrop)
+                m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP, item.ItemID);
+            else
+                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
 
             m_part.AggregateInnerPerms();
             m_inventorySerial++;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cfb1be4..1c5d23d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -507,7 +507,19 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Physical scene representation of this Avatar.
         /// </summary>
-        public PhysicsActor PhysicsActor { get; private set; }
+        
+        PhysicsActor m_physActor;
+        public PhysicsActor PhysicsActor
+        {
+            get
+            {
+                return m_physActor;
+            }
+            private set
+            {
+                m_physActor = value;
+            }
+        }
 
         /// <summary>
         /// Record user movement inputs.
@@ -523,7 +535,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool Invulnerable
         {
-            set { m_invulnerable = value; }
+            set
+            {
+                m_invulnerable = value;
+                if(value && Health != 100.0f)
+                    Health = 100.0f;
+            }
             get { return m_invulnerable; }
         }
 
@@ -1636,15 +1653,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void RemoveFromPhysicalScene()
         {
-            if (PhysicsActor != null)
+            PhysicsActor pa = Interlocked.Exchange(ref m_physActor, null);
+            if (pa != null)
             {
 //                PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
 
-                PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
-                PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
-                PhysicsActor.UnSubscribeEvents();
-                m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
-                PhysicsActor = null;
+                pa.OnOutOfBounds -= OutOfBoundsCall;
+                pa.OnCollisionUpdate -= PhysicsCollisionUpdate;
+                pa.UnSubscribeEvents();
+                m_scene.PhysicsScene.RemoveAvatar(pa);
             }
 //            else
 //            {
@@ -2537,7 +2554,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_pos.X = 127f;
                     m_pos.Y = 127f;
                     m_pos.Z = 127f;
-                    m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999903");
+                    m_log.Error("[AVATAR]: NonFinite Avatar on lastFiniteposition also. Reset Position. Mantis this please. Error #9999903");
                 }
 
                 if(isphysical)
@@ -5007,16 +5024,17 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsScene scene = m_scene.PhysicsScene;
             Vector3 pVec = AbsolutePosition;
 
-            PhysicsActor = scene.AddAvatar(
+            PhysicsActor pa = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
                 Appearance.AvatarBoxSize,Appearance.AvatarFeetOffset, isFlying);
-            PhysicsActor.Orientation = m_bodyRot;
+            pa.Orientation = m_bodyRot;
             //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
-            PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
-            PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
-            PhysicsActor.SubscribeEvents(100);
-            PhysicsActor.LocalID = LocalId;
-            PhysicsActor.SetAlwaysRun = m_setAlwaysRun;
+            pa.OnCollisionUpdate += PhysicsCollisionUpdate;
+            pa.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
+            pa.SubscribeEvents(100);
+            pa.LocalID = LocalId;
+            pa.SetAlwaysRun = m_setAlwaysRun;
+            PhysicsActor = pa;
         }
 
         private void OutOfBoundsCall(Vector3 pos)
diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
index a60381a..020c7be 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
@@ -155,6 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return iout;
         }
 
+/*
         // new using terrain data and patchs indexes
         public static List<LayerDataPacket> CreateLayerDataPackets(TerrainData terrData, int[] map)
         {
@@ -213,6 +214,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             return ret;
         }
+*/
 
         public static void CreatePatchFromTerrainData(BitPack output, TerrainData terrData, int patchX, int patchY)
         {