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

make terrain undo non op, it is broken and can't be global but per agent

avinationmerge
UbitUmarov 2015-08-27 21:07:16 +01:00
parent d1b4e0dd6a
commit 195dd054de
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -90,7 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private ITerrainChannel m_baked; private ITerrainChannel m_baked;
private Scene m_scene; private Scene m_scene;
private volatile bool m_tainted; private volatile bool m_tainted;
private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5);
private String m_InitialTerrain = "pinhead-island"; private String m_InitialTerrain = "pinhead-island";
@ -923,15 +922,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void client_OnLandUndo(IClientAPI client) private void client_OnLandUndo(IClientAPI client)
{ {
lock (m_undo)
{
if (m_undo.Count > 0)
{
LandUndoState goback = m_undo.Pop();
if (goback != null)
goback.PlaybackState();
}
}
} }
/// <summary> /// <summary>
@ -1137,10 +1128,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
int zx = (int) (west + 0.5); int zx = (int) (west + 0.5);
int zy = (int) (north + 0.5); int zy = (int) (north + 0.5);
int dx; int dx,dy;
for (dx=-n; dx<=n; dx++) for (dx=-n; dx<=n; dx++)
{ {
int dy;
for (dy=-n; dy<=n; dy++) for (dy=-n; dy<=n; dy++)
{ {
int x = zx + dx; int x = zx + dx;
@ -1236,21 +1226,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void StoreUndoState() 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 #region Console Commands