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
parent
f985775962
commit
ddd3c6824a
|
@ -918,30 +918,7 @@ 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
|
client.Start();
|
||||||
|
|
||||||
//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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue