Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-06-17 03:08:55 +01:00
commit 7e22be3441
1 changed files with 7 additions and 0 deletions

View File

@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console
{
public int last;
public long lastLineSeen;
public bool newConnection = true;
}
// A console that uses REST interfaces
@ -424,6 +425,12 @@ namespace OpenSim.Framework.Console
XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession",
"");
if (c.newConnection)
{
c.newConnection = false;
Output("+++" + DefaultPrompt);
}
lock (m_Scrollback)
{
long startLine = m_LineNumber - m_Scrollback.Count;