aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2014-08-03 02:26:39 +0100
committerUbitUmarov2014-08-03 02:26:39 +0100
commitcc16fe68ccf64102f1eea718d42234639a5725f3 (patch)
tree3d5170ac7b8efe94b78b112125950e393533214d /OpenSim/Region/Framework
parenttest... (diff)
downloadopensim-SC-cc16fe68ccf64102f1eea718d42234639a5725f3.zip
opensim-SC-cc16fe68ccf64102f1eea718d42234639a5725f3.tar.gz
opensim-SC-cc16fe68ccf64102f1eea718d42234639a5725f3.tar.bz2
opensim-SC-cc16fe68ccf64102f1eea718d42234639a5725f3.tar.xz
....
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index eec1b21..61f66d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5459,12 +5459,13 @@ namespace OpenSim.Region.Framework.Scenes
5459 { 5459 {
5460 if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) 5460 if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
5461 continue; 5461 continue;
5462 5462
5463 // those not on parcel dont see me
5464 if (currentParcelUUID != p.currentParcelUUID) 5463 if (currentParcelUUID != p.currentParcelUUID)
5465 { 5464 {
5466 if (p.GodLevel < 200) 5465 if (p.GodLevel < 200)
5467 killsToSendto.Add(p); // they dont see me 5466 killsToSendto.Add(p);
5467 if (GodLevel < 200 && p.ParcelHideThisAvatar)
5468 killsToSendme.Add(p);
5468 } 5469 }
5469 else 5470 else
5470 { 5471 {