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

Fix race condition where the appearance update timer could be stopped just after another thread had started it on QueueAppearanceSave() or *Send() 

However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-19 19:08:24 +00:00
parent 546eb88112
commit 48ea503c33
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -475,11 +475,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
m_savequeue.Remove(avatarID); m_savequeue.Remove(avatarID);
} }
} }
}
// We must lock both queues here so that QueueAppearanceSave() or *Send() don't m_updateTimer.Start() on
// another thread inbetween the first count calls and m_updateTimer.Stop() on this thread.
lock (m_sendqueue)
if (m_savequeue.Count == 0 && m_sendqueue.Count == 0) if (m_savequeue.Count == 0 && m_sendqueue.Count == 0)
m_updateTimer.Stop(); m_updateTimer.Stop();
} }
}
#endregion #endregion