From 0353e562e4589e83322fd36a3e0f9c6c2f4e27a1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 19 May 2016 16:55:13 -0700
Subject: [PATCH] entityProperties.html handles non object userData

---
 scripts/system/html/entityProperties.html | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index ae5684d6c8..e0bcf0efec 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -626,18 +626,19 @@
                                 var parsedUserData = {}
                                 try {
                                     parsedUserData = JSON.parse(properties.userData);
+                                                            
+                                    if ("grabbableKey" in parsedUserData) {
+                                        if ("grabbable" in parsedUserData["grabbableKey"]) {
+                                            elGrabbable.checked = parsedUserData["grabbableKey"].grabbable;
+                                        }
+                                        if ("wantsTrigger" in parsedUserData["grabbableKey"]) {
+                                            elWantsTrigger.checked = parsedUserData["grabbableKey"].wantsTrigger;
+                                        }
+                                        if ("ignoreIK" in parsedUserData["grabbableKey"]) {
+                                            elIgnoreIK.checked = parsedUserData["grabbableKey"].ignoreIK;
+                                        }
+                                    }
                                 } catch(e) {}
-                                if ("grabbableKey" in parsedUserData) {
-                                    if ("grabbable" in parsedUserData["grabbableKey"]) {
-                                        elGrabbable.checked = parsedUserData["grabbableKey"].grabbable;
-                                    }
-                                    if ("wantsTrigger" in parsedUserData["grabbableKey"]) {
-                                        elWantsTrigger.checked = parsedUserData["grabbableKey"].wantsTrigger;
-                                    }
-                                    if ("ignoreIK" in parsedUserData["grabbableKey"]) {
-                                        elIgnoreIK.checked = parsedUserData["grabbableKey"].ignoreIK;
-                                    }
-                                }
 
                                 elCollisionSoundURL.value = properties.collisionSoundURL;
                                 elLifetime.value = properties.lifetime;