diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-26 17:45:23 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-26 17:45:23 -0500 |
| commit | 4e1c599550a0132265758275fe31af4cb5fbe589 (patch) | |
| tree | 405d2ed04843a060d3ad0c8fa8825b7b517d6240 | |
| parent | 654dd60ca7310db940e09065a3f6e7fec377c956 (diff) | |
| parent | bdb75f2c0938fc059b7c78c08a4eae24f5641b64 (diff) | |
merge
| -rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index e8f1d58df8..adf41df5cb 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -37,6 +37,7 @@ #include "llspinctrl.h" #include "llstartup.h" #include "lltextbox.h" +#include "llcombobox.h" #include "pipeline.h" // Linden library includes @@ -148,6 +149,13 @@ BOOL LLFloaterHardwareSettings::postBuild() { childSetAction("OK", onBtnOK, this); + if (gGLManager.mIsIntel) + { //remove FSAA settings above "4x" + LLComboBox* combo = getChild<LLComboBox>("fsaa"); + combo->remove("8x"); + combo->remove("16x"); + } + refresh(); center(); |