Massive console refactor. Greatly simplify interface.

1 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
index cf65c47..d98f11a 100644..100755
--- a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
         {
             if (cmd.Length < 5)
             {
-                MainConsole.Instance.OutputFormat("Usage: " + TeleportUserCommandSyntax);
+                MainConsole.Instance.Output("Usage: " + TeleportUserCommandSyntax);
                 return;
             }
 
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
 
             if (user == null)
             {
-                MainConsole.Instance.OutputFormat("No user found with name {0} {1}", firstName, lastName);
+                MainConsole.Instance.Output("No user found with name {0} {1}", null, firstName, lastName);
                 return;
             }
 
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
 
                 if (!m.Success)
                 {
-                    MainConsole.Instance.OutputFormat("Invalid destination {0}", rawDestination);
+                    MainConsole.Instance.Output("Invalid destination {0}", null, rawDestination);
                     return;
                 }
             }
@@ -169,8 +169,9 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
             string regionName
                 = m.Groups["regionName"].Success ? m.Groups["regionName"].Value : user.Scene.RegionInfo.RegionName;
 
-            MainConsole.Instance.OutputFormat(
+            MainConsole.Instance.Output(
                 "Teleporting {0} to {1},{2},{3} in {4}",
+                null,
                 user.Name,
                 m.Groups["x"], m.Groups["y"], m.Groups["z"],
                 regionName);