diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
commit | 8bcff54654f9ec98d166dabd38180be63dc8837c (patch) | |
tree | 65d1744531195f7ec3bd8eee000928dcd8ca62a9 /indra/llcommon/lltimer.cpp | |
parent | 4af7cd51e9cc22d9dc2fe42e378051c55515ac8e (diff) | |
parent | db013ab0cb7dafb964b149a36b6963770f7427e5 (diff) |
Merge remote branch 'develop'into release/luau-scripting
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 28d6e4e4cc..f36d223100 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -34,7 +34,7 @@ #include <thread> #if LL_WINDOWS -# include "llwin32headerslean.h" +# include "llwin32headers.h" #elif LL_LINUX || LL_DARWIN # include <errno.h> # include <sys/time.h> |