summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermenu.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
2 files changed, 14 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;
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2c4b03251a..660f4b62c7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2162,6 +2162,16 @@ function="World.EnvPreset"
function="Advanced.ToggleRenderType"
parameter="bump" />
</menu_item_check>
+ <menu_item_check
+ label="PBR"
+ name="Rendering Type PBR">
+ <menu_item_check.on_check
+ function="Advanced.CheckRenderType"
+ parameter="pbr" />
+ <menu_item_check.on_click
+ function="Advanced.ToggleRenderType"
+ parameter="pbr" />
+ </menu_item_check>
</menu>
<menu
create_jump_keys="true"