Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices

Browse source
This commit is contained in:
David Back 2018-01-04 15:30:57 -08:00
commit ac8b8da7b1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -33,7 +33,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
return static_cast<PacketVersion>(EntityVersion::OwnershipChallengeFix); return static_cast<PacketVersion>(EntityVersion::OwnershipChallengeFix);
case PacketType::EntityQuery: case PacketType::EntityQuery:
return static_cast<PacketVersion>(EntityQueryPacketVersion::ConnectionIdentifier); return static_cast<PacketVersion>(EntityQueryPacketVersion::RemovedJurisdictions);
case PacketType::AvatarIdentity: case PacketType::AvatarIdentity:
case PacketType::AvatarData: case PacketType::AvatarData:
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:

5
libraries/networking/src/udt/PacketHeaders.h
View file

@ -56,6 +56,8 @@ public:
ICEServerPeerInformation, ICEServerPeerInformation,
ICEServerQuery, ICEServerQuery,
OctreeStats, OctreeStats,
UNUSED_PACKET_TYPE_1,
UNUSED_PACKET_TYPE_2,
AssignmentClientStatus, AssignmentClientStatus,
NoisyMute, NoisyMute,
AvatarIdentity, AvatarIdentity,
@ -210,7 +212,8 @@ enum class EntityScriptCallMethodVersion : PacketVersion {
enum class EntityQueryPacketVersion: PacketVersion { enum class EntityQueryPacketVersion: PacketVersion {
JSONFilter = 18, JSONFilter = 18,
JSONFilterWithFamilyTree = 19, JSONFilterWithFamilyTree = 19,
ConnectionIdentifier = 20 ConnectionIdentifier = 20,
RemovedJurisdictions = 21
}; };
enum class AssetServerPacketVersion: PacketVersion { enum class AssetServerPacketVersion: PacketVersion {