From 0fd17c08ae642fac17b24dfad06c61cfe5739483 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 20 Aug 2019 23:28:59 +0100
Subject: Massive console refactor. Greatly simplify interface.

---
 .../Avatar/Friends/FriendsCommandsModule.cs               | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs

(limited to 'OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs')

diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
old mode 100644
new mode 100755
index 31fc56a..030c9eb
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             if (mainParams.Count != 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: friends show [--cache] <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: friends show [--cache] <first-name> <last-name>");
                 return;
             }
 
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             if (userId == UUID.Zero)
             {
-                MainConsole.Instance.OutputFormat("No such user as {0} {1}", firstName, lastName);
+                MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName);
                 return;
             }
 
@@ -146,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
             {
                 if (!m_friendsModule.AreFriendsCached(userId))
                 {
-                    MainConsole.Instance.OutputFormat("No friends cached on this simulator for {0} {1}", firstName, lastName);
+                    MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", null, firstName, lastName);
                     return;
                 }
                 else
@@ -162,10 +162,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
                 friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId);
             }
 
-            MainConsole.Instance.OutputFormat("Friends for {0} {1} {2}:", firstName, lastName, userId);
+            MainConsole.Instance.Output("Friends for {0} {1} {2}:", null, firstName, lastName, userId);
 
-            MainConsole.Instance.OutputFormat(
-                "{0,-36}  {1,-36}  {2,-7}  {3,7}  {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
+            MainConsole.Instance.Output(
+                "{0,-36}  {1,-36}  {2,-7}  {3,7}  {4,10}", null, "UUID", "Name", "Status", "MyFlags", "TheirFlags");
 
             foreach (FriendInfo friend in friends)
             {
@@ -191,8 +191,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
                 else
                     onlineText = "offline";
 
-                MainConsole.Instance.OutputFormat(
+                MainConsole.Instance.Output(
                     "{0,-36}  {1,-36}  {2,-7}  {3,-7}  {4,-10}",
+                    null,
                     friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
             }
         }
-- 
cgit v1.1