aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-19 06:13:05 +0100
committerJustin Clark-Casey (justincc)2011-07-19 06:13:05 +0100
commitee829a71c2e42d4434d8cec2cfc1d048d50904f0 (patch)
tree4e139dd21739ff3fd652623631f0211c810ec5e1 /OpenSim/Region
parentIf we store an undo, wipe anything already present on the redo stack (diff)
downloadopensim-SC-ee829a71c2e42d4434d8cec2cfc1d048d50904f0.zip
opensim-SC-ee829a71c2e42d4434d8cec2cfc1d048d50904f0.tar.gz
opensim-SC-ee829a71c2e42d4434d8cec2cfc1d048d50904f0.tar.bz2
opensim-SC-ee829a71c2e42d4434d8cec2cfc1d048d50904f0.tar.xz
On all undo/redo operations, consistently lock the undo object for everything, in order to avoid any deadlock issues.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e8097fa..f74f263 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3775,7 +3775,7 @@ namespace OpenSim.Region.Framework.Scenes
3775 3775
3776 public void Redo() 3776 public void Redo()
3777 { 3777 {
3778 lock (m_redo) 3778 lock (m_undo)
3779 { 3779 {
3780// m_log.DebugFormat( 3780// m_log.DebugFormat(
3781// "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}", 3781// "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}",
@@ -3811,10 +3811,6 @@ namespace OpenSim.Region.Framework.Scenes
3811 lock (m_undo) 3811 lock (m_undo)
3812 { 3812 {
3813 m_undo.Clear(); 3813 m_undo.Clear();
3814 }
3815
3816 lock (m_redo)
3817 {
3818 m_redo.Clear(); 3814 m_redo.Clear();
3819 } 3815 }
3820 } 3816 }