diff options
author | Adam Frisby | 2007-07-19 00:23:06 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-19 00:23:06 +0000 |
commit | 08b04810a89246bf96d82c6c0f5e0dd396a976f9 (patch) | |
tree | da37f81ba80721799972eaddc0ceb736b2b92a85 /OpenSim/Grid | |
parent | *Removed files that were no longer important and prevented compile (diff) | |
download | opensim-SC-08b04810a89246bf96d82c6c0f5e0dd396a976f9.zip opensim-SC-08b04810a89246bf96d82c6c0f5e0dd396a976f9.tar.gz opensim-SC-08b04810a89246bf96d82c6c0f5e0dd396a976f9.tar.bz2 opensim-SC-08b04810a89246bf96d82c6c0f5e0dd396a976f9.tar.xz |
* Removing more compiler warnings.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 2e7f9f7..3ee7aef 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -332,7 +332,7 @@ namespace OpenSim.Grid.GridServer | |||
332 | foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) | 332 | foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) |
333 | { | 333 | { |
334 | NeighbourBlock = new Hashtable(); | 334 | NeighbourBlock = new Hashtable(); |
335 | NeighbourBlock["sim_ip"] = Dns.GetHostByName(aSim.Value.serverIP.ToString()).AddressList[0].ToString(); | 335 | NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.Value.serverIP.ToString()).ToString(); |
336 | NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString(); | 336 | NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString(); |
337 | NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); | 337 | NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); |
338 | NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); | 338 | NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); |
@@ -351,7 +351,7 @@ namespace OpenSim.Grid.GridServer | |||
351 | neighbour = getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)); | 351 | neighbour = getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)); |
352 | 352 | ||
353 | NeighbourBlock = new Hashtable(); | 353 | NeighbourBlock = new Hashtable(); |
354 | NeighbourBlock["sim_ip"] = Dns.GetHostByName(neighbour.serverIP).AddressList[0].ToString(); | 354 | NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString(); |
355 | NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); | 355 | NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); |
356 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); | 356 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); |
357 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); | 357 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); |
@@ -410,7 +410,7 @@ namespace OpenSim.Grid.GridServer | |||
410 | else | 410 | else |
411 | { | 411 | { |
412 | Console.WriteLine("found region"); | 412 | Console.WriteLine("found region"); |
413 | responseData["sim_ip"] = Dns.GetHostByName(simData.serverIP).AddressList[0].ToString(); | 413 | responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); |
414 | responseData["sim_port"] = simData.serverPort.ToString(); | 414 | responseData["sim_port"] = simData.serverPort.ToString(); |
415 | responseData["http_port"] = simData.httpPort.ToString(); | 415 | responseData["http_port"] = simData.httpPort.ToString(); |
416 | responseData["remoting_port"] = simData.remotingPort.ToString(); | 416 | responseData["remoting_port"] = simData.remotingPort.ToString(); |
@@ -570,7 +570,7 @@ namespace OpenSim.Grid.GridServer | |||
570 | respstring += "<sim>"; | 570 | respstring += "<sim>"; |
571 | respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; | 571 | respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; |
572 | respstring += "<regionname>" + TheSim.regionName + "</regionname>"; | 572 | respstring += "<regionname>" + TheSim.regionName + "</regionname>"; |
573 | respstring += "<sim_ip>" + Dns.GetHostByName(TheSim.serverIP).AddressList[0].ToString() + "</sim_ip>"; | 573 | respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>"; |
574 | respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; | 574 | respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; |
575 | respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; | 575 | respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; |
576 | respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; | 576 | respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; |