summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-08-29 15:43:02 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-08-29 15:43:02 +0300
commite439f0366fffe336ad42c09596427ef35596992c (patch)
tree5f998d175b411c76691388f1909dd5ebda0cc202 /indra/newview/llviewerregion.cpp
parentd13b4d18030ec5748adf7960a3a5ce367440f96e (diff)
parent5986bf4826d04027a17a098d1b80064aabde5a7b (diff)
Merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp6
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") &&