aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-04-22 15:06:06 +0100
committerMelanie2012-04-22 15:06:06 +0100
commit8df4bd14f59ec6235cd7a02d74e69e530256b610 (patch)
treeee80b18ea802be18aaf24a7045afdd2e444b107a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'master' into careminster (diff)
parentComment out spurious Body != IntPtr.Zero code after disableBody(), since disa... (diff)
downloadopensim-SC_OLD-8df4bd14f59ec6235cd7a02d74e69e530256b610.zip
opensim-SC_OLD-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.gz
opensim-SC_OLD-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.bz2
opensim-SC_OLD-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cb0a57a..2882463 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2673,6 +2673,7 @@ namespace OpenSim.Region.Framework.Scenes
2673 } 2673 }
2674 2674
2675 linkPart.LinkNum = linkNum++; 2675 linkPart.LinkNum = linkNum++;
2676 linkPart.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect);
2676 2677
2677 SceneObjectPart[] ogParts = objectGroup.Parts; 2678 SceneObjectPart[] ogParts = objectGroup.Parts;
2678 Array.Sort(ogParts, delegate(SceneObjectPart a, SceneObjectPart b) 2679 Array.Sort(ogParts, delegate(SceneObjectPart a, SceneObjectPart b)
@@ -2908,6 +2909,8 @@ namespace OpenSim.Region.Framework.Scenes
2908 oldRot = part.RotationOffset; 2909 oldRot = part.RotationOffset;
2909 Quaternion newRot = Quaternion.Inverse(parentRot) * worldRot; 2910 Quaternion newRot = Quaternion.Inverse(parentRot) * worldRot;
2910 part.RotationOffset = newRot; 2911 part.RotationOffset = newRot;
2912
2913 part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect);
2911 } 2914 }
2912 2915
2913 /// <summary> 2916 /// <summary>