On all undo/redo operations, consistently lock the undo object for everything, in order to avoid any deadlock issues.

bulletsim
Justin Clark-Casey (justincc) 2011-07-19 06:13:05 +01:00
parent c50533659a
commit ee829a71c2
1 changed files with 1 additions and 5 deletions

View File

@ -3775,7 +3775,7 @@ namespace OpenSim.Region.Framework.Scenes
public void Redo() public void Redo()
{ {
lock (m_redo) lock (m_undo)
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}", // "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}",
@ -3811,10 +3811,6 @@ namespace OpenSim.Region.Framework.Scenes
lock (m_undo) lock (m_undo)
{ {
m_undo.Clear(); m_undo.Clear();
}
lock (m_redo)
{
m_redo.Clear(); m_redo.Clear();
} }
} }