From c2aba01f36eb1bd82718ac2cea6810a80bea93cc Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 2 Nov 2023 20:53:30 +0200
Subject: SL-20561 Rename Blinn Phong to Textures in the build floater

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 3f4e3e804f..fe01996623 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -152,7 +152,7 @@
              top_pad="5"
              width="90">
                 <combo_box.item
-                 label="Blinn-Phong"
+                 label="Textures"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item
-- 
cgit v1.2.3


From ca300cc46ffe6f1cdda30556c46cbb1f0b8435b5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 3 Nov 2023 10:54:01 -0500
Subject: SL-20567 Default HiDPI off (mac performance improvement)

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 75c78d1ace..b9025ef7cd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9017,7 +9017,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
     <key>RenderPerformanceTest</key>
     <map>
-- 
cgit v1.2.3


From 70721bae390ab49ff24022c5c8f75bc274adc8c8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 3 Nov 2023 11:15:19 -0500
Subject: DRTVWR-559 Fix for mac build.

---
 indra/llwindow/llwindowmacosx.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index b99af1ae4c..778e5d3898 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1962,10 +1962,12 @@ public:
 void* LLWindowMacOSX::createSharedContext()
 {
     sharedContext* sc = new sharedContext();
-    CGLError err = CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
-    llassert(err == kCGLNoError);
-
-    CGLEnable(mContext, kCGLCEMPEngine);
+    CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
+    
+    if (sUseMultGL)
+    {
+        CGLEnable(mContext, kCGLCEMPEngine);
+    }
 
     return (void *)sc;
 }
-- 
cgit v1.2.3