Merge branch 'master' into careminster-presence-refactor
commit
7e22be3441
|
@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console
|
||||||
{
|
{
|
||||||
public int last;
|
public int last;
|
||||||
public long lastLineSeen;
|
public long lastLineSeen;
|
||||||
|
public bool newConnection = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A console that uses REST interfaces
|
// A console that uses REST interfaces
|
||||||
|
@ -424,6 +425,12 @@ namespace OpenSim.Framework.Console
|
||||||
XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession",
|
XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession",
|
||||||
"");
|
"");
|
||||||
|
|
||||||
|
if (c.newConnection)
|
||||||
|
{
|
||||||
|
c.newConnection = false;
|
||||||
|
Output("+++" + DefaultPrompt);
|
||||||
|
}
|
||||||
|
|
||||||
lock (m_Scrollback)
|
lock (m_Scrollback)
|
||||||
{
|
{
|
||||||
long startLine = m_LineNumber - m_Scrollback.Count;
|
long startLine = m_LineNumber - m_Scrollback.Count;
|
||||||
|
|
Loading…
Reference in New Issue