further unmangle branch split

This commit is contained in:
Seth Alves 2015-10-15 10:13:00 -07:00
parent d833fb08d7
commit 8195145dc7
2 changed files with 5 additions and 5 deletions

View file

@ -109,10 +109,10 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
holderID = myAvatar->getSessionUUID();
if (somethingChanged ||
relativePosition != _relativePosition
|| relativeRotation != _relativeRotation
|| timeScale != _linearTimeScale
|| hand != _hand) {
relativePosition != _relativePosition ||
relativeRotation != _relativeRotation ||
timeScale != _linearTimeScale ||
hand != _hand) {
needUpdate = true;
}
});

View file

@ -30,7 +30,7 @@ public:
QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments);
virtual bool shouldSuppressLocationEdits() { return true; }
virtual bool shouldSuppressLocationEdits() { return false; }
private:
static const uint16_t holdVersion;