From a7e2d1445407ac469fc4e1a090146c5097450176 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 6 Sep 2008 04:35:33 +0000
Subject: Rolling back #6139 because there is no consensus on it's application.
 Reverted pending further discussion.

---
 .../Region/ClientStack/LindenUDP/LLUDPServer.cs    | 28 +---------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index c01f6d6..8dec185 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -30,7 +30,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading;
 using System.Reflection;
 using libsecondlife.Packets;
 using log4net;
@@ -70,8 +69,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected AssetCache m_assetCache;
         protected AgentCircuitManager m_authenticateSessionsClass;
 
-        protected Queue<Packet> CreateUserPacket = new Queue<Packet>();
-
         public LLPacketServer PacketServer
         {
             get { return m_packetServer; }
@@ -239,6 +236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         // new client
                         m_log.Debug("[UDPSERVER]: Adding New Client");
+                        AddNewClient(packet);
 
                         UseCircuitCodePacket p = (UseCircuitCodePacket)packet;
 
@@ -250,14 +248,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         ack_it.Packets[0].ID = packet.Header.Sequence;
                         ack_it.Header.Reliable = false;
                         SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code);
-
-                        // toss it to a worker thread so IOthread can go home
-                        lock (CreateUserPacket)
-                        {
-                            CreateUserPacket.Enqueue(packet);
-                        }
-                        WaitCallback createUserCallback = new WaitCallback(AddNewClient);
-                        ThreadPool.QueueUserWorkItem(createUserCallback);
                     }
                 }
                 catch (Exception e)
@@ -321,22 +311,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        /// <summary>
-        /// target of workerthread delegate to create a new user. 
-        /// It assumes we get fired for each new user packet that comes in.
-        /// </summary>
-        /// <param name="o"></param>
-        protected void AddNewClient(object o)
-        {
-            Packet packet;
-            lock (CreateUserPacket)
-            {
-                packet = CreateUserPacket.Dequeue();
-            }
-            if (null != packet)
-                AddNewClient(packet);
-        }
-
         protected virtual void AddNewClient(Packet packet)
         {
             //Slave regions don't accept new clients
-- 
cgit v1.1