From 20ca495012499ffd71c2d403d1303b01b0db2dcd Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Wed, 24 Apr 2019 18:20:34 +0300
Subject: [PATCH] =?UTF-8?q?SL-10811=20-=20[Render][OSX]=20Google=E2=80=99s?=
=?UTF-8?q?=20search=20results=20page=20is=20not=20fully=20displayed=20in?=
=?UTF-8?q?=20the=20Media=20Browser=20if=20HiDPI=20is=20enabled.=20SL-1081?=
=?UTF-8?q?3=20-=20[Render][OSX]=20HiDPI=20browser=20has=20black=20bars=20?=
=?UTF-8?q?on=20the=20sides.=20Fixed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
indra/llplugin/llpluginclassmedia.cpp | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 9d447b0f373..78b14838102 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -33,7 +33,10 @@
#include "llpluginmessageclasses.h"
#include "llcontrol.h"
-extern LLControlGroup gSavedSettings;
+extern LLControlGroup gSavedSettings;
+#if LL_DARWIN
+extern BOOL gHiDPISupport;
+#endif
static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
@@ -365,11 +368,16 @@ void LLPluginClassMedia::setSizeInternal(void)
mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight);
}
- if(mRequestedMediaWidth > 2048)
- mRequestedMediaWidth = 2048;
+#if LL_DARWIN
+ if (!gHiDPISupport)
+#endif
+ {
+ if (mRequestedMediaWidth > 2048)
+ mRequestedMediaWidth = 2048;
- if(mRequestedMediaHeight > 2048)
- mRequestedMediaHeight = 2048;
+ if (mRequestedMediaHeight > 2048)
+ mRequestedMediaHeight = 2048;
+ }
}
void LLPluginClassMedia::setAutoScale(bool auto_scale)
--
GitLab