diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 00:10:24 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 00:10:24 -0500 |
| commit | faf9693be3f34cd1ef28e21ae1bd2bc466221c4e (patch) | |
| tree | 332b8d1e39f60d3486386fff4017fdfcc76651dd /indra/newview | |
| parent | d58c560e727e1b868c1a2364471a3138b59d9eae (diff) | |
Make basehull assert even more forgiving (only error out on 10% over bounds).
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index a370e83410..1dd92cd926 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1716,16 +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());
-}
+bool LLViewerRegion::meshUploadEnabled() const +{ + return (mSimulatorFeatures.has("MeshUploadEnabled") && + mSimulatorFeatures["MeshUploadEnabled"].asBoolean()); +} + +bool LLViewerRegion::meshRezEnabled() const +{ + return (mSimulatorFeatures.has("MeshRezEnabled") && + mSimulatorFeatures["MeshRezEnabled"].asBoolean()); +} |