diff options
author | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
commit | 5a47a3cb2366b9da9a595d37c88703497e111005 (patch) | |
tree | 1e255fecfda9bf1582d8d76a48e950a561a811a1 /indra/llcommon/llthread.h | |
parent | 03c75201605067b0e97aba0333f8ea6d45d10804 (diff) | |
parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
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 |