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

This commit is contained in:
David Back 2018-10-16 13:52:27 -07:00
commit 58e8d4071d

View file

@ -6,11 +6,5 @@
//
openLoginWindow = function openLoginWindow() {
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Menu.triggerOption("Login/Sign Up");
} else {
tablet.loadQMLOnTop("dialogs/TabletLoginDialog.qml");
HMD.openTablet();
}
Menu.triggerOption("Login/Sign Up");
};