diff options
| author | Melanie | 2012-07-17 01:42:42 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-17 01:42:42 +0200 |
| commit | 130668057fef7512a4caa162f02c407bad819ed9 (patch) | |
| tree | afebea2680b236a59845a9760708a26369a2a136 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.zip opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.gz opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.bz2 opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.xz | |
Fix merge artefacts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index e8134cd..8db4397 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -113,7 +113,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 113 | 113 | ||
| 114 | protected ulong m_regionHandle; | 114 | protected ulong m_regionHandle; |
| 115 | protected string m_regionName; | 115 | protected string m_regionName; |
| 116 | protected RegionInfo m_regInfo; | ||
| 117 | 116 | ||
| 118 | public ITerrainChannel Heightmap; | 117 | public ITerrainChannel Heightmap; |
| 119 | 118 | ||