aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-08 19:25:24 +0000
committerJustin Clark-Casey (justincc)2011-12-08 19:25:24 +0000
commit0e265889dd909d23b45175ec0e6f2d52725c008c (patch)
tree3f9d117d0f7a6a2303d0c562137abf198d072f96 /OpenSim/Region/ClientStack/Linden/UDP
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC_OLD-0e265889dd909d23b45175ec0e6f2d52725c008c.zip
opensim-SC_OLD-0e265889dd909d23b45175ec0e6f2d52725c008c.tar.gz
opensim-SC_OLD-0e265889dd909d23b45175ec0e6f2d52725c008c.tar.bz2
opensim-SC_OLD-0e265889dd909d23b45175ec0e6f2d52725c008c.tar.xz
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 7db5f6b..4ab8fd0 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -897,12 +897,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
897 IClientAPI client = AddNewClient((UseCircuitCodePacket)packet, remoteEndPoint); 897 IClientAPI client = AddNewClient((UseCircuitCodePacket)packet, remoteEndPoint);
898 898
899 // Send ack straight away to let the viewer know that the connection is active. 899 // Send ack straight away to let the viewer know that the connection is active.
900 // The client will be null if it already exists (e.g. if on a region crossing the client sends a use
901 // circuit code to the existing child agent. This is not particularly obvious.
900 SendAckImmediate(remoteEndPoint, packet.Header.Sequence); 902 SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
901 903
902 // FIXME: Nasty - this is the only way we currently know if Scene.AddNewClient() failed to find a 904 // We only want to send initial data to new clients, not ones which are being converted from child to root.
903 // circuit and bombed out early. That check might be pointless since authorization is established 905 if (client != null)
904 // up here.
905 if (client != null && client.SceneAgent != null)
906 client.SceneAgent.SendInitialDataToMe(); 906 client.SceneAgent.SendInitialDataToMe();
907 907
908 // m_log.DebugFormat( 908 // m_log.DebugFormat(