aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorDiva Canto2009-09-25 06:02:41 -0700
committerDiva Canto2009-09-25 06:02:41 -0700
commit52e477b41f137ff2a0775722dcbaaa64fa5f3bc3 (patch)
tree8178d6b5562ce6d657aefe35eaa61b513923da56 /OpenSim/Services/Interfaces
parentMake the grid client deregister the test regions at the end, so that they don... (diff)
downloadopensim-SC_OLD-52e477b41f137ff2a0775722dcbaaa64fa5f3bc3.zip
opensim-SC_OLD-52e477b41f137ff2a0775722dcbaaa64fa5f3bc3.tar.gz
opensim-SC_OLD-52e477b41f137ff2a0775722dcbaaa64fa5f3bc3.tar.bz2
opensim-SC_OLD-52e477b41f137ff2a0775722dcbaaa64fa5f3bc3.tar.xz
Better guards on RegisterRegion in GridService.
Added serverPort to the fields that get stored (I think this is the UDP port).
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 513b1b0..ce432ab 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -267,6 +267,7 @@ namespace OpenSim.Services.Interfaces
267 kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString(); 267 kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
268 kvp["serverHttpPort"] = HttpPort.ToString(); 268 kvp["serverHttpPort"] = HttpPort.ToString();
269 kvp["serverURI"] = ServerURI; 269 kvp["serverURI"] = ServerURI;
270 kvp["serverPort"] = InternalEndPoint.Port.ToString();
270 271
271 return kvp; 272 return kvp;
272 } 273 }
@@ -287,7 +288,7 @@ namespace OpenSim.Services.Interfaces
287 288
288 if (kvp.ContainsKey("serverIP")) 289 if (kvp.ContainsKey("serverIP"))
289 { 290 {
290 int port = 0; 291 //int port = 0;
291 //Int32.TryParse((string)kvp["serverPort"], out port); 292 //Int32.TryParse((string)kvp["serverPort"], out port);
292 //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port); 293 //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port);
293 ExternalHostName = (string)kvp["serverIP"]; 294 ExternalHostName = (string)kvp["serverIP"];
@@ -295,6 +296,13 @@ namespace OpenSim.Services.Interfaces
295 else 296 else
296 ExternalHostName = "127.0.0.1"; 297 ExternalHostName = "127.0.0.1";
297 298
299 if (kvp.ContainsKey("serverPort"))
300 {
301 Int32 port = 0;
302 Int32.TryParse((string)kvp["serverPort"], out port);
303 InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
304 }
305
298 if (kvp.ContainsKey("serverHttpPort")) 306 if (kvp.ContainsKey("serverHttpPort"))
299 { 307 {
300 UInt32 port = 0; 308 UInt32 port = 0;