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

bump protocol version

Browse source
This commit is contained in:
Seth Alves 2015-06-26 12:36:10 -07:00
parent 005bd8bda5
commit 9e8113a63c
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketTypeEntityAdd: case PacketTypeEntityAdd:
case PacketTypeEntityEdit: case PacketTypeEntityEdit:
case PacketTypeEntityData: case PacketTypeEntityData:
return VERSION_ENTITIES_FACE_CAMERA; return VERSION_ACTIONS_OVER_WIRE;
case PacketTypeEntityErase: case PacketTypeEntityErase:
return 2; return 2;
case PacketTypeAudioStreamStats: case PacketTypeAudioStreamStats:

1
libraries/networking/src/PacketHeaders.h
View file

@ -184,5 +184,6 @@ const PacketVersion VERSION_NO_ENTITY_ID_SWAP = 27;
const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28; const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29; const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30; const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
const PacketVersion VERSION_ACTIONS_OVER_WIRE = 31;
#endif // hifi_PacketHeaders_h #endif // hifi_PacketHeaders_h

2
libraries/shared/src/SettingInterface.cpp
View file

@ -43,7 +43,7 @@ namespace Setting {
// set the associated application properties // set the associated application properties
applicationInfo.beginGroup("INFO"); applicationInfo.beginGroup("INFO");
QCoreApplication::setApplicationName(applicationInfo.value("name").toString()); QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
// QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString()); QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
// Let's set up the settings Private instance on its own thread // Let's set up the settings Private instance on its own thread