diff options
| author | Melanie | 2012-09-29 19:21:07 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-29 19:21:07 +0100 |
| commit | 71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch) | |
| tree | b1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /OpenSim/Framework/Servers/MainServer.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2 opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Framework/Servers/MainServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index 4b61b18..ae7d515 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
| @@ -177,9 +177,9 @@ namespace OpenSim.Framework.Servers | |||
| 177 | return; | 177 | return; |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | if (newDebug < 0 || newDebug > 5) | 180 | if (newDebug < 0 || newDebug > 6) |
| 181 | { | 181 | { |
| 182 | MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..5", newDebug); | 182 | MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug); |
| 183 | return; | 183 | return; |
| 184 | } | 184 | } |
| 185 | 185 | ||