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/lldrawpoolbump.cpp | |
| parent | 590e158cf36b6e6fca07f54837db084fe8a163c6 (diff) | |
| parent | 59b826e66e658d9d9a4f19dcabdccbc79ec3590c (diff) | |
SL-18330: Merge 'contribute' of secondlife/viewer into sl-18330
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() |