diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
deleted file mode 100644
index 8da68e4e19..0000000000
Binary files a/interface/resources/qml/js/Utils.jsc and /dev/null differ
diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 5e38f28a06..33f40f7c63 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -425,10 +425,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
* Write-only.
* @property {Color} outerColor - Sets the values of outerStartColor
and outerEndColor
.
* Write-only.
- * @property {Color} innerStartcolor - The color at the inner start point of the overlay. Write-only.
- * @property {Color} innerEndColor - The color at the inner end point of the overlay. Write-only.
- * @property {Color} outerStartColor - The color at the outer start point of the overlay. Write-only.
- * @property {Color} outerEndColor - The color at the outer end point of the overlay. Write-only.
+ * @property {Color} innerStartcolor - The color at the inner start point of the overlay.
+ * @property {Color} innerEndColor - The color at the inner end point of the overlay.
+ * @property {Color} outerStartColor - The color at the outer start point of the overlay.
+ * @property {Color} outerEndColor - The color at the outer end point of the overlay.
* @property {number} alpha=0.5 - The opacity of the overlay, 0.0
- 1.0
. Setting this value also sets
* the values of innerStartAlpha
, innerEndAlpha
, outerStartAlpha
, and
* outerEndAlpha
. Synonym: Alpha
; write-only.
@@ -440,10 +440,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
* Write-only.
* @property {number} outerAlpha - Sets the values of outerStartAlpha
and outerEndAlpha
.
* Write-only.
- * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay. Write-only.
- * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay. Write-only.
- * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay. Write-only.
- * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay. Write-only.
+ * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay.
+ * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay.
+ * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay.
+ * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay.
* @property {boolean} hasTickMarks=false - If true
, tick marks are drawn.
* @property {number} majorTickMarksAngle=0 - The angle between major tick marks, in degrees.
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 05b4963280..a28de5abc2 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -47,7 +47,7 @@ function calcSpawnInfo(hand, landscape) {
var headPos = (HMD.active && Camera.mode === "first person") ? HMD.position : Camera.position;
var headRot = (HMD.active && Camera.mode === "first person") ? HMD.orientation : Camera.orientation;
- var forward = Quat.getForward(headRot);
+ var forward = Quat.getForward(Quat.cancelOutRollAndPitch(headRot));
var FORWARD_OFFSET = 0.5 * MyAvatar.sensorToWorldScale;
finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward));
var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
@@ -269,8 +269,9 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
}
this.landscape = newLandscapeValue;
+ var cameraOrientation = Quat.cancelOutRollAndPitch(Camera.orientation);
Overlays.editOverlay(this.tabletEntityID,
- { rotation: Quat.multiply(Camera.orientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
+ { rotation: Quat.multiply(cameraOrientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
var tabletWidth = getTabletWidthFromSettings() * MyAvatar.sensorToWorldScale;
var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
@@ -278,7 +279,7 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
var screenWidth = 0.82 * tabletWidth;
var screenHeight = 0.81 * tabletHeight;
Overlays.editOverlay(this.webOverlayID, {
- rotation: Quat.multiply(Camera.orientation, ROT_LANDSCAPE_WINDOW),
+ rotation: Quat.multiply(cameraOrientation, ROT_LANDSCAPE_WINDOW),
dimensions: {x: this.landscape ? screenHeight : screenWidth, y: this.landscape ? screenWidth : screenHeight, z: 0.1}
});
};