aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordiva2009-02-01 02:20:57 +0000
committerdiva2009-02-01 02:20:57 +0000
commit3bd0df18b76de72f678bd656d1f87f15079e94bb (patch)
treee3c2c8e464972a6c57c0ff7d2ca238386c5f1cbb /OpenSim/Region
parentCheck for the 4096 limitation in dynamic region hyperlinks. (diff)
downloadopensim-SC-3bd0df18b76de72f678bd656d1f87f15079e94bb.zip
opensim-SC-3bd0df18b76de72f678bd656d1f87f15079e94bb.tar.gz
opensim-SC-3bd0df18b76de72f678bd656d1f87f15079e94bb.tar.bz2
opensim-SC-3bd0df18b76de72f678bd656d1f87f15079e94bb.tar.xz
More on dynamic hyperlinks. Making the 4096 check (deregistration of region) work in grid mode.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index 0448692..b64a070 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -96,9 +96,9 @@ namespace OpenSim.Region.Communications.Hypergrid
96 96
97 public override bool DeregisterRegion(RegionInfo regionInfo) 97 public override bool DeregisterRegion(RegionInfo regionInfo)
98 { 98 {
99 bool success = m_remoteBackend.DeregisterRegion(regionInfo); 99 bool success = base.DeregisterRegion(regionInfo);
100 if (!success) 100 if (!success)
101 success = base.DeregisterRegion(regionInfo); 101 success = m_remoteBackend.DeregisterRegion(regionInfo);
102 return success; 102 return success;
103 } 103 }
104 104
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
index 7346d92..6541571 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
250 if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) || 250 if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) ||
251 (Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096)) 251 (Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096))
252 { 252 {
253 m_scene.CommsManager.GridService.RegisterRegion(regInfo); 253 m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
254 m_log.Debug("[HGrid]: Region deregistered."); 254 m_log.Debug("[HGrid]: Region deregistered.");
255 client.SendAlertMessage("Region is too far (" + x + ", " + y + ")"); 255 client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
256 return false; 256 return false;