summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-03-12 17:24:07 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-03-12 17:24:07 -0400
commitd9e3a2948af710741c99014bef03e8d97f69804c (patch)
tree98ed67f97cb6522f80c3720b4d1ae623e4c5920f /indra/newview/llfeaturemanager.cpp
parent895d52a399739962c38ddf571e57f85362823dff (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rwxr-xr-xindra/newview/llfeaturemanager.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 2b90383749..b9500b59d7 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -937,6 +937,14 @@ void LLFeatureManager::applyBaseMasks()
maskFeatures("VRAMGT512");
}
+#if LL_DARWIN
+ const LLOSInfo& osInfo = LLAppViewer::instance()->getOSInfo();
+ if (osInfo.mMajorVer == 10 && osInfo.mMinorVer < 7)
+ {
+ maskFeatures("OSX_10_6_8");
+ }
+#endif
+
// now mask by gpu string
// Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces
std::string gpustr = mGPUString;