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/lldrawpoolbump.cpp | |
| 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/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 8db6a10e26..ed991a2bbf 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -77,7 +77,9 @@ static S32 cube_channel = -1; static S32 diffuse_channel = -1; static S32 bump_channel = -1; -#define LL_BUMPLIST_MULTITHREADED 0 // TODO -- figure out why this doesn't work +// Enabled after changing LLViewerTexture::mNeedsCreateTexture to an +// LLAtomicBool; this should work just fine, now. HB +#define LL_BUMPLIST_MULTITHREADED 1 // static void LLStandardBumpmap::init() |