diff options
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 77d74ee..67a33ae 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1650,6 +1650,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1650 | } | 1650 | } |
1651 | } | 1651 | } |
1652 | 1652 | ||
1653 | public void DropThisRootRegionFromNeighbours() | ||
1654 | { | ||
1655 | ulong handle = m_scene.RegionInfo.RegionHandle; | ||
1656 | RemoveNeighbourRegion(handle); | ||
1657 | Scene.CapsModule.DropChildSeed(UUID, handle); | ||
1658 | } | ||
1659 | |||
1660 | |||
1653 | public Dictionary<ulong, string> KnownRegions | 1661 | public Dictionary<ulong, string> KnownRegions |
1654 | { | 1662 | { |
1655 | get | 1663 | get |
@@ -1851,6 +1859,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1851 | newhide = m_currentParcelHide; | 1859 | newhide = m_currentParcelHide; |
1852 | m_currentParcelHide = false; | 1860 | m_currentParcelHide = false; |
1853 | 1861 | ||
1862 | // take this region out of children Neighbours list | ||
1863 | // possible should be done elsewhere | ||
1864 | DropThisRootRegionFromNeighbours(); | ||
1865 | |||
1854 | ValidateAndSendAppearanceAndAgentData(); | 1866 | ValidateAndSendAppearanceAndAgentData(); |
1855 | 1867 | ||
1856 | // attachments | 1868 | // attachments |
@@ -3506,7 +3518,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3506 | if (m_scene.AvatarFactory != null) | 3518 | if (m_scene.AvatarFactory != null) |
3507 | m_scene.AvatarFactory.QueueAppearanceSave(UUID); | 3519 | m_scene.AvatarFactory.QueueAppearanceSave(UUID); |
3508 | } | 3520 | } |
3509 | 3521 | ||
3522 | |||
3510 | // This agent just became root. We are going to tell everyone about it. The process of | 3523 | // This agent just became root. We are going to tell everyone about it. The process of |
3511 | // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it | 3524 | // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it |
3512 | // again here... this comes after the cached appearance check because the avatars | 3525 | // again here... this comes after the cached appearance check because the avatars |