From ba371613ba0be00a99fc4a4997cb5e71f012a5c7 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Fri, 23 Oct 2020 23:24:06 -0400 Subject: [PATCH] Add Parent-Children Selector group Add Parent-Children Selector group Prevent action to happen when some entities are Locked in the Selection Code Adjustments --- scripts/system/create/entityList/entityList.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js index cb6beeaa4a..d0294c2c27 100644 --- a/scripts/system/create/entityList/entityList.js +++ b/scripts/system/create/entityList/entityList.js @@ -207,11 +207,11 @@ EntityListTool = function(shouldUseEditTabletApp) { var parentStatus = getParentState(ids[i]); var parentState = ""; if (parentStatus === "PARENT") { - parentState = "N"; + parentState = "A"; } else if (parentStatus === "CHILDREN") { - parentState = "O"; + parentState = "C"; } else if (parentStatus === "PARENT_CHILDREN") { - parentState = "M"; + parentState = "B"; } entities.push({ @@ -339,6 +339,16 @@ EntityListTool = function(shouldUseEditTabletApp) { selectAllEntitiesInCurrentSelectionBox(false); } else if (data.type === 'selectAllTouchingBox') { selectAllEntitiesInCurrentSelectionBox(true); + } else if (data.type === 'selectParent') { + SelectionManager.selectParent(); + } else if (data.type === 'selectTopParent') { + SelectionManager.selectTopParent(); + } else if (data.type === 'addChildrenToSelection') { + SelectionManager.addChildrenToSelection(); + } else if (data.type === 'selectFamily') { + SelectionManager.selectFamily(); + } else if (data.type === 'selectTopFamily') { + SelectionManager.selectTopFamily(); } else if (data.type === 'teleportToEntity') { SelectionManager.teleportToEntity(); } else if (data.type === 'moveEntitySelectionToAvatar') {