diff options
| author | Melanie | 2012-03-23 02:44:22 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-23 02:44:22 +0000 |
| commit | 2190a62366a633e93e2d4b0284962127f1a5cbf9 (patch) | |
| tree | 326b866b027bd57c8edf158a5514b13c4ad20768 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method... (diff) | |
| download | opensim-SC_OLD-2190a62366a633e93e2d4b0284962127f1a5cbf9.zip opensim-SC_OLD-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.gz opensim-SC_OLD-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.bz2 opensim-SC_OLD-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index b5e79b8..7c6df03 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
| @@ -598,12 +598,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
| 598 | "[TERRAIN]: Could not save terrain from {0} to {1}. Valid file extensions are {2}", | 598 | "[TERRAIN]: Could not save terrain from {0} to {1}. Valid file extensions are {2}", |
| 599 | m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions); | 599 | m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions); |
| 600 | } | 600 | } |
| 601 | else | 601 | // else |
| 602 | { | 602 | // { |
| 603 | m_log.ErrorFormat( | 603 | // m_log.ErrorFormat( |
| 604 | "[TERRAIN]: Could not save terrain from {0} to {1}. {2} {3} {4} {5} {6} {7}", | 604 | // "[TERRAIN]: Could not save terrain from {0} to {1}. {2} {3} {4} {5} {6} {7}", |
| 605 | m_scene.RegionInfo.RegionName, filename, fileWidth, fileHeight, fileStartX, fileStartY, offsetX, offsetY); | 605 | // m_scene.RegionInfo.RegionName, filename, fileWidth, fileHeight, fileStartX, fileStartY, offsetX, offsetY); |
| 606 | } | 606 | // } |
| 607 | } | 607 | } |
| 608 | 608 | ||
| 609 | /// <summary> | 609 | /// <summary> |