From ddd3c6824ada0c2a6b87d7176f23b636caafa72f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 5 Nov 2010 14:27:53 +0100
Subject: 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
---
 .../Region/ClientStack/LindenUDP/LLUDPServer.cs    | 25 +---------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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
                 client.DisableFacelights = m_disableFacelights;
 
                 // Start the IClientAPI
-                // Spin it off so that it doesn't clog up the LLUDPServer
-                
-                //First, and very importantly:
-                //
-                //Set our DeliverPackets flag in the client to *false*
-                //this will prevent us from missing important messages
-                //before the modules are bound
-                client.DeliverPackets = false;
-                client.DisableFacelights = m_disableFacelights;
-                
-                Util.FireAndForget(
-                    delegate
-                    {
-                        try
-                        {
-                            client.Start();
-                        }
-                        finally
-                        {
-                            //Now, release the hounds. er, packets.
-                            client.DeliverPackets = true;
-                        }
-                    }
-                );
+                client.Start();
             }
             else
             {
-- 
cgit v1.1