From 27ebf0dc6344a16c6829283514dab12a2ed7045a Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Wed, 24 Apr 2019 18:20:34 +0300 Subject: [PATCH] =?UTF-8?q?SL-10811=20-=20[Render][OSX]=20Google=C3=A2?= =?UTF-8?q?=E2=82=AC=E2=84=A2s=20search=20results=20page=20is=20not=20full?= =?UTF-8?q?y=20displayed=20in=20the=20Media=20Browser=20if=20HiDPI=20is=20?= =?UTF-8?q?enabled.=20SL-10813=20-=20[Render][OSX]=20HiDPI=20browser=20has?= =?UTF-8?q?=20black=20bars=20on=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 feb5d86852..c08b636b30 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)