bump protocol

HifiExperiments · Oct 19, 2024 · e52a7e4 · e52a7e4
1 parent e288abc
commit e52a7e4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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
@@ -363,6 +363,7 @@ enum class EntityVersion : PacketVersion {
     ModelLoadPriority,
     PropertyCleanup,
     TextVerticalAlignment,
+    RemoveScreenshare,
 
     // Add new versions above here
     NUM_PACKET_TYPE,