aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-21 23:06:10 +0000
committerMelanie Thielker2009-05-21 23:06:10 +0000
commite5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca (patch)
tree8c5b310195e071ff6c51ca657e28e5cb19a7985f /OpenSim/Framework
parent* Upgraded LLStandaloneLoginModule, LLProxyLoginModule and LLClientStackModul... (diff)
downloadopensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.zip
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.gz
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.bz2
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.xz
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
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs2
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs4
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
66 } 66 }
67 else 67 else
68 { 68 {
69 System.Console.WriteLine(loggingMessage); 69 System.Console.Write(loggingMessage);
70 } 70 }
71 } 71 }
72 catch (Exception e) 72 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
49 private List<string> m_Scrollback = new List<string>(); 49 private List<string> m_Scrollback = new List<string>();
50 private ManualResetEvent m_DataEvent = new ManualResetEvent(false); 50 private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
51 private List<string> m_InputData = new List<string>(); 51 private List<string> m_InputData = new List<string>();
52 private uint m_LineNumber = 1;
52 53
53 public RemoteConsole(string defaultPrompt) : base(defaultPrompt) 54 public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
54 { 55 {
@@ -70,7 +71,8 @@ namespace OpenSim.Framework.Console
70 { 71 {
71 while (m_Scrollback.Count >= 1000) 72 while (m_Scrollback.Count >= 1000)
72 m_Scrollback.RemoveAt(0); 73 m_Scrollback.RemoveAt(0);
73 m_Scrollback.Add(level+":"+text); 74 m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
75 m_LineNumber++;
74 } 76 }
75 System.Console.Write(text); 77 System.Console.Write(text);
76 } 78 }