Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-13 15:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11817 from zfox23/commerce_rezFix

Browse source 
Fix rezzing non-JSON marketplace items
This commit is contained in:
Zach Fox 2017-11-15 14:17:05 -08:00 committed by GitHub
commit 9f80a5f081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -476,7 +476,9 @@ Rectangle {
commerce.buy(itemId, itemPrice, true); commerce.buy(itemId, itemPrice, true);
} }
} else { } else {
sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable}); if (urlHandler.canHandleUrl(itemHref)) {
urlHandler.handleUrl(itemHref);
}
} }
} }
} }
@ -594,9 +596,7 @@ Rectangle {
anchors.right: parent.right; anchors.right: parent.right;
text: root.isWearable ? "Wear It" : "Rez It" text: root.isWearable ? "Wear It" : "Rez It"
onClicked: { onClicked: {
if (urlHandler.canHandleUrl(root.itemHref)) { sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
urlHandler.handleUrl(root.itemHref);
}
rezzedNotifContainer.visible = true; rezzedNotifContainer.visible = true;
rezzedNotifContainerTimer.start(); rezzedNotifContainerTimer.start();
} }