aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-12-11 21:49:11 +0000
committerHomer Horwitz2008-12-11 21:49:11 +0000
commit7672bdb0a302dc7078447419ec38b3ea7e2a6d69 (patch)
tree41e0acb8f7e03c10e927de3ca6cf5aeb009b3d07
parent* refactor: Stop exposing InventoryFolderImpl.SubFolders publicly (diff)
downloadopensim-SC_OLD-7672bdb0a302dc7078447419ec38b3ea7e2a6d69.zip
opensim-SC_OLD-7672bdb0a302dc7078447419ec38b3ea7e2a6d69.tar.gz
opensim-SC_OLD-7672bdb0a302dc7078447419ec38b3ea7e2a6d69.tar.bz2
opensim-SC_OLD-7672bdb0a302dc7078447419ec38b3ea7e2a6d69.tar.xz
Add hostnames in addition to IP address to some more places. This continues r7676.
NOTE: Changes UGAIM.
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index be3a7cf..5454f03 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -561,6 +561,7 @@ namespace OpenSim.Grid.GridServer
561 foreach (RegionProfileData aSim in neighbours) 561 foreach (RegionProfileData aSim in neighbours)
562 { 562 {
563 NeighbourBlock = new Hashtable(); 563 NeighbourBlock = new Hashtable();
564 NeighbourBlock["sim_host"] = aSim.serverIP;
564 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.serverIP.ToString()).ToString(); 565 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.serverIP.ToString()).ToString();
565 NeighbourBlock["sim_port"] = aSim.serverPort.ToString(); 566 NeighbourBlock["sim_port"] = aSim.serverPort.ToString();
566 NeighbourBlock["region_locx"] = aSim.regionLocX.ToString(); 567 NeighbourBlock["region_locx"] = aSim.regionLocX.ToString();
@@ -591,6 +592,7 @@ namespace OpenSim.Grid.GridServer
591 (uint)(sim.regionLocY + y) * Constants.RegionSize)); 592 (uint)(sim.regionLocY + y) * Constants.RegionSize));
592 593
593 NeighbourBlock = new Hashtable(); 594 NeighbourBlock = new Hashtable();
595 NeighbourBlock["sim_host"] = neighbour.serverIP;
594 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString(); 596 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString();
595 NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); 597 NeighbourBlock["sim_port"] = neighbour.serverPort.ToString();
596 NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); 598 NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString();