Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index c8692224f1..8140aaab22 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -259,7 +259,6 @@ bool LLFeatureManager::loadFeatureTables()
     // *TODO - if I or anyone else adds something else to the skipped list
     // make this data driven.  Put it in the feature table and parse it
     // correctly
-    mSkippedFeatures.insert("RenderAnisotropic");
     mSkippedFeatures.insert("RenderGamma");
     mSkippedFeatures.insert("RenderVBOEnable");
     mSkippedFeatures.insert("RenderFogRatio");
@@ -510,10 +509,9 @@ bool LLFeatureManager::loadGPUClass()
             mGPUClass = GPU_CLASS_5;
         }
 
-    #if LL_WINDOWS
-        const F32Gigabytes MIN_PHYSICAL_MEMORY(8);
-
         LLMemory::updateMemoryInfo();
+    #if LL_WINDOWS || LL_LINUX
+        const F32Gigabytes MIN_PHYSICAL_MEMORY(8);
         F32Gigabytes physical_mem = LLMemory::getMaxMemKB();
         if (MIN_PHYSICAL_MEMORY > physical_mem && mGPUClass > GPU_CLASS_1)
         {
@@ -756,6 +754,10 @@ void LLFeatureManager::applyBaseMasks()
     {
         maskFeatures("VRAMLT2GB");
     }
+    if (!gGLManager.mHasAnisotropic || 2.f > gGLManager.mMaxAnisotropy)
+    {
+        maskFeatures("AnisotropicMissing");
+    }
     if (gGLManager.mGLVersion < 3.99f)
     {
         maskFeatures("GL3");