From ed365f6220afd4a3bb7d77ef44f6ecf673b46266 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 26 Jan 2017 19:43:00 +0000 Subject: remove SOP.AttachPoint, redundant( and incoerent) with SOG.AttachmentPoint --- .../Framework/InventoryAccess/InventoryAccessModule.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/CoreModules/Framework') diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index a73906c..67c847b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -427,20 +427,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess originalRotations[objectGroup.UUID] = inventoryStoredRotation; // Restore attachment data after trip through the sim - if (objectGroup.RootPart.AttachPoint > 0) + if (objectGroup.AttachmentPoint > 0) { inventoryStoredPosition = objectGroup.RootPart.AttachedPos; inventoryStoredRotation = objectGroup.RootPart.AttachRotation; - } + if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree && + objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree) + objectGroup.RootPart.Shape.LastAttachPoint = (byte)objectGroup.AttachmentPoint; - // Trees could be attached and it's been done, but it makes - // no sense. State must be preserved because it's the tree type - if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree && - objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree) - { - objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint; - if (objectGroup.RootPart.AttachPoint > 0) - objectGroup.RootPart.Shape.LastAttachPoint = objectGroup.RootPart.AttachPoint; } objectGroup.AbsolutePosition = inventoryStoredPosition; -- cgit v1.1