diff --git a/public/configuration/ui-config.example b/public/configuration/ui-config.example index 3d617bc..8523223 100644 --- a/public/configuration/ui-config.example +++ b/public/configuration/ui-config.example @@ -15,8 +15,9 @@ "camera.publish.disabled": false, "hc.disabled": false, "badge.descriptions.enabled": true, - "furni.descriptions.enabled": false, + "furni.descriptions.enabled": true, "furni.location.enabled": true, + "furni.location.require.access": true, "motto.max.length": 38, "bot.name.max.length": 15, "pet.package.name.max.length": 15, diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx index 4054a6b..b39228c 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx @@ -78,6 +78,9 @@ export const InfoStandWidgetFurniView: FC = props const rareValue = useMemo(() => (avatarInfo ? getRareValue(avatarInfo.spriteId) : null), [ avatarInfo, getRareValue ]); const descriptionsEnabled = GetConfigurationValue('furni.descriptions.enabled', true); const itemLocationEnabled = GetConfigurationValue('furni.location.enabled', true); + const itemLocationRequireAccess = GetConfigurationValue('furni.location.require.access', true); + const isValidController = (avatarInfo.roomControllerLevel >= RoomControllerLevel.GUEST); + const hasAccess = (isValidController || avatarInfo.isOwner || avatarInfo.isRoomOwner || avatarInfo.isAnyRoomController) const [ pickupMode, setPickupMode ] = useState(0); const [ canMove, setCanMove ] = useState(false); const [ canRotate, setCanRotate ] = useState(false); @@ -209,13 +212,10 @@ export const InfoStandWidgetFurniView: FC = props setFurniLocationZ(location.z); } - const isValidController = (avatarInfo.roomControllerLevel >= RoomControllerLevel.GUEST); - - if(isValidController || avatarInfo.isOwner || avatarInfo.isRoomOwner || avatarInfo.isAnyRoomController) + if(hasAccess) { canMove = true; canRotate = !avatarInfo.isWallItem; - if(avatarInfo.roomControllerLevel >= RoomControllerLevel.MODERATOR) godMode = true; } @@ -607,7 +607,7 @@ export const InfoStandWidgetFurniView: FC = props { groupName } } - { ((itemLocation.x > -1) && itemLocationEnabled) && + { ((itemLocation.x > -1) && itemLocationEnabled && (!itemLocationRequireAccess || hasAccess)) && <>