diff options
author | Brad Linden <brad@lindenlab.com> | 2022-12-12 17:59:34 -0800 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2022-12-12 17:59:34 -0800 |
commit | eb526fec0aadcaf30363fdfb1e253a609bf83acc (patch) | |
tree | 6071628f41ca793007b645aa30d255044ddbfe43 /indra/newview/pipeline.h | |
parent | c9c611fd12f55ac6d6717ba17139ba61a6db581f (diff) | |
parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 32e46a8db0..c0add04cca 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -485,7 +485,7 @@ public: RENDER_TYPE_PASS_SIMPLE_RIGGED = LLRenderPass::PASS_SIMPLE_RIGGED, RENDER_TYPE_PASS_GRASS = LLRenderPass::PASS_GRASS, RENDER_TYPE_PASS_FULLBRIGHT = LLRenderPass::PASS_FULLBRIGHT, - RENDER_TYPE_PASS_FULLBRIGHT_RIGGED = LLRenderPass::PASS_FULLBRIGHT, + RENDER_TYPE_PASS_FULLBRIGHT_RIGGED = LLRenderPass::PASS_FULLBRIGHT_RIGGED, RENDER_TYPE_PASS_INVISIBLE = LLRenderPass::PASS_INVISIBLE, RENDER_TYPE_PASS_INVISIBLE_RIGGED = LLRenderPass::PASS_INVISIBLE_RIGGED, RENDER_TYPE_PASS_INVISI_SHINY = LLRenderPass::PASS_INVISI_SHINY, |