diff options
author | Melanie Thielker | 2008-07-23 01:16:01 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-23 01:16:01 +0000 |
commit | e1c65631743c0e0fcdd0c779110044819fd85b2a (patch) | |
tree | db141471bd706c322bac7a441835ae01cdad1f02 | |
parent | Make QueuePacket() lock free. Eliminates an unneeded lock() (diff) | |
download | opensim-SC-e1c65631743c0e0fcdd0c779110044819fd85b2a.zip opensim-SC-e1c65631743c0e0fcdd0c779110044819fd85b2a.tar.gz opensim-SC-e1c65631743c0e0fcdd0c779110044819fd85b2a.tar.bz2 opensim-SC-e1c65631743c0e0fcdd0c779110044819fd85b2a.tar.xz |
Guard against wrong packet types being passed into AddNewClient.
Actually, the exception handler seems to be a valid execution
path here, this needs some love.
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 570ebe9..321c2ff 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -380,6 +380,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
380 | //Slave regions don't accept new clients | 380 | //Slave regions don't accept new clients |
381 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) | 381 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) |
382 | { | 382 | { |
383 | if (!(packet is UseCircuitCodePacket)) | ||
384 | return; | ||
383 | UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; | 385 | UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; |
384 | lock (clientCircuits) | 386 | lock (clientCircuits) |
385 | { | 387 | { |