summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-06 19:13:08 -0500
committerDave Parks <davep@lindenlab.com>2011-06-06 19:13:08 -0500
commit5cfc4764db10b91b5f34dc29d1505faaf597c7b7 (patch)
tree9bdf3a47475f34d7459ad5108e72cc087e9b5f58 /indra/newview/llviewerregion.cpp
parentc4b7728f0ef19efcaef02ccabf7d98f5b340cfd3 (diff)
parentb3fbb12f155ae1acc6b4d258d1c383d5d8e47964 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 80207d6568..a370e83410 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1716,4 +1716,16 @@ std::string LLViewerRegion::getDescription() const
return stringize(*this);
}
+bool LLViewerRegion::meshUploadEnabled() const
+{
+ return (mSimulatorFeatures.has("MeshUploadEnabled") &&
+ mSimulatorFeatures["MeshUploadEnabled"].asBoolean());
+}
+
+bool LLViewerRegion::meshRezEnabled() const
+{
+ return (mSimulatorFeatures.has("MeshRezEnabled") &&
+ mSimulatorFeatures["MeshRezEnabled"].asBoolean());
+}
+