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

Fix incorrectly resolved merge conflict, left too much code.

Browse source
This commit is contained in:
Dale Glass 2023-12-06 13:29:08 +01:00 committed by HifiExperiments
parent ac01435c37
commit 96e864e4e9
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
assignment-client/src/avatars/MixerAvatar.h
View file

@ -45,21 +45,6 @@ private:
bool _needsHeroCheck { false }; bool _needsHeroCheck { false };
bool _needsIdentityUpdate { false }; bool _needsIdentityUpdate { false };
bool generateFSTHash();
bool validateFSTHash(const QString& publicKey) const;
QByteArray canonicalJson(const QString fstFile);
void requestCurrentOwnership();
void sendOwnerChallenge();
static const QString VERIFY_FAIL_MODEL;
private slots:
void fstRequestComplete();
void ownerRequestComplete();
void challengeTimeout();
signals:
void startChallengeTimer();
}; };
using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>; using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>;