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

Case-sensitive header name for Linux

Browse source
This commit is contained in:
Simon Walton 2019-04-24 18:20:05 -07:00
parent 5f986bbeb7
commit 30facb32e7
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -370,9 +370,8 @@ void AvatarMixer::manageIdentityData(const SharedNodePointer& node) {
MixerAvatar& avatar = nodeData->getAvatar(); MixerAvatar& avatar = nodeData->getAvatar();
bool sendIdentity = avatar.needsIdentityUpdate(); bool sendIdentity = avatar.needsIdentityUpdate();
if (nodeData && nodeData->getAvatarSessionDisplayNameMustChange()) { if (nodeData->getAvatarSessionDisplayNameMustChange()) {
MixerAvatar& avatar = nodeData->getAvatar(); const QString& existingBaseDisplayName = avatar.getSessionDisplayName();
const QString& existingBaseDisplayName = nodeData->getAvatar().getSessionDisplayName();
if (!existingBaseDisplayName.isEmpty()) { if (!existingBaseDisplayName.isEmpty()) {
SessionDisplayName existingDisplayName { existingBaseDisplayName }; SessionDisplayName existingDisplayName { existingBaseDisplayName };

4
assignment-client/src/avatars/MixerAvatar.cpp
View file

@ -12,7 +12,7 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QJSonDocument> #include <QJsonDocument>
#include <QNetworkReply> #include <QNetworkReply>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QApplication> #include <QApplication>
@ -208,7 +208,7 @@ void MixerAvatar::processCertifyEvents() {
QNetworkReply* networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson()); QNetworkReply* networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
connect(networkReply, &QNetworkReply::finished, this, &MixerAvatar::ownerRequestComplete); connect(networkReply, &QNetworkReply::finished, this, &MixerAvatar::ownerRequestComplete);
} else { } else {
_verifyState = kVerificationFailed; _needsIdentityUpdate = true;
_pendingEvent = false; _pendingEvent = false;
qCDebug(avatars) << "Avatar" << getDisplayName() << "FAILED static certification"; qCDebug(avatars) << "Avatar" << getDisplayName() << "FAILED static certification";
} }

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

@ -29,21 +29,15 @@ public:
bool needsIdentityUpdate() const { return _needsIdentityUpdate; } bool needsIdentityUpdate() const { return _needsIdentityUpdate; }
void clearIdentityUpdate() { _needsIdentityUpdate = false; } void clearIdentityUpdate() { _needsIdentityUpdate = false; }
//bool isPendingCertifyFailed() const { return _verifyState == kVerificationFailedPending; }
//void advanceCertifyFailed() {
// if (isPendingCertifyFailed()) { _verifyState = kVerificationFailed; }
//}
void processCertifyEvents(); void processCertifyEvents();
void handleChallengeResponse(ReceivedMessage * response); void handleChallengeResponse(ReceivedMessage * response);
private: private:
bool _needsHeroCheck{ false }; bool _needsHeroCheck { false };
// Avatar certification/verification: // Avatar certification/verification:
enum VerifyState { kNoncertified, kRequestingFST, kReceivedFST, kStaticValidation, kRequestingOwner, kOwnerResponse, enum VerifyState { kNoncertified, kRequestingFST, kReceivedFST, kStaticValidation, kRequestingOwner, kOwnerResponse,
kChallengeClient, kChallengeResponse, kVerified, kVerificationFailed, kChallengeClient, kChallengeResponse, kVerified, kVerificationFailed, kVerificationSucceeded, kError };
kVerificationSucceeded, kError };
Q_ENUM(VerifyState); Q_ENUM(VerifyState);
VerifyState _verifyState { kNoncertified }; VerifyState _verifyState { kNoncertified };
std::atomic<bool> _pendingEvent { false }; std::atomic<bool> _pendingEvent { false };