aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index fefdad6..1ddcc75 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
122 122
123 public string RegisterRegion(UUID scopeID, GridRegion regionInfo) 123 public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
124 { 124 {
125 IPEndPoint ext = regionInfo.ExternalEndPoint;
126 if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint";
125 // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service 127 // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service
126 Scene scene; 128 Scene scene;
127 if (m_scenes.TryGetValue(regionInfo.RegionID, out scene)) 129 if (m_scenes.TryGetValue(regionInfo.RegionID, out scene))
@@ -139,7 +141,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
139 { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, 141 { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
140 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, 142 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
141 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, 143 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
142 { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, 144 { "ExternalAddress", OSD.FromString(ext.Address.ToString()) },
143 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, 145 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
144 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, 146 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
145 { "Access", OSD.FromInteger(regionInfo.Access) }, 147 { "Access", OSD.FromInteger(regionInfo.Access) },