diff options
author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
---|---|---|
committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Framework/Console/LocalConsole.cs | |
parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
parent | Slight rewording of output messages. (diff) | |
download | opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Console/LocalConsole.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index 7c8626d..f65813b 100644 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -296,6 +296,10 @@ namespace OpenSim.Framework.Console | |||
296 | matches[0].Groups["Category"].Value); | 296 | matches[0].Groups["Category"].Value); |
297 | System.Console.Write("]:"); | 297 | System.Console.Write("]:"); |
298 | } | 298 | } |
299 | else | ||
300 | { | ||
301 | outText = outText.Trim(); | ||
302 | } | ||
299 | } | 303 | } |
300 | 304 | ||
301 | if (level == "error") | 305 | if (level == "error") |