From 7e7424ec2b88fb6f099262a0f8981fc8e7c702ac Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Fri, 8 Jan 2016 16:22:10 -0800
Subject: [PATCH] Removed marketplace icon from edit menu

---
 examples/edit.js        | 32 ++++----------------------------
 examples/marketplace.js |  6 +++---
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/examples/edit.js b/examples/edit.js
index 99219fcaa2..5d724576d3 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -183,8 +183,7 @@ var toolBar = (function() {
         newTextButton,
         newWebButton,
         newZoneButton,
-        newPolyVoxButton,
-        browseMarketplaceButton;
+        newPolyVoxButton;
 
     function initialize() {
         toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) {
@@ -194,13 +193,7 @@ var toolBar = (function() {
             };
         });
 
-        browseMarketplaceButton = toolBar.addTool({
-            imageURL: toolIconUrl + "marketplace.svg",
-            width: toolWidth,
-            height: toolHeight,
-            alpha: 0.9,
-            visible: true,
-        });
+  
 
         activeButton = toolBar.addTool({
             imageURL: toolIconUrl + "edit-status.svg",
@@ -415,7 +408,6 @@ var toolBar = (function() {
     }
 
     var newModelButtonDown = false;
-    var browseMarketplaceButtonDown = false;
     that.mousePressEvent = function(event) {
         var clickedOverlay,
             url,
@@ -443,11 +435,7 @@ var toolBar = (function() {
             return true;
         }
         
-        if (browseMarketplaceButton === toolBar.clicked(clickedOverlay)) {
-            toggleMarketplace();
-            return true;
-        }
-
+     
         if (newCubeButton === toolBar.clicked(clickedOverlay)) {
             createNewEntity({
                 type: "Box",
@@ -652,22 +640,10 @@ var toolBar = (function() {
                 }
                 handled = true;
             }
-        } else if (browseMarketplaceButtonDown) {
-            var clickedOverlay = Overlays.getOverlayAtPoint({
-                x: event.x,
-                y: event.y
-            });
-            if (browseMarketplaceButton === toolBar.clicked(clickedOverlay)) {
-                url = Window.s3Browse(".*(fbx|FBX|obj|OBJ)");
-                if (url !== null && url !== "") {
-                    addModel(url);
-                }
-                handled = true;
-            }
         }
 
         newModelButtonDown = false;
-        browseMarketplaceButtonDown = false;
+     
 
         return handled;
     }
diff --git a/examples/marketplace.js b/examples/marketplace.js
index 27e2da56e3..074966c196 100644
--- a/examples/marketplace.js
+++ b/examples/marketplace.js
@@ -48,10 +48,10 @@ var toolBar = (function() {
         browseMarketplaceButton;
 
     function initialize() {
-        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) {
+        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "", function(windowDimensions, toolbar) {
             return {
-                x: windowDimensions.x - 100 - toolbar.width,
-                y: (windowDimensions.y - toolbar.height) / 2
+                x: windowDimensions.x - 8 - toolbar.width,
+                y: 150
             };
         });
         browseMarketplaceButton = toolBar.addTool({