diff options
| author | Dave Simmons <simon@lindenlab.com> | 2008-06-25 16:22:00 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2008-06-25 16:22:00 +0000 |
| commit | 580f9088b4644c1d9e41a25deac42dc487e9d5c1 (patch) | |
| tree | eed42644b0593ba613a809f806b6f03c8910377e /indra/llcommon/llstat.cpp | |
| parent | 12284eee5a508cd80382352c9f6aeb455297a310 (diff) | |
svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
Diffstat (limited to 'indra/llcommon/llstat.cpp')
| -rw-r--r-- | indra/llcommon/llstat.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp index e999934b62..21b723de71 100644 --- a/indra/llcommon/llstat.cpp +++ b/indra/llcommon/llstat.cpp @@ -76,10 +76,11 @@ public: U64 LLStatAccum::impl::sScaleTimes[IMPL_NUM_SCALES] = { + USEC_PER_SEC / 10, // 100 millisec USEC_PER_SEC * 1, // seconds USEC_PER_SEC * 60, // minutes - USEC_PER_SEC * 60 * 2 // minutes -#if 0 + USEC_PER_SEC * 60 * 2 // two minutes +#if ENABLE_LONG_TIME_STATS // enable these when more time scales are desired USEC_PER_SEC * 60*60, // hours USEC_PER_SEC * 24*60*60, // days |