From ab3c833dd59d4c1cfacc4c0a0bc0c797ccac7f90 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 20 Dec 2016 09:23:21 -0800 Subject: [PATCH] diff minimization --- interface/src/Application.cpp | 2 +- scripts/system/libraries/WebTablet.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 12924995f1..252d5b9ba7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1498,6 +1498,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo } _connectionMonitor.init(); + // After all of the constructor is completed, then set firstRun to false. firstRun.set(false); } @@ -1591,7 +1592,6 @@ void Application::toggleMenuUnderReticle() const { offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y)); } - uint64_t lastTabletUIToggle { 0 }; const uint64_t toggleTabletUILockout { 500000 }; void Application::toggleTabletUI() const { diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 753161d074..1445e9250e 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -65,7 +65,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) { dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH}, parentID: MyAvatar.sessionUUID, parentJointIndex: SENSOR_TO_ROOM_MATRIX - }; + } if (location) { tabletProperties.localPosition = location.localPosition; @@ -104,7 +104,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) { dimensions: {x: 0.05, y: 0.05, z: 0.05}, parentID: this.tabletEntityID, script: Script.resolvePath("../tablet-ui/HomeButton.js") - }, clientOnly); + }, clientOnly); setEntityCustomData('grabbableKey', this.homeButtonEntity, {wantsTrigger: true});