OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)" 

This reverts commit 40e05f4109.

Conflicts:

	OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
avinationmerge
Melanie 2010-11-05 14:27:53 +01:00
parent f985775962
commit ddd3c6824a
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -918,31 +918,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
client.DisableFacelights = m_disableFacelights; client.DisableFacelights = m_disableFacelights;
// Start the IClientAPI // 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(); client.Start();
} }
finally
{
//Now, release the hounds. er, packets.
client.DeliverPackets = true;
}
}
);
}
else else
{ {
m_log.WarnFormat("[LLUDPSERVER]: Ignoring a repeated UseCircuitCode from {0} at {1} for circuit {2}", m_log.WarnFormat("[LLUDPSERVER]: Ignoring a repeated UseCircuitCode from {0} at {1} for circuit {2}",