diff options
author | Robert Adams | 2013-11-15 14:56:13 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
tree | bea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Framework/Monitoring/Stats/Stat.cs | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Framework/Monitoring/Stats/Stat.cs')
-rw-r--r-- | OpenSim/Framework/Monitoring/Stats/Stat.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs index 2b34493..e095801 100644 --- a/OpenSim/Framework/Monitoring/Stats/Stat.cs +++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs | |||
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Monitoring | |||
231 | Container, | 231 | Container, |
232 | ShortName, | 232 | ShortName, |
233 | Value, | 233 | Value, |
234 | UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName)); | 234 | string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName)); |
235 | 235 | ||
236 | AppendMeasuresOfInterest(sb); | 236 | AppendMeasuresOfInterest(sb); |
237 | 237 | ||
@@ -316,9 +316,9 @@ namespace OpenSim.Framework.Monitoring | |||
316 | sb.AppendFormat( | 316 | sb.AppendFormat( |
317 | ", {0:0.##}{1}/s, {2:0.##}{3}/s", | 317 | ", {0:0.##}{1}/s, {2:0.##}{3}/s", |
318 | lastChangeOverTime, | 318 | lastChangeOverTime, |
319 | UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), | 319 | string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), |
320 | averageChangeOverTime, | 320 | averageChangeOverTime, |
321 | UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName)); | 321 | string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName)); |
322 | } | 322 | } |
323 | } | 323 | } |
324 | } | 324 | } |