From e52a7e461304cc19b594d19dab29e14a3c675226 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Fri, 18 Oct 2024 19:10:23 -0700 Subject: [PATCH] bump protocol --- libraries/entities/src/ZoneEntityItem.cpp.in | 2 +- libraries/entities/src/ZoneEntityItem.h.in | 8 -------- libraries/networking/src/udt/PacketHeaders.h | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libraries/entities/src/ZoneEntityItem.cpp.in b/libraries/entities/src/ZoneEntityItem.cpp.in index e926f678ce..66283ebf45 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp.in +++ b/libraries/entities/src/ZoneEntityItem.cpp.in @@ -339,7 +339,7 @@ bool ZoneEntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const { // If set match zones of interest to avatar mixer: if (jsonFilters.contains(AVATAR_PRIORITY_PROPERTY) && jsonFilters[AVATAR_PRIORITY_PROPERTY].toBool() - && (_avatarPriority != COMPONENT_MODE_INHERIT || _screenshare != COMPONENT_MODE_INHERIT)) { + && _avatarPriority != COMPONENT_MODE_INHERIT) { return true; } diff --git a/libraries/entities/src/ZoneEntityItem.h.in b/libraries/entities/src/ZoneEntityItem.h.in index c9ae7f5f43..7da10c3c2a 100644 --- a/libraries/entities/src/ZoneEntityItem.h.in +++ b/libraries/entities/src/ZoneEntityItem.h.in @@ -57,14 +57,6 @@ public: const TonemappingPropertyGroup& getTonemappingProperties() const { return _tonemappingProperties; } const AmbientOcclusionPropertyGroup& getAmbientOcclusionProperties() const { return _ambientOcclusionProperties; } - /** - * @brief Backwards compatibility for screenshare and the like - * Doesn't do anything. - * @param value - */ - void ignoreUint32(uint32_t value) { /* nothing */ }; - - void setUserData(const QString& value) override; bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; } diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index c04531bc40..4b1d6fde03 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -363,6 +363,7 @@ enum class EntityVersion : PacketVersion { ModelLoadPriority, PropertyCleanup, TextVerticalAlignment, + RemoveScreenshare, // Add new versions above here NUM_PACKET_TYPE,