diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-12-07 10:47:14 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-12-07 10:47:14 -0500 |
| commit | 6ef3df54b3ff0dcfed3000819209a7633e53a32b (patch) | |
| tree | 73ed71440562d1b272672793b7bb0727001bd5d0 /indra/newview/llviewertexture.h | |
| parent | 590e158cf36b6e6fca07f54837db084fe8a163c6 (diff) | |
| parent | 59b826e66e658d9d9a4f19dcabdccbc79ec3590c (diff) | |
SL-18330: Merge 'contribute' of secondlife/viewer into sl-18330
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index b953d7006b..2f5e0d01df 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -27,6 +27,7 @@ #ifndef LL_LLVIEWERTEXTURE_H #define LL_LLVIEWERTEXTURE_H +#include "llatomic.h" #include "llgltexture.h" #include "lltimer.h" #include "llframetimer.h" @@ -528,7 +529,9 @@ protected: LLFrameTimer mStopFetchingTimer; // Time since mDecodePriority == 0.f. BOOL mInImageList; // TRUE if image is in list (in which case don't reset priority!) - BOOL mNeedsCreateTexture; + // This needs to be atomic, since it is written both in the main thread + // and in the GL image worker thread... HB + LLAtomicBool mNeedsCreateTexture; BOOL mForSculpt ; //a flag if the texture is used as sculpt data. BOOL mIsFetched ; //is loaded from remote or from cache, not generated locally. |