diff options
author | Diva Canto | 2010-06-19 13:52:21 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-19 13:52:21 -0700 |
commit | 77d892690aac2808d7a050c13dd6bd642a403334 (patch) | |
tree | 591565bd1379cd1d496edb7e54a1963aa1391e6d /OpenSim/Framework | |
parent | remove link to wiki mysql-config since the page was out-of-date and actively ... (diff) | |
parent | Bug fix: wrong name of requester in local friendship offer. (diff) | |
download | opensim-SC-77d892690aac2808d7a050c13dd6bd642a403334.zip opensim-SC-77d892690aac2808d7a050c13dd6bd642a403334.tar.gz opensim-SC-77d892690aac2808d7a050c13dd6bd642a403334.tar.bz2 opensim-SC-77d892690aac2808d7a050c13dd6bd642a403334.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Framework')
-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; |