diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index ba4e18b..cbe6eff 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -33,6 +33,7 @@ using System.Net.Sockets; | |||
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenMetaverse.Packets; | 34 | using OpenMetaverse.Packets; |
35 | using log4net; | 35 | using log4net; |
36 | using Nini.Config; | ||
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Environment.Scenes; |
@@ -127,10 +128,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
127 | } | 128 | } |
128 | 129 | ||
129 | public LLUDPServer( | 130 | public LLUDPServer( |
130 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings userSettings, | 131 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, |
131 | AssetCache assetCache, AgentCircuitManager authenticateClass) | 132 | AssetCache assetCache, AgentCircuitManager authenticateClass) |
132 | { | 133 | { |
133 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, userSettings, assetCache, authenticateClass); | 134 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, assetCache, authenticateClass); |
134 | } | 135 | } |
135 | 136 | ||
136 | /// <summary> | 137 | /// <summary> |
@@ -140,13 +141,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
140 | /// <param name="port"></param> | 141 | /// <param name="port"></param> |
141 | /// <param name="proxyPortOffsetParm"></param> | 142 | /// <param name="proxyPortOffsetParm"></param> |
142 | /// <param name="allow_alternate_port"></param> | 143 | /// <param name="allow_alternate_port"></param> |
143 | /// <param name="userSettings"></param> | 144 | /// <param name="configSource"></param> |
144 | /// <param name="assetCache"></param> | 145 | /// <param name="assetCache"></param> |
145 | /// <param name="circuitManager"></param> | 146 | /// <param name="circuitManager"></param> |
146 | public void Initialise( | 147 | public void Initialise( |
147 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, ClientStackUserSettings userSettings, | 148 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, |
148 | AssetCache assetCache, AgentCircuitManager circuitManager) | 149 | AssetCache assetCache, AgentCircuitManager circuitManager) |
149 | { | 150 | { |
151 | // XXX Temporary until we start unpacking the config source | ||
152 | // TODO: Don't forget to account for the null possibility | ||
153 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); | ||
154 | |||
150 | proxyPortOffset = proxyPortOffsetParm; | 155 | proxyPortOffset = proxyPortOffsetParm; |
151 | listenPort = (uint) (port + proxyPortOffsetParm); | 156 | listenPort = (uint) (port + proxyPortOffsetParm); |
152 | listenIP = _listenIP; | 157 | listenIP = _listenIP; |