mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 07:53:08 +02:00
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
This commit is contained in:
commit
58e8d4071d
1 changed files with 1 additions and 7 deletions
|
@ -6,11 +6,5 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
openLoginWindow = function openLoginWindow() {
|
openLoginWindow = function openLoginWindow() {
|
||||||
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|
Menu.triggerOption("Login/Sign Up");
|
||||||
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
|
|
||||||
Menu.triggerOption("Login/Sign Up");
|
|
||||||
} else {
|
|
||||||
tablet.loadQMLOnTop("dialogs/TabletLoginDialog.qml");
|
|
||||||
HMD.openTablet();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue