diff options
author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
---|---|---|
committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
commit | 0ea94d2948ba8237fd39fa0df219e07ee44c9ff1 (patch) | |
tree | 71b56d5d6937a66166ca17eb0413a4a88c363113 /indra/llcommon/llthread.cpp | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merged master into DRTVWR-539
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rw-r--r-- | indra/llcommon/llthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 0b9dec969c..98905f3b71 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -36,7 +36,7 @@ #include "lltracethreadrecorder.h" #include "llexception.h" -#if LL_LINUX || LL_SOLARIS +#if LL_LINUX #include <sched.h> #endif |