diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2022-11-21 17:50:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-21 17:50:37 -0600 |
| commit | f3f3c493ec2a658cf5c1aac6670c54c550e944fd (patch) | |
| tree | 40c08451a3e110e423a1d7a44dc134b560f23ecc /indra/newview/llviewertexture.h | |
| parent | 783926e124a96414443dfb9dcb5229e698ef29e7 (diff) | |
| parent | 9c5043d8c62ae0d321d01560098edf67bf17ebf7 (diff) | |
Merge pull request #6 from sldevel/master
Fix a thread safety issue in the GL image worker.
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. |