summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-01-16 07:05:01 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-01-16 07:05:01 +0200
commitbea930071f470fb9a8d61fdd5dd8cc0deec9f95b (patch)
tree0c99e7eafdfb10463754c5645e3b5647cf7f36fa /indra/newview/lldrawpoolbump.cpp
parenta0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff)
parent5d6371f568f3dcd8eb7c88a9e5d65224522528d4 (diff)
Merge branch 'contribute' into DRTVWR-577-maint-S
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 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