diff options
author | Charles Krinke | 2008-12-13 16:25:20 +0000 |
---|---|---|
committer | Charles Krinke | 2008-12-13 16:25:20 +0000 |
commit | 6cf0b818642518aadd8aa288127de03f6fd1a079 (patch) | |
tree | 7a08024aaab37537b52b73c7854a3ab3a4696848 /OpenSim/Grid/GridServer | |
parent | more work on moving FileTransfer code to the clientstack. (diff) | |
download | opensim-SC-6cf0b818642518aadd8aa288127de03f6fd1a079.zip opensim-SC-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.gz opensim-SC-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.bz2 opensim-SC-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.xz |
Mantis#2811. Thank you kindly, Diva for a patch that resolves
some of our DNS/dotted decimal issues that plague teleporting.
We are increasing the MajorInterfaceVersion from 1 to 2 in the
gridserver, so sims will need to be updated on various grids.
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 08d5393..1ec4fd8 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -563,8 +563,7 @@ namespace OpenSim.Grid.GridServer | |||
563 | foreach (RegionProfileData aSim in neighbours) | 563 | foreach (RegionProfileData aSim in neighbours) |
564 | { | 564 | { |
565 | NeighbourBlock = new Hashtable(); | 565 | NeighbourBlock = new Hashtable(); |
566 | NeighbourBlock["sim_host"] = aSim.serverIP; | 566 | NeighbourBlock["sim_ip"] = aSim.serverIP; |
567 | NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.serverIP.ToString()).ToString(); | ||
568 | NeighbourBlock["sim_port"] = aSim.serverPort.ToString(); | 567 | NeighbourBlock["sim_port"] = aSim.serverPort.ToString(); |
569 | NeighbourBlock["region_locx"] = aSim.regionLocX.ToString(); | 568 | NeighbourBlock["region_locx"] = aSim.regionLocX.ToString(); |
570 | NeighbourBlock["region_locy"] = aSim.regionLocY.ToString(); | 569 | NeighbourBlock["region_locy"] = aSim.regionLocY.ToString(); |
@@ -594,8 +593,7 @@ namespace OpenSim.Grid.GridServer | |||
594 | (uint)(sim.regionLocY + y) * Constants.RegionSize)); | 593 | (uint)(sim.regionLocY + y) * Constants.RegionSize)); |
595 | 594 | ||
596 | NeighbourBlock = new Hashtable(); | 595 | NeighbourBlock = new Hashtable(); |
597 | NeighbourBlock["sim_host"] = neighbour.serverIP; | 596 | NeighbourBlock["sim_ip"] = neighbour.serverIP; |
598 | NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString(); | ||
599 | NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); | 597 | NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); |
600 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); | 598 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); |
601 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); | 599 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); |
@@ -813,8 +811,7 @@ namespace OpenSim.Grid.GridServer | |||
813 | { | 811 | { |
814 | m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " + | 812 | m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " + |
815 | (string)requestData["region_handle"]); | 813 | (string)requestData["region_handle"]); |
816 | responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); | 814 | responseData["sim_ip"] = simData.serverIP; |
817 | responseData["sim_host"] = simData.serverIP; | ||
818 | responseData["sim_port"] = simData.serverPort.ToString(); | 815 | responseData["sim_port"] = simData.serverPort.ToString(); |
819 | responseData["server_uri"] = simData.serverURI; | 816 | responseData["server_uri"] = simData.serverURI; |
820 | responseData["http_port"] = simData.httpPort.ToString(); | 817 | responseData["http_port"] = simData.httpPort.ToString(); |
@@ -881,7 +878,7 @@ namespace OpenSim.Grid.GridServer | |||
881 | 878 | ||
882 | // For Sugilite compatibility | 879 | // For Sugilite compatibility |
883 | simProfileBlock["regionhandle"] = aSim.regionHandle.ToString(); | 880 | simProfileBlock["regionhandle"] = aSim.regionHandle.ToString(); |
884 | simProfileBlock["sim_ip"] = aSim.serverIP.ToString(); | 881 | simProfileBlock["sim_ip"] = aSim.serverIP; |
885 | simProfileBlock["sim_port"] = aSim.serverPort.ToString(); | 882 | simProfileBlock["sim_port"] = aSim.serverPort.ToString(); |
886 | simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); | 883 | simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); |
887 | simProfileBlock["uuid"] = aSim.UUID.ToString(); | 884 | simProfileBlock["uuid"] = aSim.UUID.ToString(); |
@@ -1044,7 +1041,7 @@ namespace OpenSim.Grid.GridServer | |||
1044 | respstring += "<sim>"; | 1041 | respstring += "<sim>"; |
1045 | respstring += "<uuid>" + TheSim.ToString() + "</uuid>"; | 1042 | respstring += "<uuid>" + TheSim.ToString() + "</uuid>"; |
1046 | respstring += "<regionname>" + TheSim.regionName + "</regionname>"; | 1043 | respstring += "<regionname>" + TheSim.regionName + "</regionname>"; |
1047 | respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>"; | 1044 | respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>"; |
1048 | respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; | 1045 | respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; |
1049 | respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; | 1046 | respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; |
1050 | respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; | 1047 | respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; |