diff options
author | Justin Clarke Casey | 2008-10-23 19:25:40 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-23 19:25:40 +0000 |
commit | 6101202403f9f9af8e7cb6b7ea58781e7762c5da (patch) | |
tree | dc2a12c9c59df61d35296e2e17461480fc2d411e /OpenSim/Region/ClientStack/LindenUDP | |
parent | * Add missing file from last commit. Yay for continuous integration! (diff) | |
download | opensim-SC_OLD-6101202403f9f9af8e7cb6b7ea58781e7762c5da.zip opensim-SC_OLD-6101202403f9f9af8e7cb6b7ea58781e7762c5da.tar.gz opensim-SC_OLD-6101202403f9f9af8e7cb6b7ea58781e7762c5da.tar.bz2 opensim-SC_OLD-6101202403f9f9af8e7cb6b7ea58781e7762c5da.tar.xz |
* Revert to executing existing setup if an added circuit did not already exist
* Not sure why things still worked in the presence of this bug - possibly the problem is compensated for later on. If you are having udp session problems this bug fix may help
(though no guarantees).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 22086f8..bf41c25 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -391,7 +391,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
391 | //Slave regions don't accept new clients | 391 | //Slave regions don't accept new clients |
392 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) | 392 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) |
393 | { | 393 | { |
394 | bool foundExistingCircuit = false; | 394 | bool isNewCircuit = false; |
395 | 395 | ||
396 | lock (clientCircuits) | 396 | lock (clientCircuits) |
397 | { | 397 | { |
@@ -403,11 +403,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
403 | 403 | ||
404 | clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); | 404 | clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); |
405 | 405 | ||
406 | foundExistingCircuit = true; | 406 | isNewCircuit = true; |
407 | } | 407 | } |
408 | } | 408 | } |
409 | 409 | ||
410 | if (!foundExistingCircuit) | 410 | if (isNewCircuit) |
411 | { | 411 | { |
412 | // This doesn't need locking as it's synchronized data | 412 | // This doesn't need locking as it's synchronized data |
413 | clientCircuits_reverse[useCircuit.CircuitCode.Code] = epSender; | 413 | clientCircuits_reverse[useCircuit.CircuitCode.Code] = epSender; |