Revert "So much cuteness"

This reverts commit 28b42ce2d2.
This commit is contained in:
cinder
2022-11-20 00:08:33 -06:00
parent 2af59f2d10
commit d7de598d7e
11 changed files with 165 additions and 124 deletions

View File

@@ -587,11 +587,13 @@ namespace OpenMetaverse
#region Start Timers
// Timer for sending out queued packet acknowledgments
AckTimer ??= new Timer(AckTimer_Elapsed, null, Settings.NETWORK_TICK_INTERVAL, Timeout.Infinite);
// Timer for sending out queued packet acknowledgements
if (AckTimer == null)
AckTimer = new Timer(AckTimer_Elapsed, null, Settings.NETWORK_TICK_INTERVAL, Timeout.Infinite);
// Timer for recording simulator connection statistics
StatsTimer ??= new Timer(StatsTimer_Elapsed, null, 1000, 1000);
if (StatsTimer == null)
StatsTimer = new Timer(StatsTimer_Elapsed, null, 1000, 1000);
// Timer for periodically pinging the simulator
if (PingTimer == null && Client.Settings.SEND_PINGS)
@@ -1392,7 +1394,10 @@ namespace OpenMetaverse
{
lock (SimulatorDataPools)
{
InactiveSimReaper ??= new Timer(RemoveOldSims, null, TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3));
if (InactiveSimReaper == null)
{
InactiveSimReaper = new Timer(RemoveOldSims, null, TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3));
}
var pool = GetSimulatorData(sim.Handle);
if (pool.ActiveClients < 1) pool.ActiveClients = 1; else pool.ActiveClients++;
pool.InactiveSince = DateTime.MaxValue;