From 0b60928dd3d9c85b0163520b9251954ee25744d1 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 25 Sep 2017 19:07:40 -0700
Subject: [PATCH] fix rollup-to-parent code to only roll up to entity parents

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

diff --git a/scripts/system/libraries/controllerDispatcherUtils.js b/scripts/system/libraries/controllerDispatcherUtils.js
index 19bc8eda8f..23735980aa 100644
--- a/scripts/system/libraries/controllerDispatcherUtils.js
+++ b/scripts/system/libraries/controllerDispatcherUtils.js
@@ -294,8 +294,9 @@ ensureDynamic = function (entityID) {
 };
 
 findGroupParent = function (controllerData, targetProps) {
-    while (targetProps.parentID && targetProps.parentID !== NULL_UUID && targetProps.parentID !== AVATAR_SELF_ID) {
-        // XXX use controllerData.nearbyEntityPropertiesByID ?
+    while (targetProps.parentID &&
+           targetProps.parentID !== NULL_UUID &&
+           Entities.getNestableType(targetProps.parentID) == "entity") {
         var parentProps = Entities.getEntityProperties(targetProps.parentID, DISPATCHER_PROPERTIES);
         if (!parentProps) {
             break;