summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-06 12:03:00 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-06 12:03:00 +0300
commit1f80e72fcfe2d3dfa7dc6e45526cf5973588a318 (patch)
tree0533b4ca4f29f8e2f684301f01b5fb0ec280fa18 /indra
parent2d416222f80a02927fa454842dbb0523b784119e (diff)
parentdf8bd0c24fba337d0448844b2106eeff3b387ef1 (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml4
-rw-r--r--indra/newview/llviewerwindow.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 916781e85b..49601ae98f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16319,9 +16319,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
- <key>Backup</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
</map>
</llsd>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 51969a7091..6d351f0639 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1764,7 +1764,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
mWindow->getSize(&scr);
// Reset UI scale factor on first run if OS's display scaling is not 100%
- if (gSavedSettings.getBOOL("FSResetUIScaleOnFirstRun"))
+ if (gSavedSettings.getBOOL("ResetUIScaleOnFirstRun"))
{
if (mWindow->getSystemUISize() != 1.f)
{