ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assorted bug fixes related to hyperlinking

Browse Source
This commit is contained in:
Diva Canto
2010-01-31 22:35:23 -08:00
parent 35de8e91ec
commit 35a245b67a
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Services/GridService/GridService.cs
View File

@@ -329,7 +329,7 @@ namespace OpenSim.Services.GridService
}
}
if (m_AllowHypergridMapSearch && rdatas.Count == 0 && name.Contains("."))
if (m_AllowHypergridMapSearch && rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains("."))
{
GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name);
if (r != null)
@@ -412,6 +412,7 @@ namespace OpenSim.Services.GridService
ret.Add(RegionData2RegionInfo(r));
}
m_log.DebugFormat("[GRID SERVICE]: Fallback returned {0} regions", ret.Count);
return ret;
}

3
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -470,7 +470,8 @@ namespace OpenSim.Services.GridService
string reason = string.Empty;
if (TryLinkRegionToCoords(UUID.Zero, mapName, xloc, yloc, out reason) == null)
MainConsole.Instance.Output("Failed to link region: " + reason);
MainConsole.Instance.Output("Hyperlink established");
else
MainConsole.Instance.Output("Hyperlink established");
}
else
{