summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-13 21:55:22 +0000
committerAura Linden <aura@lindenlab.com>2014-03-13 21:55:22 +0000
commit706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch)
treea918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llfeaturemanager.cpp
parentd2bb4dae980a887a30b206875d8f9419901ed66a (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merged in viewer-release
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 73607e100a..ba6f26d3ef 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -925,6 +925,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;