From 20fc35399b8193e3620b0dadca861e90c4afe216 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Jun 2010 14:10:22 -0700 Subject: [PATCH] Fixes mantis #4815 and #4812 --- OpenSim/Services/GridService/HypergridLinker.cs | 6 +++++- bin/Robust.HG.ini.example | 4 ++++ bin/config-include/StandaloneCommon.ini.example | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index af603b23e2..ae80a8c354 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -255,7 +255,11 @@ namespace OpenSim.Services.GridService { m_log.WarnFormat("[HYPERGRID LINKER]: Remote Gatekeeper at {0} provided malformed ExternalName {1}", regInfo.ExternalHostName, externalName); } - regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort + ":" + regInfo.RegionName; + string name = regInfo.RegionName; + regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort; + if (name != string.Empty) + regInfo.RegionName += ":" + name; + // Try get the map image //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL); // I need a texture that works for this... the one I tried doesn't seem to be working diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 39228eb1d6..6b0029f0f7 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; CHANGE THIS ExternalName = "http://127.0.0.1:8002" + ; Does this grid allow incoming links to any region in it? + ; If false, HG TPs happen only to the Default regions specified in [GridService] section + AllowTeleportsToAnyRegion = true + [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" ;; for the service diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index bfa67259ab..de8677f111 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -68,3 +68,8 @@ [GatekeeperService] ExternalName = "http://127.0.0.1:9000" + + ; Does this grid allow incoming links to any region in it? + ; If false, HG TPs happen only to the Default regions specified in [GridService] section + AllowTeleportsToAnyRegion = true +