From adb14ad20acce44cb4b269b0d518b210f9f5eae4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 7 Oct 2010 05:12:39 +0200
Subject: Implement rezzing coalesced objects

---
 .../Framework/InventoryAccess/InventoryAccessModule.cs        | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index a7d59c7..9fbfc34 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -247,11 +247,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                     Vector3 originalPosition = objectGroup.AbsolutePosition;
 
-                    // Restore attachment data after trip through the sim
-                    if (objectGroup.RootPart.AttachPoint > 0)
-                        inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
-                    objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
-
                     objectGroup.AbsolutePosition = inventoryStoredPosition;
 
                     // Make sure all bits but the ones we want are clear
@@ -815,13 +810,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         if (!attachment)
                         {
                             if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
-                            {
-                                // Save attachment data
-                                group.RootPart.AttachPoint = group.RootPart.Shape.State;
-                                group.RootPart.AttachOffset = storedPosition;
-
                                 group.ClearPartAttachmentData();
-                            }
                             
                             // Fire on_rez
                             group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
-- 
cgit v1.1