mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-05 23:54:50 +02:00
Merged Zach's work
This commit is contained in:
parent
47841d9bcd
commit
b1fd6050c7
2 changed files with 0 additions and 2 deletions
|
@ -156,7 +156,6 @@ Rectangle {
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
Tablet.playSound(TabletEnums.ButtonClick);
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
print("_____________________________________", bottomRightAccentImage.source);
|
|
||||||
tempAvatarPageContainer.visible = false;
|
tempAvatarPageContainer.visible = false;
|
||||||
controlsContainer.visible = true;
|
controlsContainer.visible = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -487,7 +487,6 @@ function onMessageFromSecondLaunchWindow(message) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var WAIT_FOR_TOP_BAR_MS = 1000;
|
var WAIT_FOR_TOP_BAR_MS = 1000;
|
||||||
function sendLocalStatusToQml() {
|
function sendLocalStatusToQml() {
|
||||||
var currentStatus = si.getLocalStatus();
|
var currentStatus = si.getLocalStatus();
|
||||||
|
|
Loading…
Reference in a new issue