diff options
| author | UbitUmarov | 2014-08-21 06:35:11 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-21 06:35:11 +0100 |
| commit | 5f1cb6542d8b99674bd74147b2f43ef5432b0d15 (patch) | |
| tree | 72d4df6436ed94dc10e80f43deccf5a923af6475 | |
| parent | add filter sog updates (diff) | |
| download | opensim-SC-5f1cb6542d8b99674bd74147b2f43ef5432b0d15.zip opensim-SC-5f1cb6542d8b99674bd74147b2f43ef5432b0d15.tar.gz opensim-SC-5f1cb6542d8b99674bd74147b2f43ef5432b0d15.tar.bz2 opensim-SC-5f1cb6542d8b99674bd74147b2f43ef5432b0d15.tar.xz | |
test
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 37 |
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 | |||
| 4787 | 4787 | ||
| 4788 | m_scene.ForEachScenePresence(delegate(ScenePresence p) | 4788 | m_scene.ForEachScenePresence(delegate(ScenePresence p) |
| 4789 | { | 4789 | { |
| 4790 | if (p != this && sog.HasPrivateAttachmentPoint) | 4790 | if (p != this) |
| 4791 | return; | 4791 | { |
| 4792 | if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200) | 4792 | if (sog.HasPrivateAttachmentPoint || |
| 4793 | (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)) | ||
| 4793 | return; | 4794 | return; |
| 4795 | } | ||
| 4794 | 4796 | ||
| 4795 | SceneObjectPart[] parts = sog.Parts; | 4797 | SceneObjectPart[] parts = sog.Parts; |
| 4796 | 4798 | ||
| @@ -4820,11 +4822,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4820 | 4822 | ||
| 4821 | m_scene.ForEachScenePresence(delegate(ScenePresence p) | 4823 | m_scene.ForEachScenePresence(delegate(ScenePresence p) |
| 4822 | { | 4824 | { |
| 4823 | if (p != this && part.ParentGroup.HasPrivateAttachmentPoint) | 4825 | if (p != this) |
| 4824 | return; | 4826 | { |
| 4825 | 4827 | ||
| 4826 | if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200) | 4828 | if (part.ParentGroup.HasPrivateAttachmentPoint || |
| 4827 | return; | 4829 | (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)) |
| 4830 | return; | ||
| 4831 | } | ||
| 4828 | 4832 | ||
| 4829 | if (part.UpdateFlag == UpdateRequired.TERSE) | 4833 | if (part.UpdateFlag == UpdateRequired.TERSE) |
| 4830 | { | 4834 | { |
| @@ -4848,11 +4852,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4848 | 4852 | ||
| 4849 | m_scene.ForEachScenePresence(delegate(ScenePresence p) | 4853 | m_scene.ForEachScenePresence(delegate(ScenePresence p) |
| 4850 | { | 4854 | { |
| 4851 | if (p != this && sog.HasPrivateAttachmentPoint) | 4855 | if (p != this) |
| 4852 | return; | 4856 | { |
| 4853 | 4857 | if (sog.HasPrivateAttachmentPoint || | |
| 4854 | if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200) | 4858 | (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)) |
| 4855 | return; | 4859 | return; |
| 4860 | } | ||
| 4856 | 4861 | ||
| 4857 | SceneObjectPart[] parts = sog.Parts; | 4862 | SceneObjectPart[] parts = sog.Parts; |
| 4858 | 4863 | ||
| @@ -4882,11 +4887,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4882 | 4887 | ||
| 4883 | m_scene.ForEachScenePresence(delegate(ScenePresence p) | 4888 | m_scene.ForEachScenePresence(delegate(ScenePresence p) |
| 4884 | { | 4889 | { |
| 4885 | if (p != this && part.ParentGroup.HasPrivateAttachmentPoint) | 4890 | if (p != this) |
| 4886 | return; | 4891 | { |
| 4887 | 4892 | ||
| 4888 | if (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200) | 4893 | if (part.ParentGroup.HasPrivateAttachmentPoint || |
| 4889 | return; | 4894 | (ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && p.GodLevel < 200)) |
| 4895 | return; | ||
| 4896 | } | ||
| 4890 | 4897 | ||
| 4891 | if (UpdateFlag == UpdateRequired.TERSE) | 4898 | if (UpdateFlag == UpdateRequired.TERSE) |
| 4892 | { | 4899 | { |