1 files changed, 194 insertions, 206 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 73b0a35..5d19025 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 deletes[g.OwnerID].Add(g);
             }
 
-            // This is pethod scoped and will be returned. It will be the
+            // This is method scoped and will be returned. It will be the
             // last created asset id
             UUID assetID = UUID.Zero;
 
@@ -230,8 +230,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // with distinct destinations as well.
             foreach (List<SceneObjectGroup> objlist in deletes.Values)
             {
-                Dictionary<UUID, string> xmlStrings =
-                        new Dictionary<UUID, string>();
+                CoalescedSceneObjects coa = new CoalescedSceneObjects(UUID.Zero);                
+                Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
 
                 foreach (SceneObjectGroup objectGroup in objlist)
                 {
@@ -245,7 +245,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                      : objectGroup.AbsolutePosition.X,
                                  objectGroup.AbsolutePosition.Z);
 
-                    Vector3 originalPosition = objectGroup.AbsolutePosition;
+                    originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
 
                     objectGroup.AbsolutePosition = inventoryStoredPosition;
 
@@ -259,209 +259,37 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                              (uint)PermissionMask.Modify);
                     objectGroup.RootPart.NextOwnerMask |=
                             (uint)PermissionMask.Move;
-
-                    string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
-
-                    objectGroup.AbsolutePosition = originalPosition;
-
-                    xmlStrings[objectGroup.UUID] = sceneObjectXml;
+                    
+                    coa.Add(objectGroup);
                 }
 
                 string itemXml;
 
                 if (objlist.Count > 1)
-                {
-                    float minX, minY, minZ;
-                    float maxX, maxY, maxZ;
-
-                    Vector3[] offsets = m_Scene.GetCombinedBoundingBox(objlist,
-                            out minX, out maxX, out minY, out maxY,
-                            out minZ, out maxZ);
-
-                    // CreateWrapper
-                    XmlDocument itemDoc = new XmlDocument();
-                    XmlElement root = itemDoc.CreateElement("", "CoalescedObject", "");
-                    itemDoc.AppendChild(root);
-
-                    // Embed the offsets into the group XML
-                    for ( int i = 0 ; i < objlist.Count ; i++ )
-                    {
-                        XmlDocument doc = new XmlDocument();
-                        SceneObjectGroup g = objlist[i];
-                        doc.LoadXml(xmlStrings[g.UUID]);
-                        XmlElement e = (XmlElement)doc.SelectSingleNode("/SceneObjectGroup");
-                        e.SetAttribute("offsetx", offsets[i].X.ToString());
-                        e.SetAttribute("offsety", offsets[i].Y.ToString());
-                        e.SetAttribute("offsetz", offsets[i].Z.ToString());
-
-                        XmlNode objectNode = itemDoc.ImportNode(e, true);
-                        root.AppendChild(objectNode);
-                    }
-
-                    float sizeX = maxX - minX;
-                    float sizeY = maxY - minY;
-                    float sizeZ = maxZ - minZ;
-
-                    root.SetAttribute("x", sizeX.ToString());
-                    root.SetAttribute("y", sizeY.ToString());
-                    root.SetAttribute("z", sizeZ.ToString());
-
-                    itemXml = itemDoc.InnerXml;
-                }
+                    itemXml = CoalescedSceneObjectsSerializer.ToXml(coa);
                 else
-                {
-                    itemXml = xmlStrings[objlist[0].UUID];
-                }
-
-                // Get the user info of the item destination
-                //
-                UUID userID = UUID.Zero;
-
-                if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
-                    action == DeRezAction.SaveToExistingUserInventoryItem)
-                {
-                    // Take or take copy require a taker
-                    // Saving changes requires a local user
-                    //
-                    if (remoteClient == null)
-                        return UUID.Zero;
-
-                    userID = remoteClient.AgentId;
-                }
-                else
-                {
-                    // All returns / deletes go to the object owner
-                    //
-
-                    userID = objlist[0].RootPart.OwnerID;
-                }
+                    itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0]);
+                
+                // Restore the position of each group now that it has been stored to inventory.
+                foreach (SceneObjectGroup objectGroup in objlist)
+                    objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
 
