aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-08-27 21:07:16 +0100
committerUbitUmarov2015-08-27 21:07:16 +0100
commit195dd054de40d92fc51df751a9af996b8c0f886d (patch)
treef537fe8635f176ec112d24b04221177c751eedf6
parent fix terrain bake for revert. just good enought fix (diff)
downloadopensim-SC_OLD-195dd054de40d92fc51df751a9af996b8c0f886d.zip
opensim-SC_OLD-195dd054de40d92fc51df751a9af996b8c0f886d.tar.gz
opensim-SC_OLD-195dd054de40d92fc51df751a9af996b8c0f886d.tar.bz2
opensim-SC_OLD-195dd054de40d92fc51df751a9af996b8c0f886d.tar.xz
make terrain undo non op, it is broken and can't be global but per agent
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs29
1 files changed, 2 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index feafa48..a5efeb8 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
90 private ITerrainChannel m_baked; 90 private ITerrainChannel m_baked;
91 private Scene m_scene; 91 private Scene m_scene;
92 private volatile bool m_tainted; 92 private volatile bool m_tainted;
93 private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5);
94 93
95 private String m_InitialTerrain = "pinhead-island"; 94 private String m_InitialTerrain = "pinhead-island";
96 95
@@ -923,15 +922,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
923 922
924 private void client_OnLandUndo(IClientAPI client) 923 private void client_OnLandUndo(IClientAPI client)
925 { 924 {
926 lock (m_undo) 925
927 {
928 if (m_undo.Count > 0)
929 {
930 LandUndoState goback = m_undo.Pop();
931 if (goback != null)
932 goback.PlaybackState();
933 }
934 }
935 } 926 }
936 927
937 /// <summary> 928 /// <summary>
@@ -1137,10 +1128,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1137 int zx = (int) (west + 0.5); 1128 int zx = (int) (west + 0.5);
1138 int zy = (int) (north + 0.5); 1129 int zy = (int) (north + 0.5);
1139 1130
1140 int dx; 1131 int dx,dy;
1141 for (dx=-n; dx<=n; dx++) 1132 for (dx=-n; dx<=n; dx++)
1142 { 1133 {
1143 int dy;
1144 for (dy=-n; dy<=n; dy++) 1134 for (dy=-n; dy<=n; dy++)
1145 { 1135 {
1146 int x = zx + dx; 1136 int x = zx + dx;
@@ -1236,21 +1226,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1236 1226
1237 private void StoreUndoState() 1227 private void StoreUndoState()
1238 { 1228 {
1239 lock (m_undo)
1240 {
1241 if (m_undo.Count > 0)
1242 {
1243 LandUndoState last = m_undo.Peek();
1244 if (last != null)
1245 {
1246 if (last.Compare(m_channel))
1247 return;
1248 }
1249 }
1250
1251 LandUndoState nUndo = new LandUndoState(this, m_channel);
1252 m_undo.Push(nUndo);
1253 }
1254 } 1229 }
1255 1230
1256 #region Console Commands 1231 #region Console Commands