From 3bd0df18b76de72f678bd656d1f87f15079e94bb Mon Sep 17 00:00:00 2001 From: diva Date: Sun, 1 Feb 2009 02:20:57 +0000 Subject: [PATCH] More on dynamic hyperlinks. Making the 4096 check (deregistration of region) work in grid mode. --- .../Region/Communications/Hypergrid/HGGridServicesGridMode.cs | 4 ++-- .../Environment/Modules/World/WorldMap/MapSearchModule.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs index 04486925a4..b64a07056f 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs @@ -96,9 +96,9 @@ namespace OpenSim.Region.Communications.Hypergrid public override bool DeregisterRegion(RegionInfo regionInfo) { - bool success = m_remoteBackend.DeregisterRegion(regionInfo); + bool success = base.DeregisterRegion(regionInfo); if (!success) - success = base.DeregisterRegion(regionInfo); + success = m_remoteBackend.DeregisterRegion(regionInfo); return success; } diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs index 7346d92eeb..654157149e 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs @@ -250,7 +250,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) || (Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096)) { - m_scene.CommsManager.GridService.RegisterRegion(regInfo); + m_scene.CommsManager.GridService.DeregisterRegion(regInfo); m_log.Debug("[HGrid]: Region deregistered."); client.SendAlertMessage("Region is too far (" + x + ", " + y + ")"); return false;