diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/IGridServices.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs index daa43ac..9e34672 100644 --- a/OpenSim/Framework/Communications/IGridServices.cs +++ b/OpenSim/Framework/Communications/IGridServices.cs | |||
@@ -41,7 +41,15 @@ namespace OpenSim.Framework.Communications | |||
41 | RegionCommsListener RegisterRegion(RegionInfo regionInfos); | 41 | RegionCommsListener RegisterRegion(RegionInfo regionInfos); |
42 | 42 | ||
43 | bool DeregisterRegion(RegionInfo regionInfo); | 43 | bool DeregisterRegion(RegionInfo regionInfo); |
44 | |||
45 | /// <summary> | ||
46 | /// Get information about the regions neighbouring the given co-ordinates. | ||
47 | /// </summary> | ||
48 | /// <param name="x"></param> | ||
49 | /// <param name="y"></param> | ||
50 | /// <returns></returns> | ||
44 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); | 51 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); |
52 | |||
45 | RegionInfo RequestNeighbourInfo(ulong regionHandle); | 53 | RegionInfo RequestNeighbourInfo(ulong regionHandle); |
46 | RegionInfo RequestClosestRegion(string regionName); | 54 | RegionInfo RequestClosestRegion(string regionName); |
47 | Dictionary<string, string> GetGridSettings(); | 55 | Dictionary<string, string> GetGridSettings(); |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 76ae1ba..b5d6869 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -38,6 +38,9 @@ namespace OpenSim.Framework | |||
38 | [Serializable] | 38 | [Serializable] |
39 | public class SimpleRegionInfo | 39 | public class SimpleRegionInfo |
40 | { | 40 | { |
41 | // private static readonly log4net.ILog m_log | ||
42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
41 | public SimpleRegionInfo() | 44 | public SimpleRegionInfo() |
42 | { | 45 | { |
43 | } | 46 | } |
@@ -100,6 +103,11 @@ namespace OpenSim.Framework | |||
100 | 103 | ||
101 | public string RemotingAddress; | 104 | public string RemotingAddress; |
102 | 105 | ||
106 | /// <value> | ||
107 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | ||
108 | /// | ||
109 | /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method? | ||
110 | /// </value> | ||
103 | public IPEndPoint ExternalEndPoint | 111 | public IPEndPoint ExternalEndPoint |
104 | { | 112 | { |
105 | get | 113 | get |
@@ -114,8 +122,7 @@ namespace OpenSim.Framework | |||
114 | 122 | ||
115 | // Reset for next check | 123 | // Reset for next check |
116 | ia = null; | 124 | ia = null; |
117 | 125 | ||
118 | // New method favors IPv4 | ||
119 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) | 126 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) |
120 | { | 127 | { |
121 | if (ia == null) | 128 | if (ia == null) |