From 71083645e9b791a00a4ae521015d091ab4ed41dd Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Thu, 12 Jan 2017 20:51:25 +0000
Subject: [PATCH] branch update

---
 scripts/system/libraries/WebTablet.js       |  2 +-
 scripts/system/marketplaces/marketplaces.js | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 4d759e9730..ebd30a9c6f 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -102,7 +102,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly) {
         type: "Model",
         modelURL: HOME_BUTTON_URL,
         collisionless: true,
-        localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: 0},
+        localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: -0.01},
         parentID: this.tabletEntityID,
         script: Script.resolvePath("../tablet-ui/HomeButton.js")
         }, clientOnly);
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index c07e799dcf..cfd2bb1f30 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -60,8 +60,11 @@ var persistenceKey = "io.highfidelity.lastDomainTablet";
 
 function showMarketplace() {
     tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL);
-    tablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL);
-    tablet.webEventRecieved(function (message) {
+    UserActivityLogger.openedMarketplace();
+
+    // FIXME - the code to support the following is not yet implented
+    /*tablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL); 
+    tablet.webEventRecieved.connect(function (message) {
        if (message === GOTO_DIRECTORY) {
            tablet.gotoWebScreen(MATKETPLACES_URL);
        }
@@ -74,8 +77,7 @@ function showMarketplace() {
           Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
       }
 
-    });  
-    UserActivityLogger.openedMarketplace();
+    });*/
 }
 
 function toggleMarketplace() {
@@ -86,7 +88,7 @@ var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
 var browseExamplesButton = tablet.addButton({
     icon: "icons/tablet-icons/market-i.svg",
-    text: "MARKETPLACE"
+    text: "MARKET"
 });
 
 function onCanWriteAssetsChanged() {