diff options
| author | simon <none@none> | 2013-09-09 12:59:17 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-09-09 12:59:17 -0700 |
| commit | e7ac4695e31821118dd1bc9ddc95f46f012abbda (patch) | |
| tree | f971732dddf9173d5a9a75163f5e8312a3d5054a /indra/newview/llfloaterhardwaresettings.cpp | |
| parent | 36dea0dad802158a0e546220163f4461fbd3e204 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release
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(); |