diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/llcommon/llthread.h | |
parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ merge
Diffstat (limited to 'indra/llcommon/llthread.h')
-rw-r--r-- | indra/llcommon/llthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 50202631e7..9f1c589fcd 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -152,7 +152,7 @@ public: //============================================================================ -extern LL_COMMON_API void assert_main_thread(); +extern LL_COMMON_API bool assert_main_thread(); extern LL_COMMON_API bool on_main_thread(); #endif // LL_LLTHREAD_H |