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

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

Browse source
This commit is contained in:
unknown 2019-04-03 08:33:26 -07:00
commit e2387b053b
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -3736,14 +3736,11 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
// If this is a first run we short-circuit the address passed in // If this is a first run we short-circuit the address passed in
if (_firstRun.get()) { if (_firstRun.get()) {
#if !defined(Q_OS_ANDROID)
DependencyManager::get<AddressManager>()->goToEntry(); DependencyManager::get<AddressManager>()->goToEntry();
sentTo = SENT_TO_ENTRY; sentTo = SENT_TO_ENTRY;
#endif
_firstRun.set(false); _firstRun.set(false);
} else { } else {
#if !defined(Q_OS_ANDROID)
QString goingTo = ""; QString goingTo = "";
if (addressLookupString.isEmpty()) { if (addressLookupString.isEmpty()) {
if (Menu::getInstance()->isOptionChecked(MenuOption::HomeLocation)) { if (Menu::getInstance()->isOptionChecked(MenuOption::HomeLocation)) {
@ -3757,7 +3754,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(!goingTo.isEmpty() ? goingTo : addressLookupString); qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(!goingTo.isEmpty() ? goingTo : addressLookupString);
DependencyManager::get<AddressManager>()->loadSettings(addressLookupString); DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
sentTo = SENT_TO_PREVIOUS_LOCATION; sentTo = SENT_TO_PREVIOUS_LOCATION;
#endif
} }
UserActivityLogger::getInstance().logAction("startup_sent_to", { UserActivityLogger::getInstance().logAction("startup_sent_to", {

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

@ -38,10 +38,10 @@ PacketVersion versionForPacketType(PacketType packetType) {
return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums); return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums);
case PacketType::AvatarIdentity: case PacketType::AvatarIdentity:
case PacketType::AvatarData: case PacketType::AvatarData:
return static_cast<PacketVersion>(AvatarMixerPacketVersion::SendMaxTranslationDimension); return static_cast<PacketVersion>(AvatarMixerPacketVersion::FBXJointOrderChange);
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:
case PacketType::KillAvatar: case PacketType::KillAvatar:
return static_cast<PacketVersion>(AvatarMixerPacketVersion::SendMaxTranslationDimension); return static_cast<PacketVersion>(AvatarMixerPacketVersion::FBXJointOrderChange);
case PacketType::MessagesData: case PacketType::MessagesData:
return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData); return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData);
// ICE packets // ICE packets

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

@ -328,7 +328,8 @@ enum class AvatarMixerPacketVersion : PacketVersion {
CollisionFlag, CollisionFlag,
AvatarTraitsAck, AvatarTraitsAck,
FasterAvatarEntities, FasterAvatarEntities,
SendMaxTranslationDimension SendMaxTranslationDimension,
FBXJointOrderChange
}; };
enum class DomainConnectRequestVersion : PacketVersion { enum class DomainConnectRequestVersion : PacketVersion {