Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Framework/Watchdog.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index f343f80..80957b4 100644
--- 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;
             }