Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

HMD.mounted instead of HMD.isMounted

Browse source
This commit is contained in:
David Kelly 2017-04-10 08:05:01 -07:00
parent 948a821824
commit 3ea6cac45a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/resources/qml/hifi/Pal.qml
View file

@ -921,17 +921,10 @@ Rectangle {
property string notLoggedInInstructions: "<b><font color='red'>You must be logged into your High Fidelity account to make connections.</b></font><br>"
property string instructions:
"<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>"
// Text
text:
Account.isLoggedIn() ?
HMD.isMounted ?
instructions + hmdMountedInstructions
: instructions + hmdNotMountedInstructions
:
HMD.isMounted ?
notLoggedInInstructions + instructions + hmdMountedInstructions
: notLoggedInInstructions + instructions + hmdNotMountedInstructions
Account.isLoggedIn() ? ( HMD.mounted ? instructions + hmdMountedInstructions : instructions + hmdNotMountedInstructions)
: ( HMD.mounted ? notLoggedInInstructions + instructions + hmdMountedInstructions : notLoggedInInstructions + instructions + hmdNotMountedInstructions
}
}