From 26d4eb8e67ecebf1098ce14dcf6e51a531463f31 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 24 Aug 2020 18:43:03 -0400 Subject: [PATCH] Updates per CR. Co-Authored-By: David Rowe --- interface/src/avatar/MyAvatar.cpp | 1 + interface/src/ui/ModelsBrowser.cpp | 1 + libraries/entities/src/EntityItemProperties.cpp | 4 ++-- libraries/networking/src/NetworkingConstants.h | 1 + libraries/networking/src/udt/PacketHeaders.h | 1 + scripts/system/create/assets/data/createAppTooltips.json | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 27af9b3c14..3bfa0bc0a2 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -4,6 +4,7 @@ // // Created by Mark Peng on 8/16/13. // Copyright 2012 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index cccfb6e6d6..5d09bf5db9 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -4,6 +4,7 @@ // // Created by Clement on 3/17/14. // Copyright 2014 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 14b5ec080f..c1ca0478f8 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1385,8 +1385,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * @property {boolean} showKeyboardFocusHighlight=true - true if the entity is highlighted when it has keyboard * focus, false if it isn't. * @property {boolean} useBackground=true - true if the web entity should have a background, - * false if the web entity's background should be transparent. The webpage must have CSS properties for - * background-color: "transparent" set appropriately for this property to have an effect. + * false if the web entity's background should be transparent. The webpage must have CSS properties for transparency + * on the background-color set for this property to have an effect. * @example Create a Web entity displaying at 1920 x 1080 resolution. * var METERS_TO_INCHES = 39.3701; * var entity = Entities.addEntity({ diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 0e490885cd..d8cab02aab 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 2015-03-31. // Copyright 2015 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 9738e7e704..fc74f4459c 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 4/8/13. // Copyright 2013 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/scripts/system/create/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json index 31ff158223..cf39302748 100644 --- a/scripts/system/create/assets/data/createAppTooltips.json +++ b/scripts/system/create/assets/data/createAppTooltips.json @@ -608,7 +608,7 @@ "tooltip": "The opacity of the web entity between 0.0 fully transparent and 1.0 completely opaque." }, "useBackground": { - "tooltip": "If disabled, this web entity will support a transparent background for the webpage if the CSS property of the 'body' is set with 'background-color: transparent;'" + "tooltip": "If disabled, this web entity will support a transparent background for the webpage and its elements if the CSS property of 'background-color' on the 'body' is set with transparency." }, "maxFPS": { "tooltip": "The FPS at which to render the web entity. Higher values will have a performance impact."