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

Fix incorrect merge-resolution

Browse source
This commit is contained in:
Simon Walton 2018-10-24 13:17:45 -07:00
parent e22e0ecb04
commit b6f259fc42
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/avatars/src/AvatarData.cpp
View file

@ -419,11 +419,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
IF_AVATAR_SPACE(PACKET_HAS_AVATAR_GLOBAL_POSITION, sizeof _globalPosition) { IF_AVATAR_SPACE(PACKET_HAS_AVATAR_GLOBAL_POSITION, sizeof _globalPosition) {
auto startSection = destinationBuffer; auto startSection = destinationBuffer;
if (_overrideGlobalPosition) { AVATAR_MEMCPY(_globalPosition);
AVATAR_MEMCPY(_globalPositionOverride);
} else {
AVATAR_MEMCPY(_globalPosition);
}
int numBytes = destinationBuffer - startSection; int numBytes = destinationBuffer - startSection;