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

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-04-22 15:06:06 +01:00
parent d76d8f3da1 ae2b8f7007
commit 8df4bd14f5
6 changed files with 360 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2673,6 +2673,7 @@ namespace OpenSim.Region.Framework.Scenes
}
linkPart.LinkNum = linkNum++;
linkPart.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect);
SceneObjectPart[] ogParts = objectGroup.Parts;
Array.Sort(ogParts, delegate(SceneObjectPart a, SceneObjectPart b)
@@ -2908,6 +2909,8 @@ namespace OpenSim.Region.Framework.Scenes
oldRot = part.RotationOffset;
Quaternion newRot = Quaternion.Inverse(parentRot) * worldRot;
part.RotationOffset = newRot;
part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect);
}
/// <summary>