aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8d4e905..b843774 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Framework
67 m_internalEndPoint = ConvertFrom.InternalEndPoint; 67 m_internalEndPoint = ConvertFrom.InternalEndPoint;
68 m_externalHostName = ConvertFrom.ExternalHostName; 68 m_externalHostName = ConvertFrom.ExternalHostName;
69 m_remotingPort = ConvertFrom.RemotingPort; 69 m_remotingPort = ConvertFrom.RemotingPort;
70 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
70 RemotingAddress = ConvertFrom.RemotingAddress; 71 RemotingAddress = ConvertFrom.RemotingAddress;
71 RegionID = LLUUID.Zero; 72 RegionID = LLUUID.Zero;
72 } 73 }
@@ -80,6 +81,7 @@ namespace OpenSim.Framework
80 get { return m_remotingPort; } 81 get { return m_remotingPort; }
81 set { m_remotingPort = value; } 82 set { m_remotingPort = value; }
82 } 83 }
84 public bool m_allow_alternate_ports;
83 85
84 public string RemotingAddress; 86 public string RemotingAddress;
85 87
@@ -125,6 +127,8 @@ namespace OpenSim.Framework
125 set { m_externalHostName = value; } 127 set { m_externalHostName = value; }
126 } 128 }
127 129
130 protected bool Allow_Alternate_Ports;
131
128 protected IPEndPoint m_internalEndPoint; 132 protected IPEndPoint m_internalEndPoint;
129 133
130 public IPEndPoint InternalEndPoint 134 public IPEndPoint InternalEndPoint
@@ -163,6 +167,8 @@ namespace OpenSim.Framework
163 public bool isSandbox = false; 167 public bool isSandbox = false;
164 public bool commFailTF = false; 168 public bool commFailTF = false;
165 169
170 public bool m_allow_alternate_ports;
171
166 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 172 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
167 public LLUUID CovenantID = LLUUID.Zero; 173 public LLUUID CovenantID = LLUUID.Zero;
168 public string MasterAvatarFirstName = String.Empty; 174 public string MasterAvatarFirstName = String.Empty;
@@ -217,6 +223,7 @@ namespace OpenSim.Framework
217 m_internalEndPoint = ConvertFrom.InternalEndPoint; 223 m_internalEndPoint = ConvertFrom.InternalEndPoint;
218 m_externalHostName = ConvertFrom.ExternalHostName; 224 m_externalHostName = ConvertFrom.ExternalHostName;
219 m_remotingPort = ConvertFrom.RemotingPort; 225 m_remotingPort = ConvertFrom.RemotingPort;
226 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
220 RemotingAddress = ConvertFrom.RemotingAddress; 227 RemotingAddress = ConvertFrom.RemotingAddress;
221 RegionID = LLUUID.Zero; 228 RegionID = LLUUID.Zero;
222 } 229 }
@@ -228,6 +235,7 @@ namespace OpenSim.Framework
228 m_internalEndPoint = ConvertFrom.InternalEndPoint; 235 m_internalEndPoint = ConvertFrom.InternalEndPoint;
229 m_externalHostName = ConvertFrom.ExternalHostName; 236 m_externalHostName = ConvertFrom.ExternalHostName;
230 m_remotingPort = ConvertFrom.RemotingPort; 237 m_remotingPort = ConvertFrom.RemotingPort;
238 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
231 RemotingAddress = ConvertFrom.RemotingAddress; 239 RemotingAddress = ConvertFrom.RemotingAddress;
232 RegionID = LLUUID.Zero; 240 RegionID = LLUUID.Zero;
233 } 241 }
@@ -300,6 +308,9 @@ namespace OpenSim.Framework
300 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 308 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
301 "Internal IP Port for incoming UDP client connections", 309 "Internal IP Port for incoming UDP client connections",
302 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 310 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
311 configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
312 "Allow sim to find alternate UDP ports when ports are in use?",
313 "false", false);
303 configMember.addConfigurationOption("external_host_name", 314 configMember.addConfigurationOption("external_host_name",
304 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 315 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
305 "External Host Name", "127.0.0.1", false); 316 "External Host Name", "127.0.0.1", false);
@@ -357,7 +368,10 @@ namespace OpenSim.Framework
357 m_internalEndPoint = new IPEndPoint(address, 0); 368 m_internalEndPoint = new IPEndPoint(address, 0);
358 break; 369 break;
359 case "internal_ip_port": 370 case "internal_ip_port":
360 m_internalEndPoint.Port = (int) configuration_result; 371 m_internalEndPoint.Port = (int)configuration_result;
372 break;
373 case "allow_alternate_ports":
374 m_allow_alternate_ports = (bool)configuration_result;
361 break; 375 break;
362 case "external_host_name": 376 case "external_host_name":
363 if ((string) configuration_result != "SYSTEMIP") 377 if ((string) configuration_result != "SYSTEMIP")