ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

First set of merge fixes

Browse Source
This commit is contained in:
Tom
2011-09-07 09:42:18 -07:00
parent 9cc2d0b60a
commit 03f6734f43
11 changed files with 333 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -1437,9 +1437,9 @@ namespace OpenSim.Region.Framework.Scenes
// Set the new attachment point data in the object
byte attachmentPoint = group.GetAttachmentPoint();
group.UpdateGroupPosition(pos);
group.RootPart.IsAttachment = false;
group.IsAttachment = false;
group.AbsolutePosition = group.RootPart.AttachedPos;
group.SetAttachmentPoint(attachmentPoint);
group.AttachmentPoint = attachmentPoint;
group.HasGroupChanged = true;
}
else
@@ -1723,12 +1723,11 @@ namespace OpenSim.Region.Framework.Scenes
// So that, on delink, no prims are unwittingly
// left for sale and sold off
if (child != null)
{
child.RootPart.ObjectSaleType = 0;
child.RootPart.SalePrice = 10;
childGroups.Add(child);
}
if (child != null)
{
child.RootPart.ObjectSaleType = 0;
child.RootPart.SalePrice = 10;
childGroups.Add(child);
}
}