OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More on dynamic hyperlinks. Making the 4096 check (deregistration of region) work in grid mode.

0.6.3-post-fixes
diva 2009-02-01 02:20:57 +00:00
parent ff149ae197
commit 3bd0df18b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
View File

@ -96,9 +96,9 @@ namespace OpenSim.Region.Communications.Hypergrid
public override bool DeregisterRegion(RegionInfo regionInfo) public override bool DeregisterRegion(RegionInfo regionInfo)
{ {
bool success = m_remoteBackend.DeregisterRegion(regionInfo); bool success = base.DeregisterRegion(regionInfo);
if (!success) if (!success)
success = base.DeregisterRegion(regionInfo); success = m_remoteBackend.DeregisterRegion(regionInfo);
return success; return success;
} }

2
OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
View File

@ -250,7 +250,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) || if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) ||
(Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 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."); m_log.Debug("[HGrid]: Region deregistered.");
client.SendAlertMessage("Region is too far (" + x + ", " + y + ")"); client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
return false; return false;