summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAnchor <none@none>2019-04-10 11:47:57 -0700
committerAnchor <none@none>2019-04-10 11:47:57 -0700
commit4b1c786c6e7236d45be33bbf216be142dbfa33c2 (patch)
treee414dd7a512d6d885b3f6e1ac2ea236ec4e82619 /indra/newview/llappviewer.cpp
parent83fe55c429181a2adb67346db79becf00d501536 (diff)
parent5cf18cb867be567bf921f0b94a78fd822e4112ad (diff)
Merge
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 d3577d50a1..1bc21ec469 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()