From 59e3ac1ec65d8168716d8cada5164952a0e576cf Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 12 Oct 2011 00:50:13 +0200
Subject: Fix rezzing coalesced object broken by core merge

---
 .../InventoryAccess/InventoryAccessModule.cs       | 90 +++++++++-------------
 1 file changed, 36 insertions(+), 54 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index dd6bdf7..e0f8240 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -786,10 +786,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
                 return null;
-            SceneObjectPart rootPart = group.RootPart;
             for (int i = 0; i < objlist.Count; i++)
             {
                 group = objlist[i];
+                SceneObjectPart rootPart = group.RootPart;
 
 //                        Vector3 storedPosition = group.AbsolutePosition;
                 if (group.UUID == UUID.Zero)
@@ -854,68 +854,50 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     rootPart.ScheduleFullUpdate();
                 }
 
-//                        m_log.DebugFormat(
-//                            "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}",
-//                            group.Name, group.LocalId, group.UUID, remoteClient.Name);
-            }
-
-                        group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
-                        // TODO: Remove the magic number badness
-            if (item != null)
-                DoPostRezWhenFromItem(item, attachment);
-
-            if ((rootPart.OwnerID != item.Owner) ||
-                            (item.CurrentPermissions & 16) != 0 || // Magic number
-                            (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
-            {
-                //Need to kill the for sale here
-                rootPart.ObjectSaleType = 0;
-                rootPart.SalePrice = 10;
-
-                if (m_Scene.Permissions.PropagatePermissions())
+                if ((rootPart.OwnerID != item.Owner) ||
+                                (item.CurrentPermissions & 16) != 0 || // Magic number
+                                (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                 {
-                    foreach (SceneObjectPart part in group.Parts)
+                    //Need to kill the for sale here
+                    rootPart.ObjectSaleType = 0;
+                    rootPart.SalePrice = 10;
+
+                    if (m_Scene.Permissions.PropagatePermissions())
                     {
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                        foreach (SceneObjectPart part in group.Parts)
                         {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                part.EveryoneMask = item.EveryOnePermissions;
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                                part.NextOwnerMask = item.NextPermissions;
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                                part.GroupMask = item.GroupPermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                            {
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                    part.EveryoneMask = item.EveryOnePermissions;
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                    part.NextOwnerMask = item.NextPermissions;
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                                    part.GroupMask = item.GroupPermissions;
+                            }
                         }
-                    }
 
-                    foreach (SceneObjectPart part in group.Parts)
-                    {
-                        part.LastOwnerID = part.OwnerID;
-                        part.OwnerID = item.Owner;
-                        part.Inventory.ChangeInventoryOwner(item.Owner);
-                    }
+                        foreach (SceneObjectPart part in group.Parts)
+                        {
+                            part.LastOwnerID = part.OwnerID;
+                            part.OwnerID = item.Owner;
+                            part.Inventory.ChangeInventoryOwner(item.Owner);
+                        }
 
-                    group.ApplyNextOwnerPermissions();
+                        group.ApplyNextOwnerPermissions();
+                    }
                 }
-            }
-            foreach (SceneObjectPart part in group.Parts)
-            {
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                    part.EveryoneMask = item.EveryOnePermissions;
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                    part.NextOwnerMask = item.NextPermissions;
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                    part.GroupMask = item.GroupPermissions;
-            }
 
-            if ((rootPart.OwnerID != item.Owner) ||
-                (item.CurrentPermissions & 16) != 0 || // Magic number
-                (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
-            {
-                //Need to kill the for sale here
-                rootPart.ObjectSaleType = 0;
-                rootPart.SalePrice = 10;
+//                        m_log.DebugFormat(
+//                            "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}",
+//                            group.Name, group.LocalId, group.UUID, remoteClient.Name);
             }
 
+                        group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
+                        // TODO: Remove the magic number badness
+            if (item != null)
+                DoPostRezWhenFromItem(item, attachment);
+
             return group;
         }
 
@@ -1165,4 +1147,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         #endregion
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1