aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorJeff Ames2007-12-07 02:00:35 +0000
committerJeff Ames2007-12-07 02:00:35 +0000
commita45118d35e35c3f46ad165f978efd8d87e0da2b1 (patch)
tree931387e9596b4d390ed926a68d9fe087066d4717 /OpenSim/Framework/RegionInfo.cs
parentadded a lock to prevent multiple Timer popping races (diff)
downloadopensim-SC_OLD-a45118d35e35c3f46ad165f978efd8d87e0da2b1.zip
opensim-SC_OLD-a45118d35e35c3f46ad165f978efd8d87e0da2b1.tar.gz
opensim-SC_OLD-a45118d35e35c3f46ad165f978efd8d87e0da2b1.tar.bz2
opensim-SC_OLD-a45118d35e35c3f46ad165f978efd8d87e0da2b1.tar.xz
added one more command to the console help.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d94a890..5dc11ad 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Framework
48 48
49 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 49 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
50 { 50 {
51
52 m_regionLocX = regionLocX; 51 m_regionLocX = regionLocX;
53 m_regionLocY = regionLocY; 52 m_regionLocY = regionLocY;
54 53
@@ -83,7 +82,6 @@ namespace OpenSim.Framework
83 82
84 public string RemotingAddress; 83 public string RemotingAddress;
85 84
86
87 public IPEndPoint ExternalEndPoint 85 public IPEndPoint ExternalEndPoint
88 { 86 {
89 get 87 get
@@ -99,7 +97,6 @@ namespace OpenSim.Framework
99 // Reset for next check 97 // Reset for next check
100 ia = null; 98 ia = null;
101 99
102
103 // New method favors IPv4 100 // New method favors IPv4
104 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) 101 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
105 { 102 {
@@ -111,7 +108,6 @@ namespace OpenSim.Framework
111 ia = Adr; 108 ia = Adr;
112 break; 109 break;
113 } 110 }
114
115 } 111 }
116 112
117 return new IPEndPoint(ia, m_internalEndPoint.Port); 113 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -209,10 +205,10 @@ namespace OpenSim.Framework
209 205
210 return m_estateSettings; 206 return m_estateSettings;
211 } 207 }
212
213 } 208 }
214 209
215 public ConfigurationMember configMember; 210 public ConfigurationMember configMember;
211
216 public RegionInfo(string description, string filename) 212 public RegionInfo(string description, string filename)
217 { 213 {
218 configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 214 configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
@@ -226,13 +222,10 @@ namespace OpenSim.Framework
226 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) : 222 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) :
227 base(regionLocX, regionLocY, internalEndPoint, externalUri) 223 base(regionLocX, regionLocY, internalEndPoint, externalUri)
228 { 224 {
229
230
231 } 225 }
232 226
233 public RegionInfo() 227 public RegionInfo()
234 { 228 {
235
236 } 229 }
237 public RegionInfo(SearializableRegionInfo ConvertFrom) 230 public RegionInfo(SearializableRegionInfo ConvertFrom)
238 { 231 {