aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMW2009-03-03 12:51:54 +0000
committerMW2009-03-03 12:51:54 +0000
commit76133d07630d8a1547c034b28585a931f751ad1b (patch)
tree672bd4752f83c566942ce92b36a307bf187cfbea /OpenSim/Client
parentRenamed OpenSimBase m_autoCreateLindenStack to m_autoCreateClientStack (diff)
downloadopensim-SC-76133d07630d8a1547c034b28585a931f751ad1b.zip
opensim-SC-76133d07630d8a1547c034b28585a931f751ad1b.tar.gz
opensim-SC-76133d07630d8a1547c034b28585a931f751ad1b.tar.bz2
opensim-SC-76133d07630d8a1547c034b28585a931f751ad1b.tar.xz
Refactoring of CreateCommsManagerPlugin.
Plus some general cleanup of a few other files (deleting excess blank lines etc)
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/Linden/LLClientStackModule.cs7
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 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Net;
3using System.Reflection; 4using System.Reflection;
4using System.Text; 5using System.Text;
5using log4net; 6using 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