diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
commit | aec39a0f9f7f16a7970e96bad552ca684af57e3f (patch) | |
tree | 742bfd7fee6d2cf98a9a93b5fc3d17ff2ca6557c /indra/llcommon/lltimer.cpp | |
parent | 6ef3df54b3ff0dcfed3000819209a7633e53a32b (diff) | |
parent | 23a3da37a91ea80311b5820c48a12d56b989f69d (diff) |
SL-18330: Merge branch 'contribute' into sl-18330-merge
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
-rw-r--r-- | indra/llcommon/lltimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index aaa6df325c..74ec62d347 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -123,7 +123,7 @@ U32 micro_sleep(U64 us, U32 max_yields) // interrupts at 250 Hz (every 4,000 microseconds). const U64 KERNEL_SLEEP_INTERVAL_US = 4000; - S32 num_sleep_intervals = (us - (KERNEL_SLEEP_INTERVAL_US >> 1)) / KERNEL_SLEEP_INTERVAL_US; + auto num_sleep_intervals = (us - (KERNEL_SLEEP_INTERVAL_US >> 1)) / KERNEL_SLEEP_INTERVAL_US; if (num_sleep_intervals > 0) { U64 sleep_time = (num_sleep_intervals * KERNEL_SLEEP_INTERVAL_US) - (KERNEL_SLEEP_INTERVAL_US >> 1); |