diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-12-09 17:40:08 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-12-09 17:40:08 +0200 |
| commit | 3387fb48979bceb539937c97915de932e70d7520 (patch) | |
| tree | 4da899b5802a993277c779e9abec39d4f0f0b804 /indra/newview/llviewertexture.h | |
| parent | 94cc9149477e59411f7b0fc96823296f121e1b4f (diff) | |
| parent | 4a554bfded4b916576054ffb19963a8a52dc719d (diff) | |
Merge branch 'SL-18824' into DRTVWR-573-maint-R
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. |