summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2019-08-27 16:52:22 +0000
committerGraham Madarasz <graham@lindenlab.com>2019-08-27 16:52:22 +0000
commit3fe7577f5ba15477ef65637ca159e5ff92dcbade (patch)
tree6bdf032f23906235b6c7d85554e193d5b7c56165 /indra/newview/llviewerregion.cpp
parentf79fc96d08e37f119653f7db5a299a05454ff79c (diff)
parent2cd01c8e92e2ecf4402a3a075ec8bdc6a8f20470 (diff)
Merged in graham_linden/viewer-eep-g (pull request #486)
Default
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 4c9e57f0b4..4b05ec6e2b 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3240,6 +3240,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") &&