diff options
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index b818a66b30..31fd699335 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -31,6 +31,7 @@ #include <thread> #include "llinventorymodel.h" +#include "llthread.h" #include "llaisapi.h" #include "llagent.h" @@ -2505,7 +2506,7 @@ void LLInventoryModel::waitForPendingCacheWrites() { if (thread.joinable()) { - thread.join(); + ll_join_thread(thread); } } sPendingCacheThreads.clear(); |