diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-02 15:01:50 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-02 15:01:50 -0400 |
| commit | 18c84a9d6ad2381836a0c8263a8e9cb800b6c28e (patch) | |
| tree | 6410603aa44e66f726aebe030ecfa31d37db1f68 /indra/llcommon/llfasttimer.cpp | |
| parent | f25c2a56c0c8079163e9ef18f6a9e590341b1e1a (diff) | |
| parent | 6dba35d74e27125b39860f9a3df176d7f3a087b5 (diff) | |
Merge branch 'release/2025.07' into project/lua_editor
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 722743f453..1c5fe9d2f5 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -64,7 +64,7 @@ bool BlockTimer::sLog = false; std::string BlockTimer::sLogName = ""; bool BlockTimer::sMetricLog = false; -#if LL_LINUX +#if LL_LINUX || (LL_DARWIN && LL_ARM64) U64 BlockTimer::sClockResolution = 1000000000; // Nanosecond resolution #else U64 BlockTimer::sClockResolution = 1000000; // Microsecond resolution |