aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-17 04:15:56 -0700
committerTom Grimshaw2010-06-17 04:15:56 -0700
commit33c092781e72b33dee3e39224eed51be61019ad8 (patch)
tree5f9210d030c12151a7bf104c778bb074cbd94bef /OpenSim
parentFix llRot2Euler with a mathematically sound implementation. The only differen... (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
downloadopensim-SC-33c092781e72b33dee3e39224eed51be61019ad8.zip
opensim-SC-33c092781e72b33dee3e39224eed51be61019ad8.tar.gz
opensim-SC-33c092781e72b33dee3e39224eed51be61019ad8.tar.bz2
opensim-SC-33c092781e72b33dee3e39224eed51be61019ad8.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs7
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;