Merge branch 'ubitworkmaster'

5 files changed, 11 insertions, 13 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index a7c774c..e4f23f9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 // Restore attachment data after trip through the sim
                 if (objectGroup.RootPart.AttachPoint > 0)
                 {
-                    inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
+                    inventoryStoredPosition = objectGroup.RootPart.AttachedPos;
                     inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index d87091c..746b703 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2332,16 +2332,17 @@ namespace OpenSim.Region.Framework.Scenes
             if (e == null || attachment) // Single
             {
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+/*
                 if (!attachment)
                 {
                     g.RootPart.AttachPoint = g.RootPart.Shape.State;
-                    g.RootPart.AttachOffset = g.AbsolutePosition;
+                    g.RootPart.AttachedPos = g.AbsolutePosition;
                     g.RootPart.AttachRotation = g.GroupRotation;
                     if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
                         g.RootPart.Shape.PCode != (byte)PCode.Tree)
                         g.RootPart.Shape.State = 0;
                 }
-
+*/
                 objlist.Add(g);
                 veclist.Add(new Vector3(0, 0, 0));
                 bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
@@ -2360,14 +2361,14 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (XmlNode n in groups)
                 {
                     SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
-
+/*
                     g.RootPart.AttachPoint = g.RootPart.Shape.State;
-                    g.RootPart.AttachOffset = g.AbsolutePosition;
+                    g.RootPart.AttachedPos = g.AbsolutePosition;
                     g.RootPart.AttachRotation = g.GroupRotation;
                     if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
                         g.RootPart.Shape.PCode != (byte)PCode.Tree)
                     g.RootPart.Shape.State = 0;
-
+*/
                     objlist.Add(g);
 
                     XmlElement el = (XmlElement)n;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ce9baaa..ab1d2bd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -251,9 +251,6 @@ namespace OpenSim.Region.Framework.Scenes
         public byte AttachPoint = 0;
 
         [XmlIgnore]
-        public Vector3 AttachOffset = Vector3.Zero;
-
-        [XmlIgnore]
         public Quaternion AttachRotation = Quaternion.Identity;
 
         [XmlIgnore]
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8893cc0..257e01e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -904,11 +904,11 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < objlist.Count; i++)
             {
                 SceneObjectGroup group = objlist[i];
-
+/*
                 group.RootPart.AttachPoint = group.RootPart.Shape.State;
-                group.RootPart.AttachOffset = group.AbsolutePosition;
+                group.RootPart.AttachedPos = group.AbsolutePosition;
                 group.RootPart.AttachRotation = group.GroupRotation;
-
+*/
                 group.ResetIDs();
 
                 SceneObjectPart rootPart = group.GetPart(group.UUID);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 916d841..1e98a49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12801,7 +12801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             group.RootPart.AttachPoint = group.RootPart.Shape.State;
-            group.RootPart.AttachOffset = group.AbsolutePosition;
+            group.RootPart.AttachedPos = group.AbsolutePosition;
 
             group.ResetIDs();