diff options
author | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:36:43 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:36:43 -0700 |
commit | cddce7bbb8975c27d561e9868e8a28f48e2a5208 (patch) | |
tree | 1563f6857ae47a53d83940fc2f1457564267b3de /indra/newview/llviewerregion.cpp | |
parent | ed7fda069bcbf145a273b46cb2070c72d059acef (diff) | |
parent | 5986bf4826d04027a17a098d1b80064aabde5a7b (diff) |
Merge viewer-release 6.3.1
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r-- | indra/newview/llviewerregion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 4d9288f152..439f675a2d 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -3235,6 +3235,12 @@ bool LLViewerRegion::meshUploadEnabled() const mSimulatorFeatures["MeshUploadEnabled"].asBoolean()); } +bool LLViewerRegion::bakesOnMeshEnabled() const +{ + return (mSimulatorFeatures.has("BakesOnMeshEnabled") && + mSimulatorFeatures["BakesOnMeshEnabled"].asBoolean()); +} + bool LLViewerRegion::meshRezEnabled() const { return (mSimulatorFeatures.has("MeshRezEnabled") && |