diff options
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 3a61226..57924b7 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -104,6 +104,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
104 | 104 | ||
105 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) | 105 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
106 | { | 106 | { |
107 | IPEndPoint ext = regionInfo.ExternalEndPoint; | ||
108 | if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint"; | ||
107 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 109 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
108 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 110 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); |
109 | 111 | ||
@@ -114,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
114 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 116 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
115 | { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, | 117 | { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, |
116 | { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, | 118 | { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, |
117 | { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, | 119 | { "ExternalAddress", OSD.FromString(ext.Address.ToString()) }, |
118 | { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, | 120 | { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, |
119 | { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, | 121 | { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, |
120 | { "Access", OSD.FromInteger(regionInfo.Access) }, | 122 | { "Access", OSD.FromInteger(regionInfo.Access) }, |