aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-04-30 19:24:17 +0100
committerJustin Clark-Casey (justincc)2014-04-30 19:24:17 +0100
commit5d01a1ff4dd1781dc5a612effb289a464e75e971 (patch)
treeabd18f118651496a9a81caaf02decc855f73d74d /OpenSim/Region
parentAdd "terrain show" console command which outputs terrain height for a given r... (diff)
downloadopensim-SC-5d01a1ff4dd1781dc5a612effb289a464e75e971.zip
opensim-SC-5d01a1ff4dd1781dc5a612effb289a464e75e971.tar.gz
opensim-SC-5d01a1ff4dd1781dc5a612effb289a464e75e971.tar.bz2
opensim-SC-5d01a1ff4dd1781dc5a612effb289a464e75e971.tar.xz
minor: Print output in response to terrain console commands on the console rather than in the log.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index ae6fdac..b14b0e0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -1082,10 +1082,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1082 } 1082 }
1083 else 1083 else
1084 { 1084 {
1085 m_log.Error("Unrecognised direction - need x or y"); 1085 MainConsole.Instance.OutputFormat("ERROR: Unrecognised direction {0} - need or y", direction);
1086 } 1086 }
1087
1088
1089 } 1087 }
1090 1088
1091 private void InterfaceRescaleTerrain(Object[] args) 1089 private void InterfaceRescaleTerrain(Object[] args)
@@ -1241,8 +1239,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1241 1239
1242 double avg = sum / (m_channel.Height * m_channel.Width); 1240 double avg = sum / (m_channel.Height * m_channel.Width);
1243 1241
1244 m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height); 1242 MainConsole.Instance.OutputFormat("Channel {0}x{1}", m_channel.Width, m_channel.Height);
1245 m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum); 1243 MainConsole.Instance.OutputFormat("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
1246 } 1244 }
1247 1245
1248 private void InterfaceEnableExperimentalBrushes(Object[] args) 1246 private void InterfaceEnableExperimentalBrushes(Object[] args)
@@ -1262,27 +1260,30 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1262 private void InterfaceRunPluginEffect(Object[] args) 1260 private void InterfaceRunPluginEffect(Object[] args)
1263 { 1261 {
1264 string firstArg = (string)args[0]; 1262 string firstArg = (string)args[0];
1263
1265 if (firstArg == "list") 1264 if (firstArg == "list")
1266 { 1265 {
1267 m_log.Info("List of loaded plugins"); 1266 MainConsole.Instance.Output("List of loaded plugins");
1268 foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects) 1267 foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
1269 { 1268 {
1270 m_log.Info(kvp.Key); 1269 MainConsole.Instance.Output(kvp.Key);
1271 } 1270 }
1272 return; 1271 return;
1273 } 1272 }
1273
1274 if (firstArg == "reload") 1274 if (firstArg == "reload")
1275 { 1275 {
1276 LoadPlugins(); 1276 LoadPlugins();
1277 return; 1277 return;
1278 } 1278 }
1279
1279 if (m_plugineffects.ContainsKey(firstArg)) 1280 if (m_plugineffects.ContainsKey(firstArg))
1280 { 1281 {
1281 m_plugineffects[firstArg].RunEffect(m_channel); 1282 m_plugineffects[firstArg].RunEffect(m_channel);
1282 } 1283 }
1283 else 1284 else
1284 { 1285 {
1285 m_log.Warn("No such plugin effect loaded."); 1286 MainConsole.Instance.Output("WARNING: No such plugin effect {0} loaded.", firstArg);
1286 } 1287 }
1287 } 1288 }
1288 1289