From 2af72f1a507b72aee5f8c066781d2f76069c8580 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Thu, 2 Feb 2017 17:03:53 +0000
Subject: [PATCH 1/2] fixed tablet buliding up when flying fast

---
 scripts/system/libraries/WebTablet.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 75ca2e514f..1655849e1a 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -335,6 +335,7 @@ WebTablet.prototype.cleanUpOldTablets = function() {
     this.cleanUpOldTabletsOnJoint(SENSOR_TO_ROOM_MATRIX);
     this.cleanUpOldTabletsOnJoint(CAMERA_MATRIX);
     this.cleanUpOldTabletsOnJoint(65529);
+    this.cleanUpOldTabletsOnJoint(65534);
 };
 
 WebTablet.prototype.unregister = function() {

From 2cc1ee008d32720b0fa455c8048a2228afd1f143 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Thu, 2 Feb 2017 17:46:42 +0000
Subject: [PATCH 2/2] added clicking sounds to tablet menus

---
 interface/resources/qml/hifi/tablet/TabletMenu.qml     | 9 +++++++--
 interface/resources/qml/hifi/tablet/TabletMenuView.qml | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index a9ca1b884c..cd3a9cacae 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -54,7 +54,10 @@ FocusScope {
                 onEntered: iconColorOverlay.color = "#1fc6a6";
                 onExited: iconColorOverlay.color = "#ffffff";
                 // navigate back to root level menu
-                onClicked: buildMenu();
+                onClicked: {
+                    buildMenu();
+                    tabletRoot.playButtonClickSound();
+                }
             }
         }
 
@@ -79,10 +82,12 @@ FocusScope {
                 onEntered: breadcrumbText.color = "#1fc6a6";
                 onExited: breadcrumbText.color = "#34a2c7";
                 // navigate back to parent level menu if there is one
-                onClicked: 
+                onClicked: { 
                     if (breadcrumbText.text !== "Menu") {
                         menuPopperUpper.closeLastMenu();
                     }
+                    tabletRoot.playButtonClickSound();
+                }
             }
         }
     }
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
index 6411c1af02..1845396230 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -75,7 +75,10 @@ FocusScope {
                 anchors.fill: parent
                 hoverEnabled: true
                 onEntered: listView.currentIndex = index
-                onClicked: root.selected(item)
+                onClicked: {
+                    root.selected(item)
+                    tabletRoot.playButtonClickSound();
+                }
             }
         }