Skip to content

Commit

Permalink
Merge pull request #1298 from vircadia/fix/pal-teleport-tips
Browse files Browse the repository at this point in the history
Remove snaps in goto & nearby teleport references
  • Loading branch information
digisomni authored Feb 26, 2022
2 parents 4c8593f + f9eb292 commit 38b0ffd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions interface/resources/qml/hifi/Pal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Rectangle {
id: comboDialog;
z: 998; // Force the ComboDialog on top of everything else
dialogWidth: parent.width - 50;
dialogHeight: parent.height - 100;
dialogHeight: parent.height - 200;
}
function letterbox(headerGlyph, headerText, message) {
letterboxMessage.headerGlyph = headerGlyph;
Expand Down Expand Up @@ -632,7 +632,7 @@ Rectangle {
: hifi.buttons.disabledTextColor[actionButton.colorScheme];
}
}

HifiControlsUit.Button {
id: hardBanButton;
color: 2; // Red
Expand Down Expand Up @@ -1109,10 +1109,10 @@ Rectangle {
// TODO: Change language from "Happening Now" to something else (or remove entirely)
popupComboDialog("Set your availability:",
availabilityComboBox.availabilityStrings,
["Your username will be visible in everyone's 'Nearby' list. Anyone will be able to jump to your location from within the 'Nearby' list.",
"Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows, and you will see 'Snaps' Blasts from them in 'Go To'.",
"Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows, and you will see 'Snaps' Blasts from them in 'Go To'",
"You will appear offline in the 'Connections' list, and you will not receive Snaps Blasts from connections or friends in 'Go To'."],
["Your username will be visible in everyone's 'Nearby' list.",
"Your location will be visible in the 'Connections' list only for those with whom you are connected or friends. They'll be able to jump to your location if the domain allows.",
"Your location will be visible in the 'Connections' list only for those with whom you are friends. They'll be able to jump to your location if the domain allows.",
"You will appear offline in the 'Connections' list."],
["all", "connections", "friends", "none"]);
}
onEntered: availabilityComboBox.color = hifi.colors.lightGrayText;
Expand Down

0 comments on commit 38b0ffd

Please sign in to comment.