8 files changed, 162 insertions, 47 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2c7cd40..3ae0dea 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -701,22 +701,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
+                so.AttachedAvatar = UUID.Zero;
+                so.ClearPartAttachmentData();
+
                 SceneObjectPart rootPart = so.RootPart;
+
+                rootPart.SetParentLocalId(0);
                 so.AbsolutePosition = absolutePos;
                 if (absoluteRot != Quaternion.Identity)
                 {
                     so.UpdateGroupRotationR(absoluteRot);
                 }
-                so.AttachedAvatar = UUID.Zero;
-                rootPart.SetParentLocalId(0);
-                so.ClearPartAttachmentData();
-                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
+
+                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
+                
+                // not physical, not temporary, phaton, not volume detector
+//                so.UpdatePrimFlags(rootPart.LocalId,false,false,true,rootPart.VolumeDetectActive);
+
+                // restore full physical state instead
+                so.ApplyPhysics();
+
                 so.HasGroupChanged = true;
                 rootPart.Rezzed = DateTime.Now;
-                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 so.AttachToBackup();
                 m_scene.EventManager.TriggerParcelPrimCountTainted();
-                rootPart.ScheduleFullUpdate();
+
                 rootPart.ClearUndoState();
 
                 List<UUID> uuids = new List<UUID>();
@@ -729,6 +738,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             // Attach (NULL) stops scripts. We don't want that. Resume them.
             so.ResumeScripts();
+            so.ScheduleGroupForTerseUpdate();
+            so.RootPart.ScheduleFullUpdate();
         }
 
         public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
@@ -907,8 +918,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             so.AttachedAvatar = sp.UUID;
 
-            if (so.RootPart.PhysActor != null)
-                so.RootPart.RemoveFromPhysics();
+            foreach (SceneObjectPart part in so.Parts)
+            {
+//                if (part.KeyframeMotion != null)
+//                    part.KeyframeMotion.Suspend();
+
+                if (part.PhysActor != null)
+                {
+                    part.RemoveFromPhysics();
+                }
+            }
 
             so.AbsolutePosition = attachOffset;
             so.RootPart.AttachedPos = attachOffset;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 7b13e0b..e8ad0f2 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -908,7 +908,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (attachment)
                 {
-                    group.RootPart.Flags |= PrimFlags.Phantom;
+//                    group.RootPart.Flags |= PrimFlags.Phantom;
                     group.IsAttachment = true;
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8634a3a..e003a59 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2705,12 +2705,17 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            bool oldUsePhysics = (root.Flags & PrimFlags.Physics) != 0;
             m_sceneGraph.LinkObjects(root, children);
 
             ScenePresence sp;
             if (TryGetScenePresence(agentId, out sp))
             {
                 root.SendPropertiesToClient(sp.ControllingClient);
+                if (oldUsePhysics && (root.Flags & PrimFlags.Physics) == 0)
+                {
+                    sp.ControllingClient.SendAlertMessage("Object physics canceled");
+                }
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index aa81000..7275c15 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -204,6 +204,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public int m_linksetCapacity = 0;
 
+        /// <summary>
+        /// Max prims an Physical object will hold
+        /// </summary>
+        /// 
+        public int m_linksetPhysCapacity = 0;
+
         public bool m_clampPrimSize;
         public bool m_trustBinaries;
         public bool m_allowScriptCrossings;
@@ -901,6 +907,9 @@ namespace OpenSim.Region.Framework.Scenes
                     m_linksetCapacity = RegionInfo.LinksetCapacity;
                 }
 
+                m_linksetPhysCapacity = startupConfig.GetInt("LinksetPhysPrims", m_linksetPhysCapacity);
+
+
                 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
                 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b0f8991..973891b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1547,6 +1547,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // VolumeDetect can't be set via UI and will always be off when a change is made there
                     // now only change volume dtc if phantom off
 
+                    bool wantedPhys = UsePhysics;
                     if (PhysData.PhysShapeType == PhysShapeType.invalid) // check for extraPhysics data
                     {
                         bool vdtc;
@@ -1563,10 +1564,17 @@ namespace OpenSim.Region.Framework.Scenes
                         if (part != null)
                         {
                             part.UpdateExtraPhysics(PhysData);
-                            if (part.UpdatePhysRequired)
+                            if (part.UpdatePhysRequired && remoteClient != null)
                                 remoteClient.SendPartPhysicsProprieties(part);
                         }
                     }
+
+                    if (wantedPhys != group.UsesPhysics && remoteClient != null)
+                    {
+                        remoteClient.SendAlertMessage("Object physics canceled because exceeds the limit of " +
+                            m_parentScene.m_linksetPhysCapacity + " physical prims with shape type not set to None");
+                        group.RootPart.ScheduleFullUpdate();
+                    }
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d3dd5d7..15349e3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -907,10 +907,10 @@ namespace OpenSim.Region.Framework.Scenes
                         return;
                 }
                 IsSelected = partSelect;
