aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2014-08-11 01:44:12 +0100
committerUbitUmarov2014-08-11 01:44:12 +0100
commitba33d78af90ca0649ffb5150eadffc185bf224fe (patch)
tree201f50ce4a77ef90d88a91f4a6d40eb09e810dc4 /OpenSim/Region/Framework
parent remove confusing defonly control (diff)
downloadopensim-SC-ba33d78af90ca0649ffb5150eadffc185bf224fe.zip
opensim-SC-ba33d78af90ca0649ffb5150eadffc185bf224fe.tar.gz
opensim-SC-ba33d78af90ca0649ffb5150eadffc185bf224fe.tar.bz2
opensim-SC-ba33d78af90ca0649ffb5150eadffc185bf224fe.tar.xz
dont do ParcelCrossCheck() on child avatars
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d65c250..6cd951d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5611,6 +5611,9 @@ namespace OpenSim.Region.Framework.Scenes
5611 if (IsInTransit) 5611 if (IsInTransit)
5612 return; 5612 return;
5613 5613
5614 if (IsChildAgent)
5615 return;
5616
5614 if (check) 5617 if (check)
5615 { 5618 {
5616 // check is relative to current parcel only 5619 // check is relative to current parcel only