Commits

Anonymous committed 2f03ba7 Merge

Merge

  • Participants
  • Parent commits d520053, 37079fa

Comments (0)

Files changed (1)

File indra/newview/llfloaterhardwaresettings.cpp

 #include "llspinctrl.h"
 #include "llstartup.h"
 #include "lltextbox.h"
+#include "llcombobox.h"
 #include "pipeline.h"
 
 // Linden library includes
 {
 	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();