Merge branch 'master' into feature/openvr-linux

interface/resources/qml/LoginDialog.qml

@@ -3,10 +3,10 @@
 //
 //  Created by David Rowe on 3 Jun 2015
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//
 //  Distributed under the Apache License, Version 2.0.
-//
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
 
 import Hifi 1.0
 import QtQuick 2.4

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -3,6 +3,7 @@
 //
 //  Created by Clement on 7/18/16
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -486,6 +487,7 @@ Item {
                 }
             }
         }
+
         Item {
             id: signUpContainer
             width: loginContainer.width
@@ -494,7 +496,7 @@ Item {
             anchors {
                 left: loginContainer.left
                 top: loginContainer.bottom
-                topMargin: 0.15 * parent.height
+                topMargin: 0.05 * parent.height
             }
             TextMetrics {
                 id: signUpTextMetrics
@@ -542,7 +544,24 @@ Item {
                         "errorString": "" });
                 }
             }
+
+            Text {
+                id: signUpTextSecond
+                text: qsTr("or")
+                anchors {
+                    left: signUpShortcutText.right
+                    leftMargin: hifi.dimensions.contentSpacing.x
                 }
+                lineHeight: 1
+                color: "white"
+                font.family: linkAccountBody.fontFamily
+                font.pixelSize: linkAccountBody.textFieldFontSize
+                font.bold: linkAccountBody.fontBold
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+                visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus;
+            }
+
             TextMetrics {
                 id: dismissButtonTextMetrics
                 font: loginErrorMessage.font
@@ -550,15 +569,14 @@ Item {
             }
             HifiControlsUit.Button {
                 id: dismissButton
-            width: dismissButtonTextMetrics.width
+                width: loginButton.width
                 height: d.minHeightButton
                 anchors {
-                bottom: parent.bottom
+                    top: signUpText.bottom
-                right: parent.right
+                    topMargin: hifi.dimensions.contentSpacing.y
-                margins: 3 * hifi.dimensions.contentSpacing.y
+                    left: loginButton.left
                 }
-            color: hifi.buttons.noneBorderlessWhite
+                text: qsTr("Use without account, log in anonymously")
-            text: qsTr("No thanks, take me in-world! >")
                 fontCapitalization: Font.MixedCase
                 fontFamily: linkAccountBody.fontFamily
                 fontSize: linkAccountBody.fontSize
@@ -576,6 +594,7 @@ Item {
                 }
             }
         }
+    }
 
     Connections {
         target: loginDialog

scripts/system/create/edit.js

@@ -603,8 +603,8 @@ var toolBar = (function () {
                 Script.setTimeout(dimensionsCheckFunction, DIMENSIONS_CHECK_INTERVAL);
             }
             // Make sure the model entity is loaded before we try to figure out
-            // its dimensions.
+            // its dimensions. We need to give ample time to load the entity.
-            var MAX_LOADED_CHECKS = 10;
+            var MAX_LOADED_CHECKS = 100; // 100 * 100ms = 10 seconds.
             var LOADED_CHECK_INTERVAL = 100;
             var isLoadedCheckCount = 0;
             var entityIsLoadedCheck = function() {
@@ -612,11 +612,19 @@ var toolBar = (function () {
                 if (isLoadedCheckCount === MAX_LOADED_CHECKS || Entities.isLoaded(entityID)) {
                     var naturalDimensions = Entities.getEntityProperties(entityID, "naturalDimensions").naturalDimensions;
                     
+                    if (isLoadedCheckCount === MAX_LOADED_CHECKS) {
+                        console.log("Model entity failed to load in time: " + (MAX_LOADED_CHECKS * LOADED_CHECK_INTERVAL) + " ... setting dimensions to: " + JSON.stringify(naturalDimensions))
+                    }
+                    
                     Entities.editEntity(entityID, {
                         visible: true,
                         dimensions: naturalDimensions
                     })
                     dimensionsCheckCallback();
+                    // We want to update the selection manager again since the script has moved on without us.
+                    selectionManager.clearSelections(this);
+                    entityListTool.sendUpdate();
+                    selectionManager.setSelections([entityID], this);
                     return;
                 }
                 Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);