diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index be0b3e0..751ca9d 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Framework | |||
167 | public bool isSandbox = false; | 167 | public bool isSandbox = false; |
168 | public bool commFailTF = false; | 168 | public bool commFailTF = false; |
169 | 169 | ||
170 | public bool m_allow_alternate_ports; | 170 | // public bool m_allow_alternate_ports; |
171 | 171 | ||
172 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; | 172 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; |
173 | public LLUUID CovenantID = LLUUID.Zero; | 173 | public LLUUID CovenantID = LLUUID.Zero; |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index f8b0c9e..4dce9e7 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -109,9 +109,9 @@ namespace OpenSim.Region.ClientStack | |||
109 | protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) | 109 | protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) |
110 | { | 110 | { |
111 | AgentCircuitManager circuitManager = new AgentCircuitManager(); | 111 | AgentCircuitManager circuitManager = new AgentCircuitManager(); |
112 | IPAddress listenIP; | 112 | IPAddress listenIP = regionInfo.InternalEndPoint.Address; |
113 | if (!IPAddress.TryParse(regionInfo.ExternalHostName, out listenIP)) | 113 | //if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP)) |
114 | listenIP = IPAddress.Parse("0.0.0.0"); | 114 | // listenIP = IPAddress.Parse("0.0.0.0"); |
115 | 115 | ||
116 | uint port = (uint) regionInfo.InternalEndPoint.Port; | 116 | uint port = (uint) regionInfo.InternalEndPoint.Port; |
117 | udpServer = new UDPServer(listenIP, ref port, regionInfo.m_allow_alternate_ports, m_assetCache, m_log, circuitManager); | 117 | udpServer = new UDPServer(listenIP, ref port, regionInfo.m_allow_alternate_ports, m_assetCache, m_log, circuitManager); |
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 0fd3486..3e2b536 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack | |||
260 | for (uint i = 0; i < 20; i++) | 260 | for (uint i = 0; i < 20; i++) |
261 | { | 261 | { |
262 | newPort = listenPort + i; | 262 | newPort = listenPort + i; |
263 | m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ". Allow alternate ports: " + Allow_Alternate_Port.ToString()); | 263 | m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString()); |
264 | try | 264 | try |
265 | { | 265 | { |
266 | ServerIncoming = new IPEndPoint(listenIP, (int) newPort); | 266 | ServerIncoming = new IPEndPoint(listenIP, (int) newPort); |
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ClientStack | |||
272 | catch (Exception ex) | 272 | catch (Exception ex) |
273 | { | 273 | { |
274 | // We are not looking for alternate ports? | 274 | // We are not looking for alternate ports? |
275 | if (!Allow_Alternate_Port) | 275 | //if (!Allow_Alternate_Port) |
276 | throw (ex); | 276 | throw (ex); |
277 | 277 | ||
278 | // We are looking for alternate ports! | 278 | // We are looking for alternate ports! |