summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-02 22:12:55 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-02 22:12:55 +0300
commit65bf63c973caa388c33dd02470b1cf4c818834e2 (patch)
treeb66489b924a5418425fbffbc50d43bcb5916c7b4 /indra/newview/llappviewer.cpp
parenteb6a7cde9d08215f18b9b9c707f39f73b60403a8 (diff)
parent5cf18cb867be567bf921f0b94a78fd822e4112ad (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c308663a62..577082f01f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -276,6 +276,10 @@ extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
extern BOOL gDebugGL;
+#if LL_DARWIN
+extern BOOL gHiDPISupport;
+#endif
+
////////////////////////////////////////////////////////////
// All from the last globals push...
@@ -589,6 +593,10 @@ static void settings_to_globals()
gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale");
+
+#if LL_DARWIN
+ gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI");
+#endif
}
static void settings_modify()