diff options
| author | UbitUmarov | 2014-08-02 01:21:24 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-02 01:21:24 +0100 |
| commit | bdac5058c87c0903df90ed340e3c81d70bbdb682 (patch) | |
| tree | 2484d8f917ae90cb32e635a8838f6d20bec794f9 /OpenSim/Region/Framework/Scenes | |
| parent | sitting avatars hidding by their position. This is not as SL that uses (diff) | |
| download | opensim-SC-bdac5058c87c0903df90ed340e3c81d70bbdb682.zip opensim-SC-bdac5058c87c0903df90ed340e3c81d70bbdb682.tar.gz opensim-SC-bdac5058c87c0903df90ed340e3c81d70bbdb682.tar.bz2 opensim-SC-bdac5058c87c0903df90ed340e3c81d70bbdb682.tar.xz | |
remove some ischild tests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 494c9e0..c3ef314 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -5362,7 +5362,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5362 | { // where private | 5362 | { // where private |
| 5363 | foreach (ScenePresence p in allpresences) | 5363 | foreach (ScenePresence p in allpresences) |
| 5364 | { | 5364 | { |
| 5365 | if (p.IsChildAgent || p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) | 5365 | if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) |
| 5366 | continue; | 5366 | continue; |
| 5367 | 5367 | ||
| 5368 | // those on not on parcel see me | 5368 | // those on not on parcel see me |
| @@ -5377,7 +5377,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5377 | { // where public | 5377 | { // where public |
| 5378 | foreach (ScenePresence p in allpresences) | 5378 | foreach (ScenePresence p in allpresences) |
| 5379 | { | 5379 | { |
| 5380 | if (p.IsChildAgent || p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) | 5380 | if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) |
| 5381 | continue; | 5381 | continue; |
| 5382 | 5382 | ||
| 5383 | // those not on parcel dont see me | 5383 | // those not on parcel dont see me |
| @@ -5402,7 +5402,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5402 | { | 5402 | { |
| 5403 | foreach (ScenePresence p in allpresences) | 5403 | foreach (ScenePresence p in allpresences) |
| 5404 | { | 5404 | { |
| 5405 | if (p.IsChildAgent || p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) | 5405 | if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) |
| 5406 | continue; | 5406 | continue; |
| 5407 | 5407 | ||
| 5408 | // only those on previus parcel need receive kills | 5408 | // only those on previus parcel need receive kills |
| @@ -5426,7 +5426,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5426 | 5426 | ||
| 5427 | foreach (ScenePresence p in allpresences) | 5427 | foreach (ScenePresence p in allpresences) |
| 5428 | { | 5428 | { |
| 5429 | if (p.IsChildAgent || p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) | 5429 | if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) |
| 5430 | continue; | 5430 | continue; |
| 5431 | 5431 | ||
| 5432 | // those not on new parcel dont see me | 5432 | // those not on new parcel dont see me |
| @@ -5453,7 +5453,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5453 | 5453 | ||
| 5454 | foreach (ScenePresence p in allpresences) | 5454 | foreach (ScenePresence p in allpresences) |
| 5455 | { | 5455 | { |
| 5456 | if (p.IsChildAgent || p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) | 5456 | if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) |
| 5457 | continue; | 5457 | continue; |
| 5458 | // only those old parcel need receive kills | 5458 | // only those old parcel need receive kills |
| 5459 | if (previusParcelUUID == p.currentParcelUUID) | 5459 | if (previusParcelUUID == p.currentParcelUUID) |