diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
| commit | 8a0b7eaaddf9170db5f205d94f680915da13239c (patch) | |
| tree | 7b2028fa1bbb4fa64adcc4a1298952465cd87539 /indra/newview/llfloaterhardwaresettings.cpp | |
| parent | d995782edf1a55c327ad3f3349bd9d4b6ec3d9e6 (diff) | |
| parent | e2019e8a3b5175eb6d7322fbe7c466f213854640 (diff) | |
Merge for MAINT-3117
Diffstat (limited to 'indra/newview/llfloaterhardwaresettings.cpp')
| -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(); |