From d20d594ae5b01420b48630bef3da89322bc29079 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 31 May 2018 10:50:54 -0700
Subject: [PATCH] use setCollisionEnabled for avatar collisions

---
 scripts/system/libraries/entitySelectionTool.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index d03d4477f7..cb5d510598 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -313,8 +313,6 @@ SelectionDisplay = (function() {
     
     var CTRL_KEY_CODE = 16777249;
 
-    var AVATAR_COLLISIONS_OPTION = "Enable Avatar Collisions";
-
     var TRANSLATE_DIRECTION = {
         X : 0,
         Y : 1,
@@ -1811,7 +1809,7 @@ SelectionDisplay = (function() {
 
     that.restoreAvatarCollisionsFromStretch = function() {
         if (handleStretchCollisionOverride) {
-            Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, true);
+            MyAvatar.setCollisionsEnabled(true);
             handleStretchCollisionOverride = false;
         }
     }
@@ -2018,8 +2016,8 @@ SelectionDisplay = (function() {
             if (scaleHandle != null) {
                 Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
             }
-            if (Menu.isOptionChecked(AVATAR_COLLISIONS_OPTION)) {
-                Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, false);
+            if (MyAvatar.getCollisionsEnabled()) {
+                MyAvatar.setCollisionsEnabled(false);
                 handleStretchCollisionOverride = true;
             }
         };