Merge branch 'master' into careminster

Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2026-08-11 03:45:35 +08:00 · 2012-04-25 01:22:09 +01:00
parent c5520dc83f 6b299a4287
commit def65cd94a
8 changed files with 76 additions and 55 deletions
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -296,6 +296,10 @@ namespace OpenSim.Framework.Console
                            matches[0].Groups["Category"].Value);
                    System.Console.Write("]:");
                }
+                else
+                {
+                    outText = outText.Trim();
+                }
            }

            if (level == "error")