aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-06-28 14:10:22 -0700
committerDiva Canto2010-06-28 14:10:22 -0700
commit20fc35399b8193e3620b0dadca861e90c4afe216 (patch)
tree19a6cad4c149a06c4553bc05e8a88fdeae20d9c6 /OpenSim/Services
parentChange the way IRegionModule us referenced by IEmailModule to (diff)
downloadopensim-SC_OLD-20fc35399b8193e3620b0dadca861e90c4afe216.zip
opensim-SC_OLD-20fc35399b8193e3620b0dadca861e90c4afe216.tar.gz
opensim-SC_OLD-20fc35399b8193e3620b0dadca861e90c4afe216.tar.bz2
opensim-SC_OLD-20fc35399b8193e3620b0dadca861e90c4afe216.tar.xz
Fixes mantis #4815 and #4812
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index af603b2..ae80a8c 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -255,7 +255,11 @@ namespace OpenSim.Services.GridService
255 { 255 {
256 m_log.WarnFormat("[HYPERGRID LINKER]: Remote Gatekeeper at {0} provided malformed ExternalName {1}", regInfo.ExternalHostName, externalName); 256 m_log.WarnFormat("[HYPERGRID LINKER]: Remote Gatekeeper at {0} provided malformed ExternalName {1}", regInfo.ExternalHostName, externalName);
257 } 257 }
258 regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort + ":" + regInfo.RegionName; 258 string name = regInfo.RegionName;
259 regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort;
260 if (name != string.Empty)
261 regInfo.RegionName += ":" + name;
262
259 // Try get the map image 263 // Try get the map image
260 //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL); 264 //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL);
261 // I need a texture that works for this... the one I tried doesn't seem to be working 265 // I need a texture that works for this... the one I tried doesn't seem to be working