OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

avinationmerge
UbitUmarov 2014-08-21 06:35:11 +01:00
parent ad6f942279
commit 5f1cb6542d
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

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