diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-01-06 16:40:33 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-01-06 16:40:33 +0100 |
| commit | 12204b210e5279b0bfba5601d34195739cab6ab8 (patch) | |
| tree | 7f2736cb787a31379505590052e53b893b8cb729 /indra/newview/lldrawpoolbump.cpp | |
| parent | 58a329be6667c45aeff66b802e80144877a10772 (diff) | |
| parent | f3f3c493ec2a658cf5c1aac6670c54c550e944fd (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-489-emoji
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() |