From 195dd054de40d92fc51df751a9af996b8c0f886d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 27 Aug 2015 21:07:16 +0100 Subject: [PATCH] make terrain undo non op, it is broken and can't be global but per agent --- .../World/Terrain/TerrainModule.cs | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index feafa4877b..a5efeb8b7f 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -90,7 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain private ITerrainChannel m_baked; private Scene m_scene; private volatile bool m_tainted; - private readonly Stack m_undo = new Stack(5); private String m_InitialTerrain = "pinhead-island"; @@ -923,15 +922,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain private void client_OnLandUndo(IClientAPI client) { - lock (m_undo) - { - if (m_undo.Count > 0) - { - LandUndoState goback = m_undo.Pop(); - if (goback != null) - goback.PlaybackState(); - } - } + } /// @@ -1137,10 +1128,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain int zx = (int) (west + 0.5); int zy = (int) (north + 0.5); - int dx; + int dx,dy; for (dx=-n; dx<=n; dx++) { - int dy; for (dy=-n; dy<=n; dy++) { int x = zx + dx; @@ -1236,21 +1226,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain private void StoreUndoState() { - lock (m_undo) - { - if (m_undo.Count > 0) - { - LandUndoState last = m_undo.Peek(); - if (last != null) - { - if (last.Compare(m_channel)) - return; - } - } - - LandUndoState nUndo = new LandUndoState(this, m_channel); - m_undo.Push(nUndo); - } } #region Console Commands