summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-03-26 17:44:26 -0500
committerDave Parks <davep@lindenlab.com>2012-03-26 17:44:26 -0500
commitbdb75f2c0938fc059b7c78c08a4eae24f5641b64 (patch)
tree69bc257992fe3f90e1fa036236ffc8d98195a97b /indra/newview
parentce0f455b7cb5a5d45e7682e4a4180b577eda3c5a (diff)
MAINT-792 Only allow up to 4x FSAA on Intel graphics.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterhardwaresettings.cpp8
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();