Merge branch 'main' into webrtc-voice

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 10920f1de3..9207e6ad73 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1001,6 +1001,7 @@ LLGLManager::LLGLManager() :
     mIsAMD(FALSE),
     mIsNVIDIA(FALSE),
     mIsIntel(FALSE),
+    mIsApple(FALSE),
 #if LL_DARWIN
     mIsMobileGF(FALSE),
 #endif
@@ -1174,6 +1175,11 @@ bool LLGLManager::initGL()
         mGLVendorShort = "INTEL";
         mIsIntel = TRUE;
     }
+    else if(mGLVendor.find("APPLE") != std::string::npos)
+    {
+        mGLVendorShort = "APPLE";
+        mIsApple = TRUE;
+    }
     else
     {
         mGLVendorShort = "MISC";
@@ -1373,6 +1379,7 @@ void LLGLManager::asLLSD(LLSD& info)
     info["is_ati"] = mIsAMD;  // note, do not rename is_ati to is_amd without coordinating with DW
     info["is_nvidia"] = mIsNVIDIA;
     info["is_intel"] = mIsIntel;
+    info["is_apple"] = mIsApple;
 
     info["gl_renderer"] = mGLRenderer;
 }