aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-10-29 22:14:11 +0000
committerUbitUmarov2015-10-29 22:14:11 +0000
commitdd9b06e3b68919f9b093c7673427c4beeb1fb1ea (patch)
tree78ab2e37ee45b92894ffc7f9e67183f3b2cc090c /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentfix services handling of visualparameters, avoiding possible crashs (mantis 7... (diff)
downloadopensim-SC_OLD-dd9b06e3b68919f9b093c7673427c4beeb1fb1ea.zip
opensim-SC_OLD-dd9b06e3b68919f9b093c7673427c4beeb1fb1ea.tar.gz
opensim-SC_OLD-dd9b06e3b68919f9b093c7673427c4beeb1fb1ea.tar.bz2
opensim-SC_OLD-dd9b06e3b68919f9b093c7673427c4beeb1fb1ea.tar.xz
fix mantis 7733, reverting setting of IsAttachment on first call to full check. Replace instead same simple IsAttachment tests by full checks
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 1d89267..f3b3a9c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -447,12 +447,8 @@ namespace OpenSim.Region.Framework.Scenes
447 /// <returns></returns> 447 /// <returns></returns>
448 public bool IsAttachmentCheckFull() 448 public bool IsAttachmentCheckFull()
449 { 449 {
450 if(IsAttachment) 450 return (IsAttachment ||
451 return true; 451 (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0));
452
453 IsAttachment = (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0);
454
455 return IsAttachment;
456 } 452 }
457 453
458 private struct avtocrossInfo 454 private struct avtocrossInfo