Do not abort when a shutdown thread joins itself (#40)

std::thread::join throws system_error if the caller is the thread being
joined. That uncaught exception aborted the process during shutdown.
Detach the current thread instead, and catch a join that still throws.

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();