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

Fix waiting-for-inventory sticking around on avatar uploader

Browse source
This commit is contained in:
Ryan Huffman 2019-01-03 13:51:45 -08:00
parent 7ca7e0f234
commit 847496048f
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
View file

@ -17,7 +17,7 @@ Item {
Style { id: style } Style { id: style }
property int colorScheme; property int colorScheme;
property var uploader: undefined; property var uploader: null;
property bool hasSuccessfullyUploaded: true; property bool hasSuccessfullyUploaded: true;
@ -25,7 +25,10 @@ Item {
anchors.fill: parent anchors.fill: parent
anchors.margins: 10 anchors.margins: 10
function reset() { hasSuccessfullyUploaded = false } function reset() {
hasSuccessfullyUploaded = false;
uploader = null;
}
property var footer: Item { property var footer: Item {
anchors.fill: parent anchors.fill: parent
@ -151,32 +154,22 @@ Item {
} }
function uploadNew() { function uploadNew() {
console.log("Uploading new");
upload(false); upload(false);
} }
function uploadUpdate() { function uploadUpdate() {
console.log("Uploading update");
upload(true); upload(true);
} }
Connections {
target: root.uploader
onStateChanged: {
root.hasSuccessfullyUploaded = newState >= 4;
}
}
function upload(updateExisting) { function upload(updateExisting) {
root.uploader = AvatarPackagerCore.currentAvatarProject.upload(updateExisting); root.uploader = AvatarPackagerCore.currentAvatarProject.upload(updateExisting);
console.log("uploader: "+ root.uploader); console.log("uploader: "+ root.uploader);
root.uploader.uploadProgress.connect(function(uploaded, total) {
console.log("Uploader progress: " + uploaded + " / " + total);
});
root.uploader.completed.connect(function() {
root.hasSuccessfullyUploaded = true;
});
root.uploader.finishedChanged.connect(function() {
try {
var response = JSON.parse(root.uploader.responseData);
console.log("Uploader complete! " + response);
uploadStatus.text = response.status;
} catch (e) {
console.log("Error parsing JSON: " + root.uploader.reponseData);
}
});
root.uploader.send(); root.uploader.send();
avatarPackager.state = AvatarPackagerState.projectUpload; avatarPackager.state = AvatarPackagerState.projectUpload;
} }