aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Monitoring
diff options
context:
space:
mode:
authorMelanie2013-11-23 19:13:22 +0000
committerMelanie2013-11-23 19:13:22 +0000
commit3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
treea833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Framework/Monitoring
parentMerge branch 'master' into careminster (diff)
parentRevert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
downloadopensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz
Merge branch 'master' into careminster
Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
Diffstat (limited to 'OpenSim/Framework/Monitoring')
-rw-r--r--OpenSim/Framework/Monitoring/Stats/Stat.cs6
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 }