-                if (!IsAttachment)
-                {
-                    ScheduleGroupForFullUpdate();
-                }
+//                if (!IsAttachment)
+//                {
+//                    ScheduleGroupForFullUpdate();
+//                }
             }
         }
         // PlaySoundMasterPrim no longer in use  to remove
@@ -1712,7 +1712,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_rootPart.SetParentLocalId(0);
             AttachmentPoint = (byte)0;
             // must check if buildind should be true or false here
-            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false);
+//            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false);
+            ApplyPhysics();
+
             HasGroupChanged = true;
             RootPart.Rezzed = DateTime.Now;
             RootPart.RemFlag(PrimFlags.TemporaryOnRez);
@@ -2879,6 +2881,33 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            // physical prims count limit
+            // not very eficient :(
+
+            if (UsesPhysics && m_scene.m_linksetPhysCapacity > 0 && (PrimCount + objectGroup.PrimCount) >
+                    m_scene.m_linksetPhysCapacity)
+            {
+                int cntr = 0;
+                foreach (SceneObjectPart part in Parts)
+                {
+                    if (part.PhysicsShapeType != (byte)PhysicsShapeType.None)
+                        cntr++;
+                }
+                foreach (SceneObjectPart part in objectGroup.Parts)
+                {
+                    if (part.PhysicsShapeType != (byte)PhysicsShapeType.None)
+                        cntr++;
+                }
+
+                if (cntr > m_scene.m_linksetPhysCapacity)
+                {
+                    // cancel physics
+                    RootPart.Flags &= ~PrimFlags.Physics;
+                    ApplyPhysics();
+                }
+            }
+
+
             // 'linkPart' == the root of the group being linked into this group
             SceneObjectPart linkPart = objectGroup.m_rootPart;
 
@@ -3477,8 +3506,12 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 SceneObjectPart[] parts = m_parts.GetArray();
                 
-                if (Scene != null)
+                if (Scene != null && UsePhysics)               
                 {
+                    int maxprims = m_scene.m_linksetPhysCapacity;
+                    bool checkShape = (maxprims > 0 &&
+                             parts.Length > maxprims);
+
                     for (int i = 0; i < parts.Length; i++)
                     {
                         SceneObjectPart part = parts[i];
@@ -3489,6 +3522,15 @@ namespace OpenSim.Region.Framework.Scenes
                             UsePhysics = false; // Reset physics
                             break;
                         }
+
+                        if (checkShape && part.PhysicsShapeType != (byte)PhysicsShapeType.None)
+                        {
+                            if (--maxprims < 0)
+                            {
+                                UsePhysics = false;
+                                break;
+                            }
+                        }
                     }
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8f6b41b..4aa38be 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4851,17 +4851,24 @@ namespace OpenSim.Region.Framework.Scenes
 
             int nparts = j;
 
-            bool priv = sog.HasPrivateAttachmentPoint;
+            ControllingClient.SendEntityUpdate(rootpart, rootflag);
+
+            for (int i = 0; i < nparts; i++)
+            {
+                ControllingClient.SendEntityUpdate(parts[i], flags[i]);
+            }
+
+            if (sog.HasPrivateAttachmentPoint)
+                return;
 
             List<ScenePresence> allPresences = m_scene.GetScenePresences();
             foreach (ScenePresence p in allPresences)
             {
-                if (p != this)
-                {
-                    if (priv ||
-                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
-                        continue;
-                }
+                if (p == this)
+                    continue;
+
+                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                    continue;
 
                 p.ControllingClient.SendEntityUpdate(rootpart, rootflag);
 
@@ -4896,19 +4903,31 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart[] parts = sog.Parts;
             SceneObjectPart rootpart = sog.RootPart;
 
-            rootpart.UpdateFlag = 0;
+//            rootpart.UpdateFlag = 0;
+
+            ControllingClient.SendEntityUpdate(rootpart, flag);
+
+            for (int i = 0; i < parts.Length; i++)
+            {
+                SceneObjectPart part = parts[i];
+                if (part == rootpart)
+                    continue;
+                ControllingClient.SendEntityUpdate(part, flag);
+//                part.UpdateFlag = 0;
+            }
+
+            if (sog.HasPrivateAttachmentPoint)
+                return;
 
-            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;
-                }
+                if (p == this)
+                    continue;
+
+                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                    continue;
 
                 p.ControllingClient.SendEntityUpdate(rootpart, flag);
 
@@ -4918,7 +4937,6 @@ namespace OpenSim.Region.Framework.Scenes
                     if (part == rootpart)
                         continue;
                     p.ControllingClient.SendEntityUpdate(part, flag);
-                    part.UpdateFlag = 0;
                 }
             }
         }
@@ -4947,23 +4965,25 @@ namespace OpenSim.Region.Framework.Scenes
 
             part.UpdateFlag = 0;
 
-            bool priv = part.ParentGroup.HasPrivateAttachmentPoint;
+            ControllingClient.SendEntityUpdate(part, flag);
+
+            if (part.ParentGroup.HasPrivateAttachmentPoint)
+                return;
 
             List<ScenePresence> allPresences = m_scene.GetScenePresences();
             foreach (ScenePresence p in allPresences)
             {
-                if (p != this)
-                {
+                if (p == this)
+                    continue;
 
-                    if (priv ||
-                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
-                        continue;
-                }
+                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                    continue;
 
                 p.ControllingClient.SendEntityUpdate(part, flag);
             }
         }
 
+
         public void SendAttachmentUpdate(SceneObjectPart part, UpdateRequired UpdateFlag)
         {
             if (IsChildAgent || IsInTransit)
@@ -4985,19 +5005,20 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
             }
 
-            part.UpdateFlag = 0;
+//            part.UpdateFlag = 0;
 
-            bool priv = part.ParentGroup.HasPrivateAttachmentPoint;
+            ControllingClient.SendEntityUpdate(part, flag);
+
+            if (part.ParentGroup.HasPrivateAttachmentPoint)
+                return;
 
             List<ScenePresence> allPresences = m_scene.GetScenePresences();
             foreach (ScenePresence p in allPresences)
             {
-                if (p != this)
-                {
-                    if ( priv ||
-                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
-                        continue;
-                }
+                if (p == this)
+                    continue;
+                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                    continue;
 
                 p.ControllingClient.SendEntityUpdate(part, flag);
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1536959..ef8f0ed 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1400,6 +1400,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     SceneObjectGroup group = m_host.ParentGroup;
                     bool allow = true;
 
+                    int maxprims = World.m_linksetPhysCapacity;
+                    bool checkShape = (maxprims > 0 && group.PrimCount > maxprims);
+
                     foreach (SceneObjectPart part in group.Parts)
                     {
                         if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
@@ -1407,6 +1410,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             allow = false;
                             break;
                         }
+                        if (checkShape && part.PhysicsShapeType != (byte)PhysicsShapeType.None)
+                        {
+                            if (--maxprims < 0)
+                            {
+                                allow = false;
+                                break;
+                            }
+                        }
                     }
 
                     if (!allow)