diff options
| author | Diva Canto | 2013-07-24 11:26:30 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-24 11:26:30 -0700 |
| commit | 665fb666862ba15dc275f0d6b506970bac8015da (patch) | |
| tree | e60128d14ae01a0e2547fad3e75aec30a8716648 /OpenSim/Framework | |
| parent | Added config var that we all thought was already there: see_into_region. (Not... (diff) | |
| parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
| download | opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.zip opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.gz opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.bz2 opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Monitoring/Stats/Stat.cs | 3 |
1 files changed, 2 insertions, 1 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 | ||