From 05438f3b850b50da73baf0d784060503961e5143 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 25 Jun 2018 15:26:54 -0700
Subject: [PATCH] bad avatar collision merge

---
 scripts/system/libraries/entitySelectionTool.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 4b0c73e304..cd3c9fe418 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -657,11 +657,6 @@ SelectionDisplay = (function() {
     var activeTool = null;
     var handleTools = {};
 
-    that.shutdown = function() {
-        that.restoreAvatarCollisionsFromStretch();
-    };
-    Script.scriptEnding.connect(that.shutdown);
-
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
     that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
@@ -1882,13 +1877,6 @@ SelectionDisplay = (function() {
         };
     };
 
-    that.restoreAvatarCollisionsFromStretch = function() {
-        if (handleStretchCollisionOverride) {
-            Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, true);
-            handleStretchCollisionOverride = false;
-        }
-    };
-
     // TOOL DEFINITION: HANDLE STRETCH TOOL   
     function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleHandle) {
         var directionFor3DStretch = directionVec;