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

Merge branch 'master' of opensimulator.org:/var/git/opensim

avinationmerge
Melanie Thielker 2015-10-31 00:06:34 +01:00
parent dc6d9eadf3 dd9b06e3b6
commit f0fd028ed9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,12 +447,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns></returns> /// <returns></returns>
public bool IsAttachmentCheckFull() public bool IsAttachmentCheckFull()
{ {
if(IsAttachment) return (IsAttachment ||
return true; (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0));
IsAttachment = (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0);
return IsAttachment;
} }
private struct avtocrossInfo private struct avtocrossInfo

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

@ -1753,8 +1753,9 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachment if ((!isPhantom || isPhysical || _VolumeDetectActive)
&& !(Shape.PathCurve == (byte)Extrusion.Flexible)) && !ParentGroup.IsAttachmentCheckFull()
&& !(Shape.PathCurve == (byte)Extrusion.Flexible))
{ {
AddToPhysics(isPhysical, isPhantom, isPhysical); AddToPhysics(isPhysical, isPhantom, isPhysical);
} }
@ -4241,7 +4242,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
if (SetPhantom if (SetPhantom
|| ParentGroup.IsAttachment || ParentGroup.IsAttachmentCheckFull()
|| PhysicsShapeType == (byte)PhysShapeType.none || PhysicsShapeType == (byte)PhysShapeType.none
|| (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints
{ {