Merge branch 'master' of github.com:highfidelity/hifi into punk

domain-server/src/DomainContentBackupManager.cpp

@@ -127,6 +127,10 @@ int64_t DomainContentBackupManager::getMostRecentBackupTimeInSecs(const QString&
 }
 
 void DomainContentBackupManager::setup() {
+    for (auto& rule : _backupRules) {
+        removeOldBackupVersions(rule);
+    }
+
     auto backups = getAllBackups();
     for (auto& backup : backups) {
         QFile backupFile { backup.absolutePath };

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -275,6 +275,9 @@ Item {
                         Settings.setValue("keepMeLoggedIn/savedUsername", "");
                     }
                 }
+                Component.onCompleted: {
+                    keepMeLoggedInCheckbox.checked = !Account.loggedIn;
+                }
             }
             HifiControlsUit.Button {
                 id: cancelButton

interface/resources/qml/LoginDialog/SignUpBody.qml

@@ -320,6 +320,9 @@ Item {
                         Settings.setValue("keepMeLoggedIn/savedUsername", "");
                     }
                 }
+                Component.onCompleted: {
+                    keepMeLoggedInCheckbox.checked = !Account.loggedIn;
+                }
             }
 
             TextMetrics {

interface/src/Application.cpp

@@ -5176,7 +5176,13 @@ void Application::pauseUntilLoginDetermined() {
         return;
     }
 
-    getMyAvatar()->setEnableMeshVisible(false);
+    auto myAvatar = getMyAvatar();
+    _previousAvatarTargetScale = myAvatar->getTargetScale();
+    _previousAvatarSkeletonModel = myAvatar->getSkeletonModelURL().toString();
+    myAvatar->setTargetScale(1.0f);
+    myAvatar->setSkeletonModelURLFromScript(myAvatar->defaultFullAvatarModelUrl().toString());
+    myAvatar->setEnableMeshVisible(false);
+
     _controllerScriptingInterface->disableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
 
     {
@@ -5231,7 +5237,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
         userInputMapper->unloadMapping(NO_MOVEMENT_MAPPING_JSON);
         _controllerScriptingInterface->disableMapping(NO_MOVEMENT_MAPPING_NAME);
     }
-    getMyAvatar()->setEnableMeshVisible(true);
+
+    auto myAvatar = getMyAvatar();
+    myAvatar->setTargetScale(_previousAvatarTargetScale);
+    myAvatar->setSkeletonModelURLFromScript(_previousAvatarSkeletonModel);
+    myAvatar->setEnableMeshVisible(true);
+
     _controllerScriptingInterface->enableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
 
     const auto& nodeList = DependencyManager::get<NodeList>();

interface/src/Application.h

@@ -691,6 +691,8 @@ private:
 
     bool _loginDialogPoppedUp = false;
     bool _developerMenuVisible{ false };
+    QString _previousAvatarSkeletonModel;
+    float _previousAvatarTargetScale;
     CameraMode _previousCameraMode;
     OverlayID _loginDialogOverlayID;
     LoginStateManager _loginStateManager;

interface/src/avatar/MyAvatar.cpp

@@ -1479,6 +1479,7 @@ void MyAvatar::loadData() {
     setSnapTurn(_useSnapTurnSetting.get());
     setDominantHand(_dominantHandSetting.get(DOMINANT_RIGHT_HAND).toLower());
     setUserHeight(_userHeightSetting.get(DEFAULT_AVATAR_HEIGHT));
+    setTargetScale(_scaleSetting.get());
 
     setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible));
     _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing));

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp

@@ -291,7 +291,7 @@ QByteArray RenderablePolyVoxEntityItem::volDataToArray(quint16 voxelXSize, quint
     withReadLock([&] {
         if (isEdged()) {
             low += 1;
-            voxelSize += 1;
+            voxelSize += 2;
         }
 
         loop3(low, voxelSize, [&](const ivec3& v){