Merged in lindenlab/viewer-bear

meow-7.2.2
AndreyL ProductEngine 2019-04-06 12:03:00 +03:00
commit 1f80e72fcf
2 changed files with 2 additions and 4 deletions

View File

@ -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>

View File

@ -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)
{