aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console/LocalConsole.cs
diff options
context:
space:
mode:
authorMelanie2012-04-25 01:22:09 +0100
committerMelanie2012-04-25 01:22:09 +0100
commitdef65cd94a18115d1a9cb89d735715c1f708a81d (patch)
tree7fd2c4c5ebb563bf7225d244b80739e9df134566 /OpenSim/Framework/Console/LocalConsole.cs
parentMerge branch 'master' into careminster (diff)
parentComment out some debug ATTACHMENTS log messages for now. (diff)
downloadopensim-SC-def65cd94a18115d1a9cb89d735715c1f708a81d.zip
opensim-SC-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.gz
opensim-SC-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.bz2
opensim-SC-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs4
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")