Merge branch 'master' into bigmerge

Conflicts: OpenSim/Framework/Watchdog.cs
2026-08-05 00:46:02 +08:00 · 2011-10-26 01:27:24 +01:00
parent 27aca49a1f c275c22928
commit fd22159d0c
55 changed files with 496 additions and 224 deletions
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            }
            else
            {
-                OpenSim.Framework.Console.MainConsole.Instance.Output(
+                MainConsole.Instance.Output(
                    "Usage: alert <message> | alert-user <first> <last> <message>");
                return;
            }