diff options
| author | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
| commit | cbb7480ca76cbe11c40f05a269583201dd044796 (patch) | |
| tree | 8ce39d5a975d66a5c6a38e47460c2330f15a087e /indra/newview/lldrawpoolbump.cpp | |
| parent | 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 (diff) | |
| parent | 12204b210e5279b0bfba5601d34195739cab6ab8 (diff) | |
Fix merge conflicts after auto merge
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 c4c88d304c..e6b6b10408 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -78,7 +78,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 |