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

BUILD.md

@@ -106,3 +106,4 @@ The following build options can be used when running CMake
 #### Devices
 
 You can support external input/output devices such as Leap Motion, MIDI, and more by adding each individual SDK in the visible building path. Refer to the readme file available in each device folder in [interface/external/](interface/external) for the detailed explanation of the requirements to use the device.
+ 

interface/resources/qml/LoginDialog.qml

@@ -13,15 +13,14 @@ import QtQuick 2.4
 import controlsUit 1.0 as HifiControlsUit
 import stylesUit 1.0 as HifiStylesUit
 
-import "LoginDialog"
-
 FocusScope {
     id: root
-    HifiStylesUit.HifiConstants { id: hifi }
     objectName: "LoginDialog"
     property bool shown: true
     visible: shown
 
+    HifiStylesUit.HifiConstants { id: hifi }
+
     anchors.fill: parent
 
     readonly property bool isTablet: false
@@ -33,12 +32,17 @@ FocusScope {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isPassword: false
-    property string title: ""
+
-    property string text: ""
-    property int titleWidth: 0
     property alias bannerWidth: banner.width
     property alias bannerHeight: banner.height
 
+    property string title: ""
+    property string text: ""
+
+    property int titleWidth: 0
+
+    property bool isHMD: HMD.active
+
     function tryDestroy() {
         root.destroy()
     }

interface/resources/qml/dialogs/TabletLoginDialog.qml

@@ -23,43 +23,36 @@ FocusScope {
     objectName: "LoginDialog"
     visible: true
 
+    HifiStylesUit.HifiConstants { id: hifi }
+
     anchors.fill: parent
-    width: parent.width
-    height: parent.height
 
-    property var tabletProxy: Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    readonly property bool isTablet: true
-
+    readonly property bool isOverlay: false
-    property bool isHMD: HMD.active
-    property bool gotoPreviousApp: false;
 
+    property string iconText: hifi.glyphs.avatar
+    property int iconSize: 35
     property bool keyboardEnabled: false
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isPassword: false
 
-    readonly property bool isTablet: true
-    readonly property bool isOverlay: false
-    property alias text: loginKeyboard.mirroredText
-
-    property int titleWidth: 0
     property alias bannerWidth: banner.width
     property alias bannerHeight: banner.height
-    property string iconText: hifi.glyphs.avatar
-    property int iconSize: 35
 
-    property var pane: QtObject {
+    property int titleWidth: 0
-        property real width: root.width
-        property real height: root.height
-    }
 
-    function tryDestroy() {
+    property bool isHMD: HMD.active
-        tabletProxy.gotoHomeScreen();
-    }
 
-    MouseArea {
+    // TABLET SPECIFIC PROPERTIES START //
-        width: root.width
+    property alias text: loginKeyboard.mirroredText
-        height: root.height
+
-    }
+    width: parent.width
+    height: parent.height
+
+    property var tabletProxy: Tablet.getTablet("com.highfidelity.interface.tablet.system")
+
+    property bool gotoPreviousApp: false
 
     property bool keyboardOverride: true
 
@@ -70,7 +63,20 @@ FocusScope {
     property alias loginDialog: loginDialog
     property alias hifi: hifi
 
-    HifiStylesUit.HifiConstants { id: hifi }
+    property var pane: QtObject {
+        property real width: root.width
+        property real height: root.height
+    }
+
+    MouseArea {
+        width: root.width
+        height: root.height
+    }
+    // TABLET SPECIFIC PROPERTIES END //
+
+    function tryDestroy() {
+            tabletProxy.gotoHomeScreen();
+    }
 
     Timer {
         id: keyboardTimer
@@ -102,6 +108,15 @@ FocusScope {
         anchors.fill: parent
     }
 
+    Rectangle {
+        z: -6
+        id: opaqueRect
+        height: parent.height
+        width: parent.width
+        opacity: 0.65
+        color: "black"
+    }
+
     Item {
         z: -5
         id: bannerContainer
@@ -119,15 +134,6 @@ FocusScope {
         }
     }
 
-    Rectangle {
-        z: -6
-        id: opaqueRect
-        height: parent.height
-        width: parent.width
-        opacity: 0.65
-        color: "black"
-    }
-
     HifiControlsUit.Keyboard {
         id: loginKeyboard
         raised: root.keyboardEnabled && root.keyboardRaised

interface/resources/qml/hifi/Desktop.qml

@@ -12,6 +12,8 @@ import controlsUit 1.0
 OriginalDesktop.Desktop {
     id: desktop
 
+    property alias toolbarObjectName: sysToolbar.objectName
+
     MouseArea {
         id: hoverWatch
         anchors.fill: parent
@@ -70,7 +72,12 @@ OriginalDesktop.Desktop {
         x: sysToolbar.x
         buttonModel: tablet ? tablet.buttons : null;
         shown: tablet ? tablet.toolbarMode : false;
+
+        onVisibleChanged: {
+            desktop.toolbarVisibleChanged(visible, sysToolbar.objectName);
+        }
     }
+    signal toolbarVisibleChanged(bool isVisible, string toolbarName);
 
     QtSettings.Settings {
         id: settings;

interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml

@@ -122,7 +122,7 @@ Rectangle {
                 Tablet.playSound(TabletEnums.ButtonClick);
                 // Can't use `Window.location` in QML, so just use what setting `Window.location` actually calls under the hood:
                 // AddressManager.handleLookupString().
-                AddressManager.handleLookupString(LocationBookmarks.getHomeLocationAddress());
+                AddressManager.handleLookupString(LocationBookmarks.getAddress("hqhome"));
             }
         }
     }

interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml

@@ -47,6 +47,11 @@ Rectangle {
 
         onSkeletonModelURLChanged: {
             root.updatePreviewUrl();
+
+            if (MyAvatar.skeletonModelURL.indexOf("defaultAvatar" > -1) && topBarInventoryModel.count > 0) {
+                Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
+                MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
+            }
         }
     }
 

interface/src/Application.cpp

@@ -2708,6 +2708,7 @@ void Application::cleanupBeforeQuit() {
     }
 
     getEntities()->shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
+    getEntities()->clear();
 
     // Clear any queued processing (I/O, FBX/OBJ/Texture parsing)
     QThreadPool::globalInstance()->clear();

interface/src/PerformanceManager.cpp

@@ -63,9 +63,15 @@ PerformanceManager::PerformancePreset PerformanceManager::getPerformancePreset()
 
 void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformancePreset preset) {
 
+    // Ugly case that prevent us to run deferred everywhere...
+    bool isDeferredCapable = platform::Profiler::isRenderMethodDeferredCapable();
+
     switch (preset) {
         case PerformancePreset::HIGH:
-            RenderScriptingInterface::getInstance()->setRenderMethod(RenderScriptingInterface::RenderMethod::DEFERRED);
+            RenderScriptingInterface::getInstance()->setRenderMethod( ( isDeferredCapable ?
+                RenderScriptingInterface::RenderMethod::DEFERRED : 
+                RenderScriptingInterface::RenderMethod::FORWARD ) );
+
             RenderScriptingInterface::getInstance()->setShadowsEnabled(true);
             qApp->getRefreshRateManager().setRefreshRateProfile(RefreshRateManager::RefreshRateProfile::REALTIME);
 
@@ -73,7 +79,10 @@ void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformanceP
 
         break;
         case PerformancePreset::MID:
-            RenderScriptingInterface::getInstance()->setRenderMethod(RenderScriptingInterface::RenderMethod::DEFERRED);
+            RenderScriptingInterface::getInstance()->setRenderMethod((isDeferredCapable ?
+                RenderScriptingInterface::RenderMethod::DEFERRED :
+                RenderScriptingInterface::RenderMethod::FORWARD));
+
             RenderScriptingInterface::getInstance()->setShadowsEnabled(false);
             qApp->getRefreshRateManager().setRefreshRateProfile(RefreshRateManager::RefreshRateProfile::INTERACTIVE);
             DependencyManager::get<LODManager>()->setWorldDetailQuality(0.5f);

interface/src/avatar/AvatarManager.cpp

@@ -490,7 +490,7 @@ void AvatarManager::buildPhysicsTransaction(PhysicsEngine::Transaction& transact
     _myAvatar->getCharacterController()->buildPhysicsTransaction(transaction);
     for (auto avatar : _otherAvatarsToChangeInPhysics) {
         bool isInPhysics = avatar->isInPhysicsSimulation();
-        if (isInPhysics != avatar->shouldBeInPhysicsSimulation()) {
+        if (isInPhysics != avatar->shouldBeInPhysicsSimulation() || avatar->_needsReinsertion) {
             if (isInPhysics) {
                 transaction.objectsToRemove.push_back(avatar->_motionState);
                 avatar->_motionState = nullptr;

launchers/darwin/src/Launcher.m

@@ -46,6 +46,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 }
 
 -(void)awakeFromNib {
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:TRUE];
     [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
                                                            selector:@selector(didTerminateApp:)
                                                                name:NSWorkspaceDidTerminateApplicationNotification
@@ -114,6 +115,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
                                        userInfo:nil
                                         repeats:NO];
     }
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:TRUE];
 }
 
 - (void) setDownloadContextFilename:(NSString *)aFilename
@@ -277,6 +279,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 
 -(void)onSplashScreenTimerFinished:(NSTimer *)timer
 {
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:TRUE];
     [self showLoginScreen];
 }
 
@@ -336,6 +339,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
     NSString* scriptsPath = [[self getAppPath] stringByAppendingString:@"interface.app/Contents/Resources/scripts/simplifiedUI/"];
     NSString* domainUrl = [[Settings sharedSettings] getDomainUrl];
     NSString* userToken = [[Launcher sharedLauncher] getTokenString];
+    NSString* homeBookmark = [[NSString stringWithFormat:@"hqhome="] stringByAppendingString:domainUrl];
     NSArray* arguments;
     if (userToken != nil) {
         arguments = [NSArray arrayWithObjects:
@@ -344,6 +348,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
                         @"--cache", contentPath,
                         @"--displayName", displayName,
                         @"--scripts", scriptsPath,
+                        @"--setBookmark", homeBookmark,
                         @"--no-updater",
                         @"--no-launcher", nil];
     } else {
@@ -351,6 +356,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
                             @"--url" , domainUrl,
                             @"--cache", contentPath,
                             @"--scripts", scriptsPath,
+                            @"--setBookmark", homeBookmark,
                             @"--no-updater",
                             @"--no-launcher", nil];
     }

launchers/win32/LauncherManager.cpp

@@ -234,9 +234,10 @@ HWND LauncherManager::launchApplication() {
         CString parsedTokens = _tokensJSON;
         parsedTokens.Replace(_T("\""), _T("\\\""));
         tokensParam = _T("--tokens \"");
-        tokensParam += parsedTokens + _T("\"");
+        tokensParam += parsedTokens + _T("\" ");
     }
-    CString params = urlParam + scriptsParam + cacheParam + nameParam + tokensParam + EXTRA_PARAMETERS;
+    CString bookmarkParam = _T("--setBookmark hqhome=\"") + _domainURL + ("\" ");
+    CString params = urlParam + scriptsParam + cacheParam + nameParam + tokensParam + bookmarkParam + EXTRA_PARAMETERS;
     _shouldLaunch = FALSE;
     return LauncherUtils::executeOnForeground(interfaceExe, params);
 }

libraries/platform/src/platform/Profiler.cpp

@@ -12,6 +12,7 @@
 
 #include "Platform.h"
 #include "PlatformKeys.h"
+#include <qglobal.h>
 
 using namespace platform;
 
@@ -125,3 +126,34 @@ bool filterOnProcessors(const platform::json& computer, const platform::json& cp
     // Not able to profile
     return false;
 }
+
+// Ugly very adhoc capability check to know if a particular hw can REnder with Deferred method or not
+// YES for PC  windows and linux
+// NO for android
+// YES on macos EXCEPT for macbookair with gpu intel iris or intel HD 6000
+bool Profiler::isRenderMethodDeferredCapable() {
+#if defined(Q_OS_MAC)
+    auto computer = platform::getComputer();
+    const auto computerModel = (computer.count(keys::computer::model) ? computer[keys::computer::model].get<std::string>() : "");
+
+    auto gpuInfo = platform::getGPU(0);
+    const auto gpuModel = (gpuInfo.count(keys::gpu::model) ? gpuInfo[keys::gpu::model].get<std::string>() : "");
+    
+    
+    // Macbook air 2018 are a problem
+    if ((computerModel.find("MacBookAir") != std::string::npos) && (gpuModel.find("Intel HD Graphics 6000") != std::string::npos)) {
+        return false;
+    }
+    
+    // We know for fact that one INtel Iris is problematic, not enough info yet for sure
+    // if ((gpuModel.find("Intel Iris ....") != std::string::npos)) {
+    //     return false;
+    //}
+
+    return true;
+#elif defined(Q_OS_ANDROID)
+    return false;
+#else
+    return true;
+#endif
+}

libraries/platform/src/platform/Profiler.h

@@ -28,6 +28,9 @@ public:
     static const std::array<const char*, Tier::NumTiers> TierNames;
 
     static Tier profilePlatform();
+
+    // Ugly very adhoc capability check to know if a particular hw can REnder with Deferred method or not
+    static bool isRenderMethodDeferredCapable();
 };
 
 }

libraries/shared/src/GPUIdent.cpp

@@ -47,6 +47,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
     GLint rendererInfoCount;
     CGLError err = CGLQueryRendererInfo(cglDisplayMask, &rendererInfo, &rendererInfoCount);
     GLint j, numRenderers = 0, deviceVRAM, bestVRAM = 0;
+    int bestGPUid = 0;
     err = CGLQueryRendererInfo(cglDisplayMask, &rendererInfo, &numRenderers);
     if (0 == err) {
         // Iterate over all of them and use the figure for the one with the most VRAM,
@@ -55,6 +56,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
         for (j = 0; j < numRenderers; j++) {
             CGLDescribeRenderer(rendererInfo, j, kCGLRPVideoMemoryMegabytes, &deviceVRAM);
             if (deviceVRAM > bestVRAM) {
+                bestGPUid = j;
                 bestVRAM = deviceVRAM;
                 _isValid = true;
             }
@@ -78,6 +80,8 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
     for (int i = 0; i < parts.size(); ++i) {
         if (parts[i].toLower().contains("radeon") || parts[i].toLower().contains("nvidia")) {
             _name=parts[i];
+        } else if (i == bestGPUid) {
+            _name=parts[i];
         }
     }
 

libraries/ui/src/OffscreenUi.cpp

@@ -27,6 +27,7 @@
 #include "VrMenu.h"
 
 #include "ui/Logging.h"
+#include "ui/ToolbarScriptingInterface.h"
 
 #include <PointerManager.h>
 #include "MainWindow.h"
@@ -688,6 +689,10 @@ void OffscreenUi::createDesktop(const QUrl& url) {
             menuInitializer(_vrMenu);
         }
 
+
+        auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>();
+        connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString)));
+
         auto keyboardFocus = new KeyboardFocusHack();
         connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
         emit desktopReady();

libraries/ui/src/ui/OffscreenQmlSurface.cpp

@@ -686,43 +686,52 @@ void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool n
         return;
     }
 
-#if !defined(Q_OS_ANDROID)
+    bool android = false;
-    // if HMD is being worn, allow keyboard to open.  allow it to close, HMD or not.
+#if defined(Q_OS_ANDROID)
-    if (!raised || qApp->property(hifi::properties::HMD).toBool()) {
+    android = true;
-        QQuickItem* item = dynamic_cast<QQuickItem*>(object);
+#endif
-        if (!item) {
-            return;
-        }
 
-        // for future probably makes sense to consider one of the following:
+    bool hmd = qApp->property(hifi::properties::HMD).toBool();
-        // 1. make keyboard a singleton, which will be dynamically re-parented before showing
-        // 2. track currently visible keyboard somewhere, allow to subscribe for this signal
-        // any of above should also eliminate need in duplicated properties and code below
 
-        while (item) {
+    if (!android || hmd) {
-            // Numeric value may be set in parameter from HTML UI; for QML UI, detect numeric fields here.
+        // if HMD is being worn, allow keyboard to open.  allow it to close, HMD or not.
-            numeric = numeric || QString(item->metaObject()->className()).left(7) == "SpinBox";
+        if (!raised || hmd) {
-
+            QQuickItem* item = dynamic_cast<QQuickItem*>(object);
-            if (item->property("keyboardRaised").isValid()) {
+            if (!item) {
-                // FIXME - HMD only: Possibly set value of "keyboardEnabled" per isHMDMode() for use in WebView.qml.
-                if (item->property("punctuationMode").isValid()) {
-                    item->setProperty("punctuationMode", QVariant(numeric));
-                }
-                if (item->property("passwordField").isValid()) {
-                    item->setProperty("passwordField", QVariant(passwordField));
-                }
-
-                if (raised) {
-                    item->setProperty("keyboardRaised", QVariant(!raised));
-                }
-
-                item->setProperty("keyboardRaised", QVariant(raised));
                 return;
             }
-            item = dynamic_cast<QQuickItem*>(item->parentItem());
+
+            // for future probably makes sense to consider one of the following:
+            // 1. make keyboard a singleton, which will be dynamically re-parented before showing
+            // 2. track currently visible keyboard somewhere, allow to subscribe for this signal
+            // any of above should also eliminate need in duplicated properties and code below
+
+            while (item) {
+                // Numeric value may be set in parameter from HTML UI; for QML UI, detect numeric fields here.
+                numeric = numeric || QString(item->metaObject()->className()).left(7) == "SpinBox";
+
+                if (item->property("keyboardRaised").isValid()) {
+
+                    if (item->property("punctuationMode").isValid()) {
+                        item->setProperty("punctuationMode", QVariant(numeric));
+                    }
+                    if (item->property("passwordField").isValid()) {
+                        item->setProperty("passwordField", QVariant(passwordField));
+                    }
+
+                    if (hmd && item->property("keyboardEnabled").isValid()) {
+                        item->setProperty("keyboardEnabled", true);
+                    }
+
+                    item->setProperty("keyboardRaised", QVariant(raised));
+
+                    return;
+                }
+                item = dynamic_cast<QQuickItem*>(item->parentItem());
+            }
         }
     }
-#endif
+
 }
 
 void OffscreenQmlSurface::emitScriptEvent(const QVariant& message) {

libraries/ui/src/ui/ToolbarScriptingInterface.h

@@ -150,6 +150,9 @@ public:
      * @returns {ToolbarProxy}
      */
     Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId);
+
+signals:
+    void toolbarVisibleChanged(bool isVisible, QString toolbarName);
 };
 
 

scripts/developer/utilities/render/luci.qml

@@ -26,8 +26,9 @@ Rectangle {
     color: global.color
 
     ScrollView {
-        id: control
+        id: scrollView
         anchors.fill: parent 
+        contentWidth: parent.width
         clip: true
          
         Column {

scripts/developer/utilities/render/performanceSetup.qml

@@ -24,8 +24,11 @@ Rectangle {
     color: global.colorBack
 
     ScrollView {
+        id: scrollView
         anchors.fill: parent 
+        contentWidth: parent.width
         clip: true
+
         Column { 
             anchors.left: parent.left 
             anchors.right: parent.right 
@@ -35,8 +38,6 @@ Rectangle {
                 isUnfold: true
                 panelFrameData: Component {
                     PerformanceSettings {
-                        anchors.left: parent.left 
-                        anchors.right: parent.right 
                     }
                 }
             }
@@ -45,8 +46,6 @@ Rectangle {
                 isUnfold: true
                 panelFrameData: Component {
                     RenderSettings {
-                        anchors.left: parent.left 
-                        anchors.right: parent.right 
                     }
                 }
             }
@@ -54,8 +53,6 @@ Rectangle {
                 label: "Platform"
                 panelFrameData: Component {
                     Platform {
-                        anchors.left: parent.left 
-                        anchors.right: parent.right  
                     }
                 }
             }

scripts/simplifiedUI/system/progress.js

@@ -83,9 +83,7 @@
         // The initial delay cooldown keeps us from tracking progress before the allotted time
         // has passed.
         INITIAL_DELAY_COOLDOWN_TIME = 1000,
-        initialDelayCooldown = 0,
+        initialDelayCooldown = 0;
-
-        isInInterstitialMode = false;
 
     function fade() {
 
@@ -267,7 +265,7 @@
 
         // Update state
         if (!visible) { // Not visible because no recent downloads
-            if ((displayProgress < 100 || gpuTextures > 0) && !isInInterstitialMode && !isInterstitialOverlaysVisible) { // Have started downloading so fade in
+            if (displayProgress < 100 || gpuTextures > 0) { // Have started downloading so fade in
                 visible = true;
                 alphaDelta = ALPHA_DELTA_IN;
                 fadeTimer = Script.setInterval(fade, FADE_INTERVAL);
@@ -307,9 +305,6 @@
             } else {
                 x = x * BAR_HMD_REPEAT;
             }
-            if (isInInterstitialMode || isInterstitialOverlaysVisible) {
-                visible = false;
-            }
 
             // Update progress bar
             Overlays.editOverlay(barDesktop.overlay, {
@@ -349,10 +344,6 @@
         }
     }
 
-    function interstitialModeChanged(inMode) {
-        isInInterstitialMode = inMode;
-    }
-
     function setUp() {
         var is4k = Window.innerWidth > 3000;
 
@@ -378,7 +369,6 @@
     }
 
     setUp();
-    Window.interstitialModeChanged.connect(interstitialModeChanged);
     GlobalServices.downloadInfoChanged.connect(onDownloadInfoChanged);
     GlobalServices.updateDownloadInfo();
     Script.setInterval(update, 1000 / 60);

scripts/simplifiedUI/ui/simplifiedUI.js

@@ -415,7 +415,7 @@ function getInputDeviceMutedOverlayTopY() {
 var inputDeviceMutedOverlay = false;
 var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_X_PX = 353;
 var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_Y_PX = 95;
-var INPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX = 20;
+var INPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX = 20 + TOP_BAR_HEIGHT_PX;
 function updateInputDeviceMutedOverlay(isMuted) {
     if (isMuted) {
         var props = {
@@ -457,16 +457,18 @@ function onGeometryChanged(rect) {
     }
 }
 
-var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700;
 function onDisplayModeChanged(isHMDMode) {
     if (isHMDMode) {
         Camera.setModeString("first person");
-    } else if (Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) {
+    }
-        // works for now, but not a permanent fix by any means.
+}
-        Script.setTimeout(function () {
+
-            var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
+function onToolbarVisibleChanged(isVisible, toolbarName) {
+    if (isVisible && toolbarName == TOOLBAR_NAME && !Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) {
+        var toolbar = Toolbars.getToolbar(toolbarName);
+        if (toolbar) {
             toolbar.writeProperty("visible", false);
-        }, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS);
+        }
     }
 }
 
@@ -497,7 +499,9 @@ function startup() {
 
         if (!HMD.active) {
             var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
-            toolbar.writeProperty("visible", false);
+            if (toolbar) {
+                toolbar.writeProperty("visible", false);
+            }
         }
     }
 
@@ -517,6 +521,7 @@ function startup() {
     Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.systemInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
+    Toolbars.toolbarVisibleChanged.connect(onToolbarVisibleChanged);
 
     oldShowAudioTools = AvatarInputs.showAudioTools;
     AvatarInputs.showAudioTools = false;
@@ -573,6 +578,7 @@ function shutdown() {
     Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.systemInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
+    Toolbars.toolbarVisibleChanged.disconnect(onToolbarVisibleChanged);
 
     AvatarInputs.showAudioTools = oldShowAudioTools;
     AvatarInputs.showBubbleTools = oldShowBubbleTools;