Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs

This commit is contained in:
Seth Alves 2015-03-30 16:00:00 -07:00
commit 98c08acc97

View file

@ -1355,7 +1355,7 @@ var propertyMenu = PopupMenu();
propertyMenu.onSelectMenuItem = function(name) {
if (propertyMenu.marketplaceID) {
var url = "https://metaverse.highfidelity.io/marketplace/items/" + propertyMenu.marketplaceID;
var url = MARKETPLACE_URL + "/items/" + propertyMenu.marketplaceID;
if (marketplaceWindow.url != url) {
marketplaceWindow.setURL(url);
}