From fe26a9d32c422fa26cfd82e92f93ad33654c2c51 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 30 Jul 2022 01:36:56 +0300 Subject: SL-17868 Crash at ThreadRecorder::bringUpToDate According to bugsplat get_thread_recorder was null Replaced apr based LLThreadLocalPointer with thread_local --- indra/llcommon/lltracethreadrecorder.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/llcommon/lltracethreadrecorder.h') diff --git a/indra/llcommon/lltracethreadrecorder.h b/indra/llcommon/lltracethreadrecorder.h index a797c6687e..8fd1e5ef58 100644 --- a/indra/llcommon/lltracethreadrecorder.h +++ b/indra/llcommon/lltracethreadrecorder.h @@ -32,7 +32,6 @@ #include "llmutex.h" #include "lltraceaccumulators.h" -#include "llthreadlocalstorage.h" namespace LLTrace { @@ -92,7 +91,7 @@ namespace LLTrace }; - const LLThreadLocalPointer& get_thread_recorder(); + ThreadRecorder* get_thread_recorder(); void set_thread_recorder(ThreadRecorder*); void set_master_thread_recorder(ThreadRecorder*); -- cgit v1.2.3