diff options
author | Melanie | 2010-06-17 03:08:55 +0100 |
---|---|---|
committer | Melanie | 2010-06-17 03:08:55 +0100 |
commit | 7e22be344184747f58660bc30cf1cb3f52494573 (patch) | |
tree | 6bcd708bb37acbccfe29a63dbe119af7a6ac4c01 /OpenSim | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Force newly connecting remote consoles to display a prompt (diff) | |
download | opensim-SC-7e22be344184747f58660bc30cf1cb3f52494573.zip opensim-SC-7e22be344184747f58660bc30cf1cb3f52494573.tar.gz opensim-SC-7e22be344184747f58660bc30cf1cb3f52494573.tar.bz2 opensim-SC-7e22be344184747f58660bc30cf1cb3f52494573.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index a46a6cb..c038aac 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console | |||
44 | { | 44 | { |
45 | public int last; | 45 | public int last; |
46 | public long lastLineSeen; | 46 | public long lastLineSeen; |
47 | public bool newConnection = true; | ||
47 | } | 48 | } |
48 | 49 | ||
49 | // A console that uses REST interfaces | 50 | // A console that uses REST interfaces |
@@ -424,6 +425,12 @@ namespace OpenSim.Framework.Console | |||
424 | XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession", | 425 | XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession", |
425 | ""); | 426 | ""); |
426 | 427 | ||
428 | if (c.newConnection) | ||
429 | { | ||
430 | c.newConnection = false; | ||
431 | Output("+++" + DefaultPrompt); | ||
432 | } | ||
433 | |||
427 | lock (m_Scrollback) | 434 | lock (m_Scrollback) |
428 | { | 435 | { |
429 | long startLine = m_LineNumber - m_Scrollback.Count; | 436 | long startLine = m_LineNumber - m_Scrollback.Count; |