From 5d01a1ff4dd1781dc5a612effb289a464e75e971 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 30 Apr 2014 19:24:17 +0100
Subject: minor: Print output in response to terrain console commands on the
 console rather than in the log.

---
 .../Region/CoreModules/World/Terrain/TerrainModule.cs   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region')

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
             }
             else
             {
-                m_log.Error("Unrecognised direction - need x or y");
+                MainConsole.Instance.OutputFormat("ERROR: Unrecognised direction {0} - need  or y", direction);
             }
-
-
         }
 
         private void InterfaceRescaleTerrain(Object[] args)
@@ -1241,8 +1239,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             double avg = sum / (m_channel.Height * m_channel.Width);
 
-            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
-            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
+            MainConsole.Instance.OutputFormat("Channel {0}x{1}", m_channel.Width, m_channel.Height);
+            MainConsole.Instance.OutputFormat("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
         }
 
         private void InterfaceEnableExperimentalBrushes(Object[] args)
@@ -1262,27 +1260,30 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void InterfaceRunPluginEffect(Object[] args)
         {
             string firstArg = (string)args[0];
+
             if (firstArg == "list")
             {
-                m_log.Info("List of loaded plugins");
+                MainConsole.Instance.Output("List of loaded plugins");
                 foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
                 {
-                    m_log.Info(kvp.Key);
+                    MainConsole.Instance.Output(kvp.Key);
                 }
                 return;
             }
+
             if (firstArg == "reload")
             {
                 LoadPlugins();
                 return;
             }
+
             if (m_plugineffects.ContainsKey(firstArg))
             {
                 m_plugineffects[firstArg].RunEffect(m_channel);
             }
             else
             {
-                m_log.Warn("No such plugin effect loaded.");
+                MainConsole.Instance.Output("WARNING: No such plugin effect {0} loaded.", firstArg);
             }
         }
 
-- 
cgit v1.1