From b377127fc12edcccd5d06039a2bc079d3e526d6a Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Wed, 12 Oct 2016 14:46:04 -0700 Subject: [PATCH] make marketplace tablet be clientOnly --- scripts/system/libraries/WebTablet.js | 6 +++--- scripts/system/marketplaces/marketplace.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index a255b7a494..5273dbfd01 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -39,7 +39,7 @@ function calcSpawnInfo() { } // ctor -WebTablet = function (url, width, dpi) { +WebTablet = function (url, width, dpi, clientOnly) { var ASPECT = 4.0 / 3.0; var WIDTH = width || DEFAULT_WIDTH; @@ -63,7 +63,7 @@ WebTablet = function (url, width, dpi) { dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH}, parentID: MyAvatar.sessionUUID, parentJointIndex: -2 - }); + }, clientOnly); var WEB_ENTITY_REDUCTION_FACTOR = {x: 0.78, y: 0.85}; var WEB_ENTITY_Z_OFFSET = -0.01; @@ -84,7 +84,7 @@ WebTablet = function (url, width, dpi) { dpi: DPI, parentID: this.tabletEntityID, parentJointIndex: -1 - }); + }, clientOnly); this.state = "idle"; }; diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js index 563a5289fc..29a21c5c2d 100644 --- a/scripts/system/marketplaces/marketplace.js +++ b/scripts/system/marketplaces/marketplace.js @@ -40,7 +40,7 @@ function shouldShowWebTablet() { function showMarketplace(marketplaceID) { if (shouldShowWebTablet()) { updateButtonState(true); - marketplaceWebTablet = new WebTablet("https://metaverse.highfidelity.com/marketplace"); + marketplaceWebTablet = new WebTablet("https://metaverse.highfidelity.com/marketplace", null, null, false); } else { var url = MARKETPLACE_URL; if (marketplaceID) {