Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final fixes

Browse source
This commit is contained in:
Zach Fox 2017-10-09 15:23:22 -07:00
parent 38b95b5403
commit b81a8a95ea
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ Rectangle {
} }
onItemHrefChanged: { onItemHrefChanged: {
itemIsJson = root.itemHref.indexOf('.json') !== -1; itemIsJson = root.itemHref.endsWith('.json');
} }
onItemPriceChanged: { onItemPriceChanged: {
@ -575,8 +575,8 @@ Rectangle {
anchors.right: parent.right; anchors.right: parent.right;
text: "Rez It" text: "Rez It"
onClicked: { onClicked: {
if (urlHandler.canHandleUrl(itemHref)) { if (urlHandler.canHandleUrl(root.itemHref)) {
urlHandler.handleUrl(itemHref); urlHandler.handleUrl(root.itemHref);
} }
rezzedNotifContainer.visible = true; rezzedNotifContainer.visible = true;
rezzedNotifContainerTimer.start(); rezzedNotifContainerTimer.start();

9
interface/src/Application.cpp
View file

@ -2689,15 +2689,10 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
bool Application::importJSONFromURL(const QString& urlString) { bool Application::importJSONFromURL(const QString& urlString) {
// we only load files that terminate in just .json (not .svo.json and not .ava.json) // we only load files that terminate in just .json (not .svo.json and not .ava.json)
// if they come from the High Fidelity Marketplace Assets CDN
QUrl jsonURL { urlString }; QUrl jsonURL { urlString };
if (jsonURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) { emit svoImportRequested(urlString);
emit svoImportRequested(urlString); return true;
return true;
} else {
return false;
}
} }
bool Application::importSVOFromURL(const QString& urlString) { bool Application::importSVOFromURL(const QString& urlString) {