From 3bc4581f82fa3b9e7bf94007223f151c54190bc0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 13 Oct 2018 10:22:27 +1300
Subject: [PATCH] Fix far grabbing collisionless entity removing collisionless
 property

---
 .../controllers/controllerModules/farActionGrabEntity.js   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index 2e73526728..d9b63ad534 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -102,7 +102,6 @@ Script.include("/~/system/libraries/Xform.js");
         this.potentialEntityWithContextOverlay = false;
         this.entityWithContextOverlay = false;
         this.contextOverlayTimer = false;
-        this.previousCollisionStatus = false;
         this.locked = false;
         this.highlightedEntity = null;
         this.reticleMinX = MARGIN;
@@ -490,7 +489,8 @@ Script.include("/~/system/libraries/Xform.js");
                         var targetProps = Entities.getEntityProperties(entityID, [
                             "dynamic", "shapeType", "position",
                             "rotation", "dimensions", "density",
-                            "userData", "locked", "type", "href"
+                            "userData", "locked", "type", "href",
+                            "collisionless"
                         ]);
                         if (targetProps.href !== "") {
                             AddressManager.handleLookupString(targetProps.href);
@@ -543,7 +543,8 @@ Script.include("/~/system/libraries/Xform.js");
                             var selectionTargetProps = Entities.getEntityProperties(targetEntityID, [
                                 "dynamic", "shapeType", "position",
                                 "rotation", "dimensions", "density",
-                                "userData", "locked", "type", "href"
+                                "userData", "locked", "type", "href",
+                                "collisionless"
                             ]);
 
                             var selectionTargetObject = new TargetObject(targetEntityID, selectionTargetProps);