summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp18
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)