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

Assorted bug fixes related to hyperlinking

slimupdates
Diva Canto 2010-01-31 22:35:23 -08:00
parent 35de8e91ec
commit 35a245b67a
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/Null/NullRegionData.cs
View File

@ -133,12 +133,12 @@ namespace OpenSim.Data.Null
public List<RegionData> GetDefaultRegions(UUID scopeID)
{
return null;
return new List<RegionData>();
}
public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
{
return null;
return new List<RegionData>();
}
}
}

11
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
View File

@ -188,7 +188,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return rinfo;
}
// Let's not override GetRegionsByName -- let's get them all from the grid server
public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
{
List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber);
if (grinfo != null)
rinfo.AddRange(grinfo);
return rinfo;
}
// Let's not override GetRegionRange -- let's get them all from the grid server
#endregion

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
{

9
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -120,7 +120,7 @@ namespace OpenSim.Services.HypergridService
reason = string.Empty;
m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName);
if (!m_AllowTeleportsToAnyRegion)
if (!m_AllowTeleportsToAnyRegion || regionName == string.Empty)
{
List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
if (defs != null && defs.Count > 0)
@ -133,12 +133,7 @@ namespace OpenSim.Services.HypergridService
}
catch
{
reason = "Grid setup problem";
return false;
}
if (regionName != string.Empty)
{
reason = "Direct links to regions not allowed";
reason = "Grid setup problem. Try specifying a particular region here.";
return false;
}

1
bin/config-include/GridCommon.ini.example
View File

@ -20,6 +20,7 @@
; change this to your grid-wide grid server
;
GridServerURI = "http://mygridserver.com:8003"
;AllowHypergridMapSearch = true
[AvatarService]
;