aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-26 16:27:41 +0100
committerJustin Clark-Casey (justincc)2010-08-26 16:27:41 +0100
commitdf702417dc6aba6422b3f252023ea551620f8ee2 (patch)
tree8baf1ddea3f747e4607aa1befb483add3248735f /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentReinstate kill record check that prevents an entity update being sent to a cl... (diff)
downloadopensim-SC_OLD-df702417dc6aba6422b3f252023ea551620f8ee2.zip
opensim-SC_OLD-df702417dc6aba6422b3f252023ea551620f8ee2.tar.gz
opensim-SC_OLD-df702417dc6aba6422b3f252023ea551620f8ee2.tar.bz2
opensim-SC_OLD-df702417dc6aba6422b3f252023ea551620f8ee2.tar.xz
Remove mono compiler warnings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs16
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2ad4223..3ed74e1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4727,20 +4727,8 @@ namespace OpenSim.Region.Framework.Scenes
4727 if (ParentGroup == null || ParentGroup.IsDeleted) 4727 if (ParentGroup == null || ParentGroup.IsDeleted)
4728 return; 4728 return;
4729 4729
4730 Vector3 lPos = OffsetPosition; 4730 if (IsAttachment && ParentGroup.RootPart != this)
4731 4731 return;
4732 if (IsAttachment)
4733 {
4734 if (ParentGroup.RootPart != this)
4735 return;
4736
4737 lPos = ParentGroup.RootPart.AttachedPos;
4738 }
4739 else
4740 {
4741 if (ParentGroup.RootPart == this)
4742 lPos = AbsolutePosition;
4743 }
4744 4732
4745 // Causes this thread to dig into the Client Thread Data. 4733 // Causes this thread to dig into the Client Thread Data.
4746 // Remember your locking here! 4734 // Remember your locking here!