From d0c2c26a8e77209d6cba4c4a5c97538a4678d268 Mon Sep 17 00:00:00 2001
From: Matti Lahtinen <menithal@norteclabs.com>
Date: Tue, 28 Feb 2017 16:37:08 +0200
Subject: [PATCH] One last gotcha from the conflict resolution.

---
 scripts/system/controllers/handControllerGrab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 14d737de55..fd13b74f7d 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2497,7 +2497,7 @@ function MyController(hand) {
                             cProperties.lifetime = lifetime;
                             cProperties.userData = JSON.stringify(cUserData);
                             this.grabbedThingID = Entities.addEntity(cProperties);
-                            grabbedProperties = Entities.getEntityProperties(this.grabbedEntity);
+                            grabbedProperties = Entities.getEntityProperties(this.grabbedThingID);
                             var _this = this;
 
                             Script.setTimeout(function () {