diff options
author | Tedd Hansen | 2008-02-02 06:34:07 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-02 06:34:07 +0000 |
commit | b089ccfa3d351b4dba43bcbc284d87d7c4963dae (patch) | |
tree | 19c7e9baea656b1c112754ce777cde391101369b /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | Last patch was a disaster... reset terrain whenever bug occurred. Trying agai... (diff) | |
download | opensim-SC-b089ccfa3d351b4dba43bcbc284d87d7c4963dae.zip opensim-SC-b089ccfa3d351b4dba43bcbc284d87d7c4963dae.tar.gz opensim-SC-b089ccfa3d351b4dba43bcbc284d87d7c4963dae.tar.bz2 opensim-SC-b089ccfa3d351b4dba43bcbc284d87d7c4963dae.tar.xz |
Hopefully fixed MySQL DB crash on startup issue (so we can remove 3 sec wait).
Added option to try alternate UDP ports if the one configured is in use.
UDP packets are now bound to the actual outside IP address and hopefully won't "randomly" select IP on multihomed systems.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index e74873d..f8b0c9e 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -109,10 +109,16 @@ 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 | udpServer = new UDPServer((uint) regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager); | 112 | IPAddress listenIP; |
113 | if (!IPAddress.TryParse(regionInfo.ExternalHostName, out listenIP)) | ||
114 | listenIP = IPAddress.Parse("0.0.0.0"); | ||
113 | 115 | ||
114 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); | 116 | uint port = (uint) regionInfo.InternalEndPoint.Port; |
117 | udpServer = new UDPServer(listenIP, ref port, regionInfo.m_allow_alternate_ports, m_assetCache, m_log, circuitManager); | ||
118 | regionInfo.InternalEndPoint.Port = (int)port; | ||
115 | 119 | ||
120 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); | ||
121 | |||
116 | udpServer.LocalScene = scene; | 122 | udpServer.LocalScene = scene; |
117 | 123 | ||
118 | scene.LoadWorldMap(); | 124 | scene.LoadWorldMap(); |