Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR fixes

Browse source
This commit is contained in:
Thijs Wenker 2019-01-04 23:59:22 +01:00
parent 5d40e1e480
commit 94146ab997
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarPackager.h
View file

@ -69,7 +69,7 @@ public:
const QString& textureFolder); const QString& textureFolder);
Q_INVOKABLE AvatarProjectStatus::AvatarProjectStatus openAvatarProject(const QString& avatarProjectFSTPath); Q_INVOKABLE AvatarProjectStatus::AvatarProjectStatus openAvatarProject(const QString& avatarProjectFSTPath);
Q_INVOKABLE bool isValidNewProjectName(const QString& projectPath, const QString& projectName) { Q_INVOKABLE bool isValidNewProjectName(const QString& projectPath, const QString& projectName) const {
return AvatarProject::isValidNewProjectName(projectPath, projectName); return AvatarProject::isValidNewProjectName(projectPath, projectName);
} }

8
libraries/networking/src/AccountManager.h
View file

@ -153,15 +153,15 @@ private:
QUrl _authURL; QUrl _authURL;
DataServerAccountInfo _accountInfo; DataServerAccountInfo _accountInfo;
bool _isWaitingForTokenRefresh{ false }; bool _isWaitingForTokenRefresh { false };
bool _isAgent{ false }; bool _isAgent { false };
bool _isWaitingForKeypairResponse { false }; bool _isWaitingForKeypairResponse { false };
QByteArray _pendingPrivateKey; QByteArray _pendingPrivateKey;
QUuid _sessionID{ QUuid::createUuid() }; QUuid _sessionID { QUuid::createUuid() };
bool _limitedCommerce{ false }; bool _limitedCommerce { false };
}; };
#endif // hifi_AccountManager_h #endif // hifi_AccountManager_h