diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/CoreModules/World/Terrain | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index 2da6458..a93ffaa 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
| @@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
| 84 | private ITerrainChannel m_revert; | 84 | private ITerrainChannel m_revert; |
| 85 | private Scene m_scene; | 85 | private Scene m_scene; |
| 86 | private volatile bool m_tainted; | 86 | private volatile bool m_tainted; |
| 87 | private readonly UndoStack<LandUndoState> m_undo = new UndoStack<LandUndoState>(5); | 87 | private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5); |
| 88 | 88 | ||
| 89 | #region ICommandableModule Members | 89 | #region ICommandableModule Members |
| 90 | 90 | ||