summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-12-14 10:22:48 -0600
committerRunitaiLinden <davep@lindenlab.com>2023-12-14 10:22:48 -0600
commit7bfe590a3669a005d4269cdcf378891080264dce (patch)
tree5d018f5cab9c37bd74bee773d64d255a33bfffbe /indra/newview/llviewermenu.cpp
parent9212e0944203fdbdefbaae01a89600a0050b3a36 (diff)
parentfeece92f2bb7525a7b2a99170ed60a40fac7777e (diff)
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 553eaaf9b2..9db9d97ddc 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -787,6 +787,10 @@ U32 render_type_from_string(std::string render_type)
{
return LLPipeline::RENDER_TYPE_BUMP;
}
+ else if ("pbr" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_GLTF_PBR;
+ }
else
{
return 0;