OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitworkmaster'

avinationmerge
Melanie Thielker 2014-07-20 02:27:08 +02:00
parent bef76bf3c5 dc717303d4
commit b3068355bc
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// Restore attachment data after trip through the sim // Restore attachment data after trip through the sim
if (objectGroup.RootPart.AttachPoint > 0) if (objectGroup.RootPart.AttachPoint > 0)
{ {
inventoryStoredPosition = objectGroup.RootPart.AttachOffset; inventoryStoredPosition = objectGroup.RootPart.AttachedPos;
inventoryStoredRotation = objectGroup.RootPart.AttachRotation; inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
} }

11
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2332,16 +2332,17 @@ namespace OpenSim.Region.Framework.Scenes
if (e == null || attachment) // Single if (e == null || attachment) // Single
{ {
SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
/*
if (!attachment) if (!attachment)
{ {
g.RootPart.AttachPoint = g.RootPart.Shape.State; g.RootPart.AttachPoint = g.RootPart.Shape.State;
g.RootPart.AttachOffset = g.AbsolutePosition; g.RootPart.AttachedPos = g.AbsolutePosition;
g.RootPart.AttachRotation = g.GroupRotation; g.RootPart.AttachRotation = g.GroupRotation;
if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
g.RootPart.Shape.PCode != (byte)PCode.Tree) g.RootPart.Shape.PCode != (byte)PCode.Tree)
g.RootPart.Shape.State = 0; g.RootPart.Shape.State = 0;
} }
*/
objlist.Add(g); objlist.Add(g);
veclist.Add(new Vector3(0, 0, 0)); veclist.Add(new Vector3(0, 0, 0));
bbox = g.GetAxisAlignedBoundingBox(out offsetHeight); bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
@ -2360,14 +2361,14 @@ namespace OpenSim.Region.Framework.Scenes
foreach (XmlNode n in groups) foreach (XmlNode n in groups)
{ {
SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml); SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
/*
g.RootPart.AttachPoint = g.RootPart.Shape.State; g.RootPart.AttachPoint = g.RootPart.Shape.State;
g.RootPart.AttachOffset = g.AbsolutePosition; g.RootPart.AttachedPos = g.AbsolutePosition;
g.RootPart.AttachRotation = g.GroupRotation; g.RootPart.AttachRotation = g.GroupRotation;
if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
g.RootPart.Shape.PCode != (byte)PCode.Tree) g.RootPart.Shape.PCode != (byte)PCode.Tree)
g.RootPart.Shape.State = 0; g.RootPart.Shape.State = 0;
*/
objlist.Add(g); objlist.Add(g);
XmlElement el = (XmlElement)n; XmlElement el = (XmlElement)n;

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -250,9 +250,6 @@ namespace OpenSim.Region.Framework.Scenes
[XmlIgnore] [XmlIgnore]
public byte AttachPoint = 0; public byte AttachPoint = 0;
[XmlIgnore]
public Vector3 AttachOffset = Vector3.Zero;
[XmlIgnore] [XmlIgnore]
public Quaternion AttachRotation = Quaternion.Identity; public Quaternion AttachRotation = Quaternion.Identity;

6
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -904,11 +904,11 @@ namespace OpenSim.Region.Framework.Scenes
for (int i = 0; i < objlist.Count; i++) for (int i = 0; i < objlist.Count; i++)
{ {
SceneObjectGroup group = objlist[i]; SceneObjectGroup group = objlist[i];
/*
group.RootPart.AttachPoint = group.RootPart.Shape.State; group.RootPart.AttachPoint = group.RootPart.Shape.State;
group.RootPart.AttachOffset = group.AbsolutePosition; group.RootPart.AttachedPos = group.AbsolutePosition;
group.RootPart.AttachRotation = group.GroupRotation; group.RootPart.AttachRotation = group.GroupRotation;
*/
group.ResetIDs(); group.ResetIDs();
SceneObjectPart rootPart = group.GetPart(group.UUID); SceneObjectPart rootPart = group.GetPart(group.UUID);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -12801,7 +12801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
group.RootPart.AttachPoint = group.RootPart.Shape.State; group.RootPart.AttachPoint = group.RootPart.Shape.State;
group.RootPart.AttachOffset = group.AbsolutePosition; group.RootPart.AttachedPos = group.AbsolutePosition;
group.ResetIDs(); group.ResetIDs();