From f4b2e399efdbdd83f36ef7e808c932a7848c09bc Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 29 Jul 2017 12:54:21 +1200
Subject: [PATCH] Fix multiple and malingering tool icons

---
 scripts/vr-edit/modules/toolIcon.js | 13 ++++++++-----
 scripts/vr-edit/vr-edit.js          |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/vr-edit/modules/toolIcon.js b/scripts/vr-edit/modules/toolIcon.js
index 813178c5f8..781530207c 100644
--- a/scripts/vr-edit/modules/toolIcon.js
+++ b/scripts/vr-edit/modules/toolIcon.js
@@ -60,7 +60,6 @@ ToolIcon = function (side) {
         var handJointIndex,
             iconProperties;
 
-        // Joint index.
         handJointIndex = MyAvatar.getJointIndex(HAND_JOINT_NAME);
         if (handJointIndex === -1) {
             // Don't display if joint isn't available (yet) to attach to.
@@ -69,10 +68,14 @@ ToolIcon = function (side) {
             return;
         }
 
-        iconProperties = Object.clone(ICON_PROPERTIES);
-        iconProperties.parentJointIndex = handJointIndex;
-        iconProperties.color = ICON_COLORS[icon];
-        iconOverlay = Overlays.addOverlay(ICON_TYPE, iconProperties);
+        if (iconOverlay === null) {
+            iconProperties = Object.clone(ICON_PROPERTIES);
+            iconProperties.parentJointIndex = handJointIndex;
+            iconProperties.color = ICON_COLORS[icon];
+            iconOverlay = Overlays.addOverlay(ICON_TYPE, iconProperties);
+        } else {
+            Overlays.editOverlay(iconOverlay, { color: ICON_COLORS[icon] });
+        }
     }
 
     function clear() {
diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index 12bbe91301..a2c76a5ad2 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -227,6 +227,7 @@
         function clear() {
             leftInputs.setUIEntities([]);
             rightInputs.setUIEntities([]);
+            toolIcon.clear();
             toolMenu.clear();
             createPalette.clear();