diff options
| author | Melanie | 2012-04-25 01:22:09 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 01:22:09 +0100 |
| commit | def65cd94a18115d1a9cb89d735715c1f708a81d (patch) | |
| tree | 7fd2c4c5ebb563bf7225d244b80739e9df134566 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Comment out some debug ATTACHMENTS log messages for now. (diff) | |
| download | opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.zip opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.gz opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.bz2 opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Framework')
| -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") |