Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 09:43:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make marketplace tablet be clientOnly

Browse source
This commit is contained in:
howard-stearns 2016-10-12 14:46:04 -07:00
parent 08f3a85aab
commit b377127fc1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/libraries/WebTablet.js
View file

@ -39,7 +39,7 @@ function calcSpawnInfo() {
} }
// ctor // ctor
WebTablet = function (url, width, dpi) { WebTablet = function (url, width, dpi, clientOnly) {
var ASPECT = 4.0 / 3.0; var ASPECT = 4.0 / 3.0;
var WIDTH = width || DEFAULT_WIDTH; var WIDTH = width || DEFAULT_WIDTH;
@ -63,7 +63,7 @@ WebTablet = function (url, width, dpi) {
dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH}, dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH},
parentID: MyAvatar.sessionUUID, parentID: MyAvatar.sessionUUID,
parentJointIndex: -2 parentJointIndex: -2
}); }, clientOnly);
var WEB_ENTITY_REDUCTION_FACTOR = {x: 0.78, y: 0.85}; var WEB_ENTITY_REDUCTION_FACTOR = {x: 0.78, y: 0.85};
var WEB_ENTITY_Z_OFFSET = -0.01; var WEB_ENTITY_Z_OFFSET = -0.01;
@ -84,7 +84,7 @@ WebTablet = function (url, width, dpi) {
dpi: DPI, dpi: DPI,
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
parentJointIndex: -1 parentJointIndex: -1
}); }, clientOnly);
this.state = "idle"; this.state = "idle";
}; };

2
scripts/system/marketplaces/marketplace.js
View file

@ -40,7 +40,7 @@ function shouldShowWebTablet() {
function showMarketplace(marketplaceID) { function showMarketplace(marketplaceID) {
if (shouldShowWebTablet()) { if (shouldShowWebTablet()) {
updateButtonState(true); updateButtonState(true);
marketplaceWebTablet = new WebTablet("https://metaverse.highfidelity.com/marketplace"); marketplaceWebTablet = new WebTablet("https://metaverse.highfidelity.com/marketplace", null, null, false);
} else { } else {
var url = MARKETPLACE_URL; var url = MARKETPLACE_URL;
if (marketplaceID) { if (marketplaceID) {