diff options
| author | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
| commit | 4851706d35ca0e24e0f69348d957145631a8d94c (patch) | |
| tree | ad984517af1449c717a387d5a07eca0ec2285f93 /OpenSim/Services/GridService | |
| parent | Catch newid == null which is what happens if the asset service is offline (se... (diff) | |
| parent | Avoid a spurious error message when taking a friend's no copy item (diff) | |
| download | opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.zip opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.gz opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.bz2 opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 6 |
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 |