summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorcosmic-linden <111533034+cosmic-linden@users.noreply.github.com>2024-02-09 07:16:01 -0800
committerGitHub <noreply@github.com>2024-02-09 09:16:01 -0600
commitd6048bfcb2442ca7ec278864b9827d74873efa3a (patch)
tree9a76192342b7ca42ae754d9518606b2545109ca3 /indra/newview/llviewerregion.cpp
parente24f631110c4fb3ca135b6d6dfaa448062e2f9bd (diff)
Put PBR material swatch behind feature flag (#775)
* secondlife/viewer#771: Put PBR material swatch behind feature flag * secondlife/viewer#771: Make viewer respect PBRMaterialSwatchEnabled from SimulatorFeatures
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index cea083e07d..5b51267cbe 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2459,6 +2459,16 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
}
gSavedSettings.setBOOL("RenderMirrors", mirrors_enabled);
+
+ if (mSimulatorFeatures.has("PBRMaterialSwatchEnabled"))
+ {
+ bool enabled = mSimulatorFeatures["PBRMaterialSwatchEnabled"];
+ gSavedSettings.setBOOL("UIPreviewMaterial", enabled);
+ }
+ else
+ {
+ gSavedSettings.setBOOL("UIPreviewMaterial", false);
+ }
}
//this is called when the parent is not cacheable.