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

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
                 Container, 
                 ShortName, 
                 Value, 
-                UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
 
@@ -316,9 +316,9 @@ namespace OpenSim.Framework.Monitoring
                 sb.AppendFormat(
                     ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
                     lastChangeOverTime, 
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
                     averageChangeOverTime,
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
             }
         }
     }