diff options
author | UbitUmarov | 2014-08-02 14:17:00 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-02 14:17:00 +0100 |
commit | b0864a2f0f46db1656951633b6a9da363bf62c6c (patch) | |
tree | 86ea9d806fccb6adb7a6ba706238db8d7713db94 /OpenSim/Region/Framework/Scenes | |
parent | initial state change (diff) | |
download | opensim-SC-b0864a2f0f46db1656951633b6a9da363bf62c6c.zip opensim-SC-b0864a2f0f46db1656951633b6a9da363bf62c6c.tar.gz opensim-SC-b0864a2f0f46db1656951633b6a9da363bf62c6c.tar.bz2 opensim-SC-b0864a2f0f46db1656951633b6a9da363bf62c6c.tar.xz |
crossing into a hide parcel may work now. Not nice fix.. need get back to
this later
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 62cc28e..415dbcd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1737,6 +1737,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1737 | client.Name, Scene.Name, AbsolutePosition); | 1737 | client.Name, Scene.Name, AbsolutePosition); |
1738 | 1738 | ||
1739 | m_inTransit = true; | 1739 | m_inTransit = true; |
1740 | bool newhide = false; | ||
1740 | try | 1741 | try |
1741 | { | 1742 | { |
1742 | // Make sure it's not a login agent. We don't want to wait for updates during login | 1743 | // Make sure it's not a login agent. We don't want to wait for updates during login |
@@ -1819,6 +1820,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1819 | m_previusParcelUUID = UUID.Zero; | 1820 | m_previusParcelUUID = UUID.Zero; |
1820 | m_currentParcelHide = false; | 1821 | m_currentParcelHide = false; |
1821 | m_currentParcelUUID = UUID.Zero; | 1822 | m_currentParcelUUID = UUID.Zero; |
1823 | |||
1822 | 1824 | ||
1823 | // send initial land overlay and parcel | 1825 | // send initial land overlay and parcel |
1824 | if (!IsChildAgent) | 1826 | if (!IsChildAgent) |
@@ -1827,6 +1829,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1827 | if (landch != null) | 1829 | if (landch != null) |
1828 | { | 1830 | { |
1829 | landch.sendClientInitialLandInfo(client); | 1831 | landch.sendClientInitialLandInfo(client); |
1832 | newhide = m_currentParcelHide; | ||
1833 | m_currentParcelHide = false; | ||
1830 | } | 1834 | } |
1831 | } | 1835 | } |
1832 | 1836 | ||
@@ -1886,7 +1890,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1886 | m_inTransit = false; | 1890 | m_inTransit = false; |
1887 | } | 1891 | } |
1888 | // if hide force a check | 1892 | // if hide force a check |
1889 | if (!IsChildAgent && m_currentParcelHide) | 1893 | if (!IsChildAgent && newhide) |
1890 | ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID, | 1894 | ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID, |
1891 | true, m_previusParcelHide, false, true); | 1895 | true, m_previusParcelHide, false, true); |
1892 | } | 1896 | } |