Merge branch 'develop' into marchcat/b-develop

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoicewebrtc.cpp

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index bf046e200f..fcc3423b4d 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -392,7 +392,7 @@ bool LLFeatureManager::loadGPUClass()
         catch (const std::exception& e)
         {
             // HACK - ensure that profiling is disabled
-            LLGLSLShader::finishProfile(false);
+            LLGLSLShader::finishProfile();
             gbps = -1.f;
             LL_WARNS("RenderInit") << "GPU benchmark failed: " << e.what() << LL_ENDL;
         }
@@ -628,6 +628,14 @@ void LLFeatureManager::applyBaseMasks()
     {
         maskFeatures("Intel");
     }
+    if (gGLManager.mIsApple)
+    {
+        maskFeatures("AppleGPU");
+    }
+    else
+    {
+        maskFeatures("NonAppleGPU");
+    }
     if (gGLManager.mGLVersion < 3.f)
     {
         maskFeatures("OpenGLPre30");