aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorDahlia Trimble2008-12-22 09:29:59 +0000
committerDahlia Trimble2008-12-22 09:29:59 +0000
commit6e68a11082c0928395450d70fcb5b3f18bdfb35f (patch)
tree2276875a4b59b60f412f2f92d77bdffe69dd9713 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parenttest commit - no functional change (diff)
downloadopensim-SC-6e68a11082c0928395450d70fcb5b3f18bdfb35f.zip
opensim-SC-6e68a11082c0928395450d70fcb5b3f18bdfb35f.tar.gz
opensim-SC-6e68a11082c0928395450d70fcb5b3f18bdfb35f.tar.bz2
opensim-SC-6e68a11082c0928395450d70fcb5b3f18bdfb35f.tar.xz
Thanks Gerhard for a patch that implements part 3 of VolumeDetection / persistance
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 857f193..2f6a61a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -858,7 +858,7 @@ namespace OpenSim.Region.Environment.Scenes
858 m_rootPart.AttachedAvatar = UUID.Zero; 858 m_rootPart.AttachedAvatar = UUID.Zero;
859 m_rootPart.SetParentLocalId(0); 859 m_rootPart.SetParentLocalId(0);
860 SetAttachmentPoint((byte)0); 860 SetAttachmentPoint((byte)0);
861 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); 861 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_scene.m_physicalPrim);
862 HasGroupChanged = true; 862 HasGroupChanged = true;
863 RootPart.Rezzed = DateTime.Now; 863 RootPart.Rezzed = DateTime.Now;
864 RootPart.RemFlag(PrimFlags.TemporaryOnRez); 864 RootPart.RemFlag(PrimFlags.TemporaryOnRez);
@@ -1161,12 +1161,12 @@ namespace OpenSim.Region.Environment.Scenes
1161 { 1161 {
1162 if (m_parts.Count > 1) 1162 if (m_parts.Count > 1)
1163 { 1163 {
1164 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); 1164 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
1165 foreach (SceneObjectPart part in m_parts.Values) 1165 foreach (SceneObjectPart part in m_parts.Values)
1166 { 1166 {
1167 if (part.LocalId != m_rootPart.LocalId) 1167 if (part.LocalId != m_rootPart.LocalId)
1168 { 1168 {
1169 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); 1169 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
1170 } 1170 }
1171 } 1171 }
1172 1172
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.Environment.Scenes
1175 } 1175 }
1176 else 1176 else
1177 { 1177 {
1178 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); 1178 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
1179 } 1179 }
1180 } 1180 }
1181 } 1181 }