diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Dialog')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 2 |
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 | |||
201 | } | 201 | } |
202 | else | 202 | else |
203 | { | 203 | { |
204 | OpenSim.Framework.Console.MainConsole.Instance.Output( | 204 | MainConsole.Instance.Output( |
205 | "Usage: alert <message> | alert-user <first> <last> <message>"); | 205 | "Usage: alert <message> | alert-user <first> <last> <message>"); |
206 | return; | 206 | return; |
207 | } | 207 | } |