diff options
author | Melanie | 2010-11-05 14:27:53 +0100 |
---|---|---|
committer | Melanie | 2010-11-05 14:27:53 +0100 |
commit | ddd3c6824ada0c2a6b87d7176f23b636caafa72f (patch) | |
tree | 54b9e507d0504950c5d743db8391e496ff141173 | |
parent | Revert "Fix for hanging on "Connecting to region".. caused by packets being p... (diff) | |
download | opensim-SC_OLD-ddd3c6824ada0c2a6b87d7176f23b636caafa72f.zip opensim-SC_OLD-ddd3c6824ada0c2a6b87d7176f23b636caafa72f.tar.gz opensim-SC_OLD-ddd3c6824ada0c2a6b87d7176f23b636caafa72f.tar.bz2 opensim-SC_OLD-ddd3c6824ada0c2a6b87d7176f23b636caafa72f.tar.xz |
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
This reverts commit 40e05f41098bdedac7296d84c9aa8d915c5c9ede.
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index b8c692f..626f7eb 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -918,30 +918,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
918 | client.DisableFacelights = m_disableFacelights; | 918 | client.DisableFacelights = m_disableFacelights; |
919 | 919 | ||
920 | // Start the IClientAPI | 920 | // Start the IClientAPI |
921 | // Spin it off so that it doesn't clog up the LLUDPServer | 921 | client.Start(); |
922 | |||
923 | //First, and very importantly: | ||
924 | // | ||
925 | //Set our DeliverPackets flag in the client to *false* | ||
926 | //this will prevent us from missing important messages | ||
927 | //before the modules are bound | ||
928 | client.DeliverPackets = false; | ||
929 | client.DisableFacelights = m_disableFacelights; | ||
930 | |||
931 | Util.FireAndForget( | ||
932 | delegate | ||
933 | { | ||
934 | try | ||
935 | { | ||
936 | client.Start(); | ||
937 | } | ||
938 | finally | ||
939 | { | ||
940 | //Now, release the hounds. er, packets. | ||
941 | client.DeliverPackets = true; | ||
942 | } | ||
943 | } | ||
944 | ); | ||
945 | } | 922 | } |
946 | else | 923 | else |
947 | { | 924 | { |