Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable marketplace item test for avatar file

Browse source
This commit is contained in:
Kerry Ivan Kurian 2018-09-18 13:25:01 -07:00
parent 645ad2bb7a
commit a592565b7b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
View file

@ -32,7 +32,7 @@ Rectangle {
function buildResourceObj(resource) { function buildResourceObj(resource) {
resource = resource.trim(); resource = resource.trim();
var assetType = (resource.match(/\.app\.json$/) ? "application" : var assetType = (resource.match(/\.app\.json$/) ? "application" :
resource.match(/\.(?:fbx|fst)$/) ? "avatar" : resource.match(/\.fst$/) ? "avatar" :
resource.match(/\.json\.gz$/) ? "content set" : resource.match(/\.json\.gz$/) ? "content set" :
resource.match(/\.json$/) ? "entity or wearable" : resource.match(/\.json$/) ? "entity or wearable" :
"unknown"); "unknown");
@ -154,7 +154,7 @@ Rectangle {
"Load File": function(){ "Load File": function(){
rootActions.currentAction = "load file"; rootActions.currentAction = "load file";
Window.browseChanged.connect(onResourceSelected); Window.browseChanged.connect(onResourceSelected);
Window.browseAsync("Please select a file", "", "Assets (*.app.json *.json *.fbx *.json.gz)"); Window.browseAsync("Please select a file (*.app.json *.json *.fst *.json.gz)", "", "Assets (*.app.json *.json *.fst *.json.gz)");
}, },
"Load URL": function(){ "Load URL": function(){
rootActions.currentAction = "load url"; rootActions.currentAction = "load url";