summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-12-09 17:40:08 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-12-09 17:40:08 +0200
commit3387fb48979bceb539937c97915de932e70d7520 (patch)
tree4da899b5802a993277c779e9abec39d4f0f0b804 /indra/newview/lldrawpoolbump.cpp
parent94cc9149477e59411f7b0fc96823296f121e1b4f (diff)
parent4a554bfded4b916576054ffb19963a8a52dc719d (diff)
Merge branch 'SL-18824' into DRTVWR-573-maint-R
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r--indra/newview/lldrawpoolbump.cpp4
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()