diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index d8f786b..3d58839 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -488,7 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
488 | /// Constructor | 488 | /// Constructor |
489 | /// </summary> | 489 | /// </summary> |
490 | public LLClientView( | 490 | public LLClientView( |
491 | EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer, | 491 | EndPoint remoteEP, IScene scene, LLPacketServer packServer, |
492 | AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, | 492 | AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, |
493 | ClientStackUserSettings userSettings) | 493 | ClientStackUserSettings userSettings) |
494 | { | 494 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index b154144..56219d1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |||
@@ -87,13 +87,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
87 | /// <param name="proxyEP"></param> | 87 | /// <param name="proxyEP"></param> |
88 | /// <returns></returns> | 88 | /// <returns></returns> |
89 | protected virtual IClientAPI CreateNewCircuit( | 89 | protected virtual IClientAPI CreateNewCircuit( |
90 | EndPoint remoteEP, IScene scene, IAssetCache assetCache, | 90 | EndPoint remoteEP, IScene scene, |
91 | LLPacketServer packServer, AuthenticateResponse sessionInfo, | 91 | LLPacketServer packServer, AuthenticateResponse sessionInfo, |
92 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) | 92 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) |
93 | { | 93 | { |
94 | return | 94 | return |
95 | new LLClientView( | 95 | new LLClientView( |
96 | remoteEP, scene, assetCache, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP, | 96 | remoteEP, scene, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP, |
97 | m_userSettings); | 97 | m_userSettings); |
98 | } | 98 | } |
99 | 99 | ||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
131 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed | 131 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed |
132 | /// </returns> | 132 | /// </returns> |
133 | public virtual bool AddNewClient( | 133 | public virtual bool AddNewClient( |
134 | EndPoint epSender, UseCircuitCodePacket useCircuit, IAssetCache assetCache, | 134 | EndPoint epSender, UseCircuitCodePacket useCircuit, |
135 | AuthenticateResponse sessionInfo, EndPoint proxyEP) | 135 | AuthenticateResponse sessionInfo, EndPoint proxyEP) |
136 | { | 136 | { |
137 | IClientAPI newuser; | 137 | IClientAPI newuser; |
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
150 | 150 | ||
151 | newuser | 151 | newuser |
152 | = CreateNewCircuit( | 152 | = CreateNewCircuit( |
153 | epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP); | 153 | epSender, m_scene, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP); |
154 | 154 | ||
155 | m_scene.ClientManager.Add(circuitCode, newuser); | 155 | m_scene.ClientManager.Add(circuitCode, newuser); |
156 | 156 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 54434f1..5184e35 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
75 | protected bool Allow_Alternate_Port; | 75 | protected bool Allow_Alternate_Port; |
76 | protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); | 76 | protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); |
77 | protected IScene m_localScene; | 77 | protected IScene m_localScene; |
78 | protected IAssetCache m_assetCache; | ||
79 | protected int m_clientSocketReceiveBuffer = 0; | 78 | protected int m_clientSocketReceiveBuffer = 0; |
80 | 79 | ||
81 | /// <value> | 80 | /// <value> |
@@ -131,7 +130,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
131 | 130 | ||
132 | public LLUDPServer( | 131 | public LLUDPServer( |
133 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, | 132 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, |
134 | IAssetCache assetCache, AgentCircuitManager authenticateClass) | 133 | AgentCircuitManager authenticateClass) |
135 | { | 134 | { |
136 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass); | 135 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass); |
137 | } | 136 | } |
@@ -451,7 +450,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
451 | proxyCircuits[useCircuit.CircuitCode.Code] = epProxy; | 450 | proxyCircuits[useCircuit.CircuitCode.Code] = epProxy; |
452 | } | 451 | } |
453 | 452 | ||
454 | m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); | 453 | m_packetServer.AddNewClient(epSender, useCircuit, sessionInfo, epProxy); |
455 | 454 | ||
456 | //m_log.DebugFormat( | 455 | //m_log.DebugFormat( |
457 | // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", | 456 | // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", |
@@ -629,7 +628,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
629 | } | 628 | } |
630 | } | 629 | } |
631 | 630 | ||
632 | m_packetServer.AddNewClient(userEP, useCircuit, m_assetCache, sessionInfo, proxyEP); | 631 | m_packetServer.AddNewClient(userEP, useCircuit, sessionInfo, proxyEP); |
633 | } | 632 | } |
634 | } | 633 | } |
635 | } | 634 | } |