aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Terrain
diff options
context:
space:
mode:
authorUbitUmarov2019-10-22 12:39:50 +0100
committerUbitUmarov2019-10-22 12:39:50 +0100
commitda0a8d6c43054b1b6b7487fc5fc78f03af349c02 (patch)
tree06c005fd81f0ccfe12a57337873adc9e45080ede /OpenSim/Region/CoreModules/World/Terrain
parentremove some useless NULL arguments (diff)
downloadopensim-SC-da0a8d6c43054b1b6b7487fc5fc78f03af349c02.zip
opensim-SC-da0a8d6c43054b1b6b7487fc5fc78f03af349c02.tar.gz
opensim-SC-da0a8d6c43054b1b6b7487fc5fc78f03af349c02.tar.bz2
opensim-SC-da0a8d6c43054b1b6b7487fc5fc78f03af349c02.tar.xz
remove some more useless NULL arguments
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain')
-rwxr-xr-xOpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index d8c118f..02f0d3d 100755
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -793,7 +793,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
793 { 793 {
794 MainConsole.Instance.Output( 794 MainConsole.Instance.Output(
795 "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", 795 "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.",
796 null,
797 m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); 796 m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
798 797
799 return; 798 return;
@@ -813,7 +812,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
813 812
814 MainConsole.Instance.Output( 813 MainConsole.Instance.Output(
815 "Saved terrain from ({0},{1}) to ({2},{3}) from {4} to {5}", 814 "Saved terrain from ({0},{1}) to ({2},{3}) from {4} to {5}",
816 null,
817 fileStartX, fileStartY, fileStartX + fileWidth - 1, fileStartY + fileHeight - 1, 815 fileStartX, fileStartY, fileStartX + fileWidth - 1, fileStartY + fileHeight - 1,
818 m_scene.RegionInfo.RegionName, filename); 816 m_scene.RegionInfo.RegionName, filename);
819 } 817 }
@@ -824,7 +822,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
824 822
825 MainConsole.Instance.Output( 823 MainConsole.Instance.Output(
826 "ERROR: Could not save terrain from {0} to {1}. Valid file extensions are {2}", 824 "ERROR: Could not save terrain from {0} to {1}. Valid file extensions are {2}",
827 null,
828 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave); 825 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
829 } 826 }
830 827
@@ -1706,8 +1703,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1706 1703
1707 double avg = sum / (m_channel.Height * m_channel.Width); 1704 double avg = sum / (m_channel.Height * m_channel.Width);
1708 1705
1709 MainConsole.Instance.Output("Channel {0}x{1}", null, m_channel.Width, m_channel.Height); 1706 MainConsole.Instance.Output("Channel {0}x{1}", m_channel.Width, m_channel.Height);
1710 MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", null, max, min, avg, sum); 1707 MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
1711 } 1708 }
1712 1709
1713 private void InterfaceEnableExperimentalBrushes(Object[] args) 1710 private void InterfaceEnableExperimentalBrushes(Object[] args)