Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index f2329ce..ffd5132 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -280,7 +280,8 @@ namespace OpenSim.Framework.Monitoring
                 }
 
                 if (lastSample != null && penultimateSample != null)
-                    lastChangeOverTime = (double)lastSample - (double)penultimateSample;
+                    lastChangeOverTime 
+                        = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
 
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a91adfa..53bd2e2 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN7";
+                names[1] = "UserUMMTGUN8";
 
                 return false;
             }
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
                     // disappeared.
                     user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU3";
+                    user.LastName = "UserUMMAU4";
                 }
 
                 AddUserInternal(user);