Massive console refactor. Greatly simplify interface.

6 files changed, 37 insertions, 29 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
index 0698cec..4e8f507 100644..100755
--- a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
         {
             if (cmd.Length != 2 && cmd.Length < 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: show animations [<first-name> <last-name>]");
+                MainConsole.Instance.Output("Usage: show animations [<first-name> <last-name>]");
                 return;
             }
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index c04f40c..ded0857 100644..100755
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 2 && cmd.Length < 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: appearance send [<first-name> <last-name>]");
+                MainConsole.Instance.Output("Usage: appearance send [<first-name> <last-name>]");
                 return;
             }
 
@@ -178,8 +178,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                         ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
                         if (sp != null && !sp.IsChildAgent)
                         {
-                            MainConsole.Instance.OutputFormat(
+                            MainConsole.Instance.Output(
                                 "Sending appearance information for {0} to all other avatars in {1}",
+                                null,
                                 sp.Name, scene.RegionInfo.RegionName);
 
                             scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -190,8 +191,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                         scene.ForEachRootScenePresence(
                             sp =>
                             {
-                                MainConsole.Instance.OutputFormat(
+                                MainConsole.Instance.Output(
                                     "Sending appearance information for {0} to all other avatars in {1}",
+                                    null,
                                     sp.Name, scene.RegionInfo.RegionName);
 
                                 scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -206,7 +208,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 2 && cmd.Length < 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: appearance show [<first-name> <last-name>]");
+                MainConsole.Instance.Output("Usage: appearance show [<first-name> <last-name>]");
                 return;
             }
 
@@ -229,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                     {
                         ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
                         if (sp != null && !sp.IsChildAgent)
-                            scene.AvatarFactory.WriteBakedTexturesReport(sp, MainConsole.Instance.OutputFormat);
+                            scene.AvatarFactory.WriteBakedTexturesReport(sp, MainConsole.Instance.Output);
                     }
                     else
                     {
@@ -237,8 +239,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                             sp =>
                             {
                                 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp);
-                                MainConsole.Instance.OutputFormat(
-                                    "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "incomplete");
+                                MainConsole.Instance.Output(
+                                    "{0} baked appearance texture is {1}", null, sp.Name, bakedTextureValid ? "OK" : "incomplete");
                             }
                         );
                     }
@@ -250,7 +252,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: appearance rebake <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: appearance rebake <first-name> <last-name>");
                 return;
             }
 
@@ -267,12 +269,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                         int rebakesRequested = scene.AvatarFactory.RequestRebake(sp, false);
 
                         if (rebakesRequested > 0)
-                            MainConsole.Instance.OutputFormat(
+                            MainConsole.Instance.Output(
                                 "Requesting rebake of {0} uploaded textures for {1} in {2}",
+                                null,
                                 rebakesRequested, sp.Name, scene.RegionInfo.RegionName);
                         else
-                            MainConsole.Instance.OutputFormat(
+                            MainConsole.Instance.Output(
                                 "No texture IDs available for rebake request for {0} in {1}",
+                                null,
                                 sp.Name, scene.RegionInfo.RegionName);
                     }
                 }
@@ -283,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 3)
             {
-                MainConsole.Instance.OutputFormat("Usage: appearance find <uuid-or-start-of-uuid>");
+                MainConsole.Instance.Output("Usage: appearance find <uuid-or-start-of-uuid>");
                 return;
             }
 
@@ -310,12 +314,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             if (matchedAvatars.Count == 0)
             {
-                MainConsole.Instance.OutputFormat("{0} did not match any baked avatar textures in use", rawUuid);
+                MainConsole.Instance.Output("{0} did not match any baked avatar textures in use", null, rawUuid);
             }
             else
             {
-                MainConsole.Instance.OutputFormat(
+                MainConsole.Instance.Output(
                     "{0} matched {1}",
+                    null,
                     rawUuid,
                     string.Join(", ", matchedAvatars.ToList().ConvertAll<string>(sp => sp.Name).ToArray()));
             }
@@ -325,7 +330,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 2 && cmd.Length < 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: wearables show [<first-name> <last-name>]");
+                MainConsole.Instance.Output("Usage: wearables show [<first-name> <last-name>]");
                 return;
             }
 
@@ -388,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
         {
             if (cmd.Length != 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: wearables check <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: wearables check <first-name> <last-name>");
                 return;
             }
 
@@ -410,7 +415,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                         AvatarWearable[] wearables = sp.Appearance.Wearables;
                         if(wearables.Count() == 0)
                         {
-                            MainConsole.Instance.OutputFormat("avatar has no wearables");
+                            MainConsole.Instance.Output("avatar has no wearables");
                             return;
                         }
                         
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 31fc56a..030c9eb 100644..100755
--- 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);
             }
         }
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index 1b5ee04..1dd5b0a 100644..100755
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -142,8 +142,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
                 if (sitPart != null)
                 {
-                    MainConsole.Instance.OutputFormat(
+                    MainConsole.Instance.Output(
                         "Sitting {0} on {1} {2} in {3}",
+                        null,
                         sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name);
 
                     sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero);
@@ -151,8 +152,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
                 }
                 else
                 {
-                    MainConsole.Instance.OutputFormat(
+                    MainConsole.Instance.Output(
                         "Could not find any unoccupied set seat on which to sit {0} in {1}.  Aborting",
+                        null,
                         sp.Name, m_scene.Name);
 
                     break;
@@ -177,7 +179,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
             {
                 if (sp.SitGround || sp.IsSatOnObject)
                 {
-                    MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
+                    MainConsole.Instance.Output("Standing {0} in {1}", null, sp.Name, m_scene.Name);
                     sp.StandUp();
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 8791235..04ff09d 100644..100755
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             m_debugEnabled = verbose;
 
-            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 4b81838..1d65d8b 100644..100755
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             m_debugEnabled = verbose;
 
-            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
         }
 
         public void RegionLoaded(Scene scene)