diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-08-26 10:16:11 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-08-26 10:16:11 -0700 |
| commit | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (patch) | |
| tree | a3ee5c304c1eadbeef32f0f46a3d9a712260d24b /indra | |
| parent | 70cacc4d17790f13d62188a49d814f94da9301d5 (diff) | |
MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA modes on Mac
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterhardwaresettings.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index 664f7d4fd6..792a2a5d25 100755 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -151,12 +151,17 @@ BOOL LLFloaterHardwareSettings::postBuild() { childSetAction("OK", onBtnOK, this); +// Don't do this on Mac as their braindead GL versioning +// sets this when 8x and 16x are indeed available +// +#if !LL_DARWIN if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f) { //remove FSAA settings above "4x" LLComboBox* combo = getChild<LLComboBox>("fsaa"); combo->remove("8x"); combo->remove("16x"); } +#endif refresh(); center(); |