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 db9027a..6a61da6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -105,6 +105,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
105 105
106 public string RegisterRegion(UUID scopeID, GridRegion regionInfo) 106 public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
107 { 107 {
108 IPEndPoint ext = regionInfo.ExternalEndPoint;
109 if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint";
108 Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); 110 Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0);
109 Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); 111 Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0);
110 112
@@ -115,7 +117,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
115 { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, 117 { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
116 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, 118 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
117 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, 119 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
118 { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, 120 { "ExternalAddress", OSD.FromString(ext.Address.ToString()) },
119 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, 121 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
120 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, 122 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
121 { "Access", OSD.FromInteger(regionInfo.Access) }, 123 { "Access", OSD.FromInteger(regionInfo.Access) },