-                if (userID == UUID.Zero) // Can't proceed
-                {
+                InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
+                if (item == null)
                     return UUID.Zero;
-                }
-
-                // If we're returning someone's item, it goes back to the
-                // owner's Lost And Found folder.
-                // Delete is treated like return in this case
-                // Deleting your own items makes them go to trash
-                //
-
-                InventoryFolderBase folder = null;
-                InventoryItemBase item = null;
-
-                if (DeRezAction.SaveToExistingUserInventoryItem == action)
+                                
+                // Can't know creator is the same, so null it in inventory
+                if (objlist.Count > 1)
                 {
-                    item = new InventoryItemBase(objlist[0].RootPart.FromUserInventoryItemID, userID);
-                    item = m_Scene.InventoryService.GetItem(item);
-
-                    //item = userInfo.RootFolder.FindItem(
-                    //        objectGroup.RootPart.FromUserInventoryItemID);
-
-                    if (null == item)
-                    {
-                        m_log.DebugFormat(
-                            "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
-                            objlist[0].Name, objlist[0].UUID);
-                        return UUID.Zero;
-                    }
+                    item.CreatorId = UUID.Zero.ToString();
+                    item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
                 }
                 else
                 {
-                    // Folder magic
-                    //
-                    if (action == DeRezAction.Delete)
-                    {
-                        // Deleting someone else's item
-                        //
-                        if (remoteClient == null ||
-                            objlist[0].OwnerID != remoteClient.AgentId)
-                        {
-
-                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
-                        }
-                        else
-                        {
-                             folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
-                        }
-                    }
-                    else if (action == DeRezAction.Return)
-                    {
-
-                        // Dump to lost + found unconditionally
-                        //
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
-                    }
-
-                    if (folderID == UUID.Zero && folder == null)
-                    {
-                        if (action == DeRezAction.Delete)
-                        {
-                            // Deletes go to trash by default
-                            //
-                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
-                        }
-                        else
-                        {
-                            if (remoteClient == null ||
-                                objlist[0].OwnerID != remoteClient.AgentId)
-                            {
-                                // Taking copy of another person's item. Take to
-                                // Objects folder.
-                                folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
-                            }
-                            else
-                            {
-                                // Catch all. Use lost & found
-                                //
-
-                                folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
-                            }
-                        }
-                    }
-
-                    // Override and put into where it came from, if it came
-                    // from anywhere in inventory
-                    //
-                    if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
-                    {
-                        if (objlist[0].RootPart.FromFolderID != UUID.Zero)
-                        {
-                            InventoryFolderBase f = new InventoryFolderBase(objlist[0].RootPart.FromFolderID, userID);
-                            folder = m_Scene.InventoryService.GetFolder(f);
-                        }
-                    }
-
-                    if (folder == null) // None of the above
-                    {
-                        folder = new InventoryFolderBase(folderID);
-
-                        if (folder == null) // Nowhere to put it
-                        {
-                            return UUID.Zero;
-                        }
-                    }
-
-                    item = new InventoryItemBase();
-                    // Can't know creator is the same, so null it in inventory
-                    if (objlist.Count > 1)
-                        item.CreatorId = UUID.Zero.ToString();
-                    else
-                        item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
-                    item.ID = UUID.Random();
-                    item.InvType = (int)InventoryType.Object;
-                    item.Folder = folder.ID;
-                    item.Owner = userID;
-                    if (objlist.Count > 1)
-                    {
-                        item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
-                    }
-                    else
-                    {
-                        item.SaleType = objlist[0].RootPart.ObjectSaleType;
-                        item.SalePrice = objlist[0].RootPart.SalePrice;
-                    }
-                }
+                    item.CreatorId = objlist[0].RootPart.CreatorID.ToString();                
+                    item.SaleType = objlist[0].RootPart.ObjectSaleType;
+                    item.SalePrice = objlist[0].RootPart.SalePrice;                    
+                }              
 
                 AssetBase asset = CreateAsset(
                     objlist[0].GetPartName(objlist[0].RootPart.LocalId),
@@ -470,17 +298,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     Utils.StringToBytes(itemXml),
                     objlist[0].OwnerID.ToString());
                 m_Scene.AssetService.Store(asset);
-                assetID = asset.FullID;
+                
+                item.AssetID = asset.FullID;  
+                assetID = asset.FullID;                              
 
                 if (DeRezAction.SaveToExistingUserInventoryItem == action)
                 {
-                    item.AssetID = asset.FullID;
                     m_Scene.InventoryService.UpdateItem(item);
                 }
                 else
                 {
-                    item.AssetID = asset.FullID;
-
                     uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
                     foreach (SceneObjectGroup grp in objlist)
                         effectivePerms &= grp.GetEffectivePermissions();
@@ -545,9 +372,156 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
                 }
             }
+            
             return assetID;
         }
+        
+        /// <summary>
+        /// Create an item using details for the given scene object.
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="remoteClient"></param>
+        /// <param name="so"></param>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
+        protected InventoryItemBase CreateItemForObject(
+            DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID)
+        {
+            // Get the user info of the item destination
+            //
+            UUID userID = UUID.Zero;
+
+            if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
+                action == DeRezAction.SaveToExistingUserInventoryItem)
+            {
+                // Take or take copy require a taker
+                // Saving changes requires a local user
+                //
+                if (remoteClient == null)
+                    return null;
+
+                userID = remoteClient.AgentId;
+            }
+            else
+            {
+                // All returns / deletes go to the object owner
+                //
+                userID = so.RootPart.OwnerID;
+            }
+
+            if (userID == UUID.Zero) // Can't proceed
+            {
+                return null;
+            }
+
+            // If we're returning someone's item, it goes back to the
+            // owner's Lost And Found folder.
+            // Delete is treated like return in this case
+            // Deleting your own items makes them go to trash
+            //
+            
+            InventoryFolderBase folder = null;
+            InventoryItemBase item = null;
+
+            if (DeRezAction.SaveToExistingUserInventoryItem == action)
+            {
+                item = new InventoryItemBase(so.RootPart.FromUserInventoryItemID, userID);
+                item = m_Scene.InventoryService.GetItem(item);
+
+                //item = userInfo.RootFolder.FindItem(
+                //        objectGroup.RootPart.FromUserInventoryItemID);
+
+                if (null == item)
+                {
+                    m_log.DebugFormat(
+                        "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
+                        so.Name, so.UUID);
+                    
+                    return null;
+                }
+            }
+            else
+            {
+                // Folder magic
+                //
+                if (action == DeRezAction.Delete)
+                {
+                    // Deleting someone else's item
+                    //
+                    if (remoteClient == null ||
+                        so.OwnerID != remoteClient.AgentId)
+                    {
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                    }
+                    else
+                    {
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                    }
+                }
+                else if (action == DeRezAction.Return)
+                {
+                    // Dump to lost + found unconditionally
+                    //
+                    folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                }
 
+                if (folderID == UUID.Zero && folder == null)
+                {
+                    if (action == DeRezAction.Delete)
+                    {
+                        // Deletes go to trash by default
+                        //
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                    }
+                    else
+                    {
+                        if (remoteClient == null || so.OwnerID != remoteClient.AgentId)
+                        {
+                            // Taking copy of another person's item. Take to
+                            // Objects folder.
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                        }
+                        else
+                        {
+                            // Catch all. Use lost & found
+                            //
+
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                        }
+                    }
+                }
+
+                // Override and put into where it came from, if it came
+                // from anywhere in inventory
+                //
+                if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
+                {
+                    if (so.RootPart.FromFolderID != UUID.Zero)
+                    {
+                        InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID);
+                        folder = m_Scene.InventoryService.GetFolder(f);
+                    }
+                }
+
+                if (folder == null) // None of the above
+                {
+                    folder = new InventoryFolderBase(folderID);
+
+                    if (folder == null) // Nowhere to put it
+                    {
+                        return null;
+                    }
+                }
+
+                item = new InventoryItemBase();                
+                item.ID = UUID.Random();
+                item.InvType = (int)InventoryType.Object;
+                item.Folder = folder.ID;
+                item.Owner = userID;
+            }   
+            
+            return item;
+        }
 
         /// <summary>
         /// Rez an object into the scene from the user's inventory
@@ -659,9 +633,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                     itemId, n.OuterXml);
                             objlist.Add(g);
                             XmlElement el = (XmlElement)n;
-                            float x = Convert.ToSingle(el.GetAttribute("offsetx"));
-                            float y = Convert.ToSingle(el.GetAttribute("offsety"));
-                            float z = Convert.ToSingle(el.GetAttribute("offsetz"));
+                            
+                            string rawX = el.GetAttribute("offsetx");
+                            string rawY = el.GetAttribute("offsety");
+                            string rawZ = el.GetAttribute("offsetz");
+//                        
+//                            m_log.DebugFormat(
+//                                "[INVENTORY ACCESS MODULE]: Converting coalesced object {0} offset <{1}, {2}, {3}>", 
+//                                g.Name, rawX, rawY, rawZ);
+                            
+                            float x = Convert.ToSingle(rawX);
+                            float y = Convert.ToSingle(rawY);
+                            float z = Convert.ToSingle(rawZ);
                             veclist.Add(new Vector3(x, y, z));
                         }
                     }
@@ -753,10 +736,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         // affect the name stored in the serialization, transfer
                         // the correct name from the inventory to the
                         // object itself before we rez.
-                        rootPart.Name = item.Name;
-                        rootPart.Description = item.Description;
-                        rootPart.ObjectSaleType = item.SaleType;
-                        rootPart.SalePrice = item.SalePrice;
+                        //
+                        // Only do these for the first object if we are rezzing a coalescence.
+                        if (i == 0)
+                        {
+                            rootPart.Name = item.Name;
+                            rootPart.Description = item.Description;
+                            rootPart.ObjectSaleType = item.SaleType;
+                            rootPart.SalePrice = item.SalePrice;
+                        }
 
                         group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
                         if ((rootPart.OwnerID != item.Owner) ||