diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Monitoring/Checks/Check.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Monitoring/Checks/Check.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Monitoring/Checks/Check.cs b/OpenSim/Framework/Monitoring/Checks/Check.cs index 594386a..9a1bd45 100644 --- a/OpenSim/Framework/Monitoring/Checks/Check.cs +++ b/OpenSim/Framework/Monitoring/Checks/Check.cs | |||
| @@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring | |||
| 79 | string category, | 79 | string category, |
| 80 | string container, | 80 | string container, |
| 81 | Func<Check, bool> checkFunc, | 81 | Func<Check, bool> checkFunc, |
| 82 | StatVerbosity verbosity) | 82 | StatVerbosity verbosity) |
| 83 | { | 83 | { |
| 84 | if (ChecksManager.SubCommands.Contains(category)) | 84 | if (ChecksManager.SubCommands.Contains(category)) |
| 85 | throw new Exception( | 85 | throw new Exception( |
| @@ -108,9 +108,9 @@ namespace OpenSim.Framework.Monitoring | |||
| 108 | public virtual string ToConsoleString() | 108 | public virtual string ToConsoleString() |
| 109 | { | 109 | { |
| 110 | return string.Format( | 110 | return string.Format( |
| 111 | "{0}.{1}.{2} - {3}", | 111 | "{0}.{1}.{2} - {3}", |
| 112 | Category, | 112 | Category, |
| 113 | Container, | 113 | Container, |
| 114 | ShortName, | 114 | ShortName, |
| 115 | Description); | 115 | Description); |
| 116 | } | 116 | } |