summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-01-18 03:42:24 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-01-18 03:42:24 +0200
commit7f883354888b3fb39f19cad7809bd3efea9b457c (patch)
tree99b85d6babcaa73b60423dabf1b1c6af240d07ab /indra/newview/lldrawpoolbump.cpp
parenta0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff)
parent6850b915fe42f5a75fc9d8bb9ca05f961de3244a (diff)
Merge remote-tracking branch 'KittyBarnett/texture-preview' into DRTVWR-579-texture-preview
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