diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-13 15:26:26 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-13 15:26:26 -0700 |
| commit | 8dc048be46f167ab1be993ca22b79997a491c680 (patch) | |
| tree | 1ee5aff8e85565671003df1ff290c916cc1e3049 /indra/llplugin/llpluginclassmedia.cpp | |
| parent | b1cab5d24687b07c124e0dcd61485fa9e368c882 (diff) | |
| parent | 7a64e8f8bfeff17d6a5385a6c39f1056214cb59f (diff) | |
Merge
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 9d447b0f37..78b1483810 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) |