1 files changed, 22 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 34d0eaa..9e9a83f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4787,10 +4787,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.ForEachScenePresence(delegate(ScenePresence p)
             {
-                if (p != this && sog.HasPrivateAttachmentPoint)
-                    return;
-                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                if (p != this)
+                {
+                    if (sog.HasPrivateAttachmentPoint ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
                     return;
+                }
 
                 SceneObjectPart[] parts = sog.Parts;
 
@@ -4820,11 +4822,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.ForEachScenePresence(delegate(ScenePresence p)
             {
-                if (p != this && part.ParentGroup.HasPrivateAttachmentPoint)
-                    return;
+                if (p != this)
+                {
 
-                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
-                    return;
+                    if (part.ParentGroup.HasPrivateAttachmentPoint ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        return;
+                }
 
                 if (part.UpdateFlag == UpdateRequired.TERSE)
                 {
@@ -4848,11 +4852,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.ForEachScenePresence(delegate(ScenePresence p)
             {
-                if (p != this && sog.HasPrivateAttachmentPoint)
-                    return;
-
-                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
+                if (p != this)
+                {
+                if (sog.HasPrivateAttachmentPoint ||
+                    (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
                     return;
+                }
 
                 SceneObjectPart[] parts = sog.Parts;
 
@@ -4882,11 +4887,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.ForEachScenePresence(delegate(ScenePresence p)
             {
-                if (p != this && part.ParentGroup.HasPrivateAttachmentPoint)
-                    return;
+                if (p != this)
+                {
 
-                if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)
-                    return;
+                    if (part.ParentGroup.HasPrivateAttachmentPoint ||
+                        (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200))
+                        return;
+                }
 
                 if (UpdateFlag == UpdateRequired.TERSE)
                 {