diff options
Refactoring of CreateCommsManagerPlugin.
Plus some general cleanup of a few other files (deleting excess blank lines etc)
Diffstat (limited to 'OpenSim/Client/Linden')
-rw-r--r-- | OpenSim/Client/Linden/LLClientStackModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs index 57331e5..6b23224 100644 --- a/OpenSim/Client/Linden/LLClientStackModule.cs +++ b/OpenSim/Client/Linden/LLClientStackModule.cs | |||
@@ -1,5 +1,6 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Net; | ||
3 | using System.Reflection; | 4 | using System.Reflection; |
4 | using System.Text; | 5 | using System.Text; |
5 | using log4net; | 6 | using log4net; |
@@ -47,11 +48,13 @@ namespace OpenSim.Client.Linden | |||
47 | if ((m_scene != null) && (m_createClientStack)) | 48 | if ((m_scene != null) && (m_createClientStack)) |
48 | { | 49 | { |
49 | m_log.Info("[LLClientStackModule] Starting up LLClientStack."); | 50 | m_log.Info("[LLClientStackModule] Starting up LLClientStack."); |
50 | uint port = (uint)m_scene.RegionInfo.InternalEndPoint.Port; | 51 | IPEndPoint endPoint = m_scene.RegionInfo.InternalEndPoint; |
52 | |||
53 | uint port = (uint)endPoint.Port; | ||
51 | m_clientStackManager = new ClientStackManager(m_clientStackDll); | 54 | m_clientStackManager = new ClientStackManager(m_clientStackDll); |
52 | 55 | ||
53 | m_clientServer | 56 | m_clientServer |
54 | = m_clientStackManager.CreateServer(m_scene.RegionInfo.InternalEndPoint.Address, | 57 | = m_clientStackManager.CreateServer(endPoint.Address, |
55 | ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source, | 58 | ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source, |
56 | m_scene.CommsManager.AssetCache, m_scene.AuthenticateHandler); | 59 | m_scene.CommsManager.AssetCache, m_scene.AuthenticateHandler); |
57 | 60 | ||