aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs16
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index c20c7bc..8643382 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -130,9 +130,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
130 { 130 {
131 } 131 }
132 132
133 public LLUDPServer(IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, AssetCache assetCache, AgentCircuitManager authenticateClass) 133 public LLUDPServer(
134 IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings userSettings,
135 AssetCache assetCache, AgentCircuitManager authenticateClass)
134 { 136 {
135 Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, assetCache, authenticateClass); 137 Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, userSettings, assetCache, authenticateClass);
136 } 138 }
137 139
138 /// <summary> 140 /// <summary>
@@ -142,10 +144,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
142 /// <param name="port"></param> 144 /// <param name="port"></param>
143 /// <param name="proxyPortOffsetParm"></param> 145 /// <param name="proxyPortOffsetParm"></param>
144 /// <param name="allow_alternate_port"></param> 146 /// <param name="allow_alternate_port"></param>
147 /// <param name="settings"></param>
145 /// <param name="assetCache"></param> 148 /// <param name="assetCache"></param>
146 /// <param name="circuitManager"></param> 149 /// <param name="circuitManager"></param>
147 public void Initialise( 150 public void Initialise(
148 IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, AssetCache assetCache, AgentCircuitManager circuitManager) 151 IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, ClientStackUserSettings userSettings,
152 AssetCache assetCache, AgentCircuitManager circuitManager)
149 { 153 {
150 proxyPortOffset = proxyPortOffsetParm; 154 proxyPortOffset = proxyPortOffsetParm;
151 listenPort = (uint) (port + proxyPortOffsetParm); 155 listenPort = (uint) (port + proxyPortOffsetParm);
@@ -153,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
153 Allow_Alternate_Port = allow_alternate_port; 157 Allow_Alternate_Port = allow_alternate_port;
154 m_assetCache = assetCache; 158 m_assetCache = assetCache;
155 m_circuitManager = circuitManager; 159 m_circuitManager = circuitManager;
156 CreatePacketServer(); 160 CreatePacketServer(userSettings);
157 161
158 // Return new port 162 // Return new port
159 // This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered. 163 // This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered.
@@ -161,9 +165,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
161 port = (uint)(listenPort - proxyPortOffsetParm); 165 port = (uint)(listenPort - proxyPortOffsetParm);
162 } 166 }
163 167
164 protected virtual void CreatePacketServer() 168 protected virtual void CreatePacketServer(ClientStackUserSettings userSettings)
165 { 169 {
166 new LLPacketServer(this); 170 new LLPacketServer(this, userSettings);
167 } 171 }
168 172
169 /// <summary> 173 /// <summary>