diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-02-14 13:57:49 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-02-14 13:57:49 -0800 |
| commit | 38c6c55794679bcab8832c519cb8f8744c5f6c2d (patch) | |
| tree | 0a0c805908efbff622b194b0797fac5ee64eb270 /indra/newview | |
| parent | d7b902d57503dddca59c3d7a772e4f6a454afa7b (diff) | |
| parent | e7021407cbd08581fb15e166f67933ce03f147cd (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/featuretable_mac.txt | 5 | ||||
| -rwxr-xr-x | indra/newview/llfeaturemanager.cpp | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 0bdd425504..a2d68eb550 100755 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 35 +version 36 // The version number above should be implemented IF AND ONLY IF some // change has been made that is sufficiently important to justify // resetting the graphics preferences of all users to the recommended @@ -628,3 +628,6 @@ Disregard128DefaultDrawDistance 1 0 list NVIDIA_GeForce_Go_7400 Disregard128DefaultDrawDistance 1 0 +list OSX_10_6_8 +RenderDeferred 0 0 + 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; |