From 036a16c0b384f69cf5949645315f0e266b24a0fc Mon Sep 17 00:00:00 2001
From: Mike Moody <amvmoody@gmail.com>
Date: Mon, 24 Jul 2017 16:51:23 -0700
Subject: [PATCH] readded line that caused colflict.

---
 scripts/system/libraries/entitySelectionTool.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 2d1853fae2..77b62913bf 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -4060,6 +4060,8 @@ SelectionDisplay = (function() {
             return false;
         }
 
+        entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
+
         // ignore ray intersection for our selection box and yaw/pitch/roll
         result = Overlays.findRayIntersection(pickRay, true, null, [ yawHandle, pitchHandle, rollHandle, selectionBox ] );
         if (result.intersects) {