aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Monitoring/Stats/Stat.cs3
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
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
280 } 280 }
281 281
282 if (lastSample != null && penultimateSample != null) 282 if (lastSample != null && penultimateSample != null)
283 lastChangeOverTime = (double)lastSample - (double)penultimateSample; 283 lastChangeOverTime
284 = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
284 285
285 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1; 286 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
286 287
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
389 } 389 }
390 390
391 names[0] = "Unknown"; 391 names[0] = "Unknown";
392 names[1] = "UserUMMTGUN7"; 392 names[1] = "UserUMMTGUN8";
393 393
394 return false; 394 return false;
395 } 395 }
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
601 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or 601 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
602 // disappeared. 602 // disappeared.
603 user.FirstName = "Unknown"; 603 user.FirstName = "Unknown";
604 user.LastName = "UserUMMAU3"; 604 user.LastName = "UserUMMAU4";
605 } 605 }
606 606
607 AddUserInternal(user); 607 AddUserInternal(user);