Implement .ini file includes. Anything that begins with "Include-" will be

treated as another ini source to load.
For example:
Include-Asset = AssetSetup.ini
will load AssetSetup.ini after all other ini files are done.
This works recursively, too

2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 400bd83..fe78940 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Console
                 }
                 else
                 {
-                    System.Console.WriteLine(loggingMessage);
+                    System.Console.Write(loggingMessage);
                 }
             }
             catch (Exception e)
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 88d385e..544a072 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Console
         private List<string> m_Scrollback = new List<string>();
         private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
         private List<string> m_InputData = new List<string>();
+        private uint m_LineNumber = 1;
 
         public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
         {
@@ -70,7 +71,8 @@ namespace OpenSim.Framework.Console
             {
                 while (m_Scrollback.Count >= 1000)
                     m_Scrollback.RemoveAt(0);
-                m_Scrollback.Add(level+":"+text);
+                m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
+                m_LineNumber++;
             }
             System.Console.Write(text);
         }