OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

TeleportWork
Diva Canto 2013-07-24 11:26:30 -07:00
parent e103e34f1d feef9d64a4
commit 665fb66686
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Monitoring/Stats/Stat.cs
View File

@ -280,7 +280,8 @@ namespace OpenSim.Framework.Monitoring
} }
if (lastSample != null && penultimateSample != null) 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; int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;

4
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
} }
names[0] = "Unknown"; names[0] = "Unknown";
names[1] = "UserUMMTGUN7"; names[1] = "UserUMMTGUN8";
return false; 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 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
// disappeared. // disappeared.
user.FirstName = "Unknown"; user.FirstName = "Unknown";
user.LastName = "UserUMMAU3"; user.LastName = "UserUMMAU4";
} }
AddUserInternal(user); AddUserInternal(user);