diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-28 14:26:01 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-28 14:26:01 -0500 | 
| commit | 886d743a18cf57ca2ebd7ccf6d9c26afc4293140 (patch) | |
| tree | 867411b2a61c80d26119589622204a0523da0403 | |
| parent | fc95597c63166c527f92f9170ccdc67a51f01481 (diff) | |
| parent | 8fd20991f42ce632ec58459881a8c26b77ecaf0f (diff) | |
merge
| -rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index adf41df5cb..116bd241c4 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -149,7 +149,7 @@ BOOL LLFloaterHardwareSettings::postBuild()  {  	childSetAction("OK", onBtnOK, this); -	if (gGLManager.mIsIntel) +	if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)  	{ //remove FSAA settings above "4x"  		LLComboBox* combo = getChild<LLComboBox>("fsaa");  		combo->remove("8x");  | 
