aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-08-02 02:26:54 +0100
committerUbitUmarov2014-08-02 02:26:54 +0100
commitc11c4c0daa6342decc293ac51171fffdf412f6d3 (patch)
tree0047e419199bfc0266c29167e590b4898e8465b3 /OpenSim
parentremove a few more (diff)
downloadopensim-SC_OLD-c11c4c0daa6342decc293ac51171fffdf412f6d3.zip
opensim-SC_OLD-c11c4c0daa6342decc293ac51171fffdf412f6d3.tar.gz
opensim-SC_OLD-c11c4c0daa6342decc293ac51171fffdf412f6d3.tar.bz2
opensim-SC_OLD-c11c4c0daa6342decc293ac51171fffdf412f6d3.tar.xz
add a hide check at end of region arrival
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2ebcfb4..948e040 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1885,6 +1885,10 @@ namespace OpenSim.Region.Framework.Scenes
1885 { 1885 {
1886 m_inTransit = false; 1886 m_inTransit = false;
1887 } 1887 }
1888 // if hide force a check
1889 if (!IsChildAgent && m_currentParcelHide)
1890 ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID,
1891 true, m_previusParcelHide, false, true);
1888 } 1892 }
1889 1893
1890 /// <summary> 1894 /// <summary>
@@ -5346,6 +5350,9 @@ namespace OpenSim.Region.Framework.Scenes
5346 List<ScenePresence> viewsToSendme = new List<ScenePresence>(); 5350 List<ScenePresence> viewsToSendme = new List<ScenePresence>();
5347 List<ScenePresence> allpresences = null; 5351 List<ScenePresence> allpresences = null;
5348 5352
5353 if (IsInTransit)
5354 return;
5355
5349 if (check) 5356 if (check)
5350 { 5357 {
5351 if (currentParcelUUID == null || oldhide == currentParcelHide) 5358 if (currentParcelUUID == null || oldhide == currentParcelHide)