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

set key ID for verified user in right place

Browse source
This commit is contained in:
Stephen Birarda 2016-07-29 15:53:45 -07:00
parent 6196f5e86f
commit a1220b87f1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
domain-server/src/DomainGatekeeper.cpp
View file

@ -147,7 +147,6 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
#endif #endif
} }
} else { } else {
userPerms.setID(verifiedUsername);
if (_server->_settingsManager.havePermissionsForName(verifiedUsername)) { if (_server->_settingsManager.havePermissionsForName(verifiedUsername)) {
userPerms = _server->_settingsManager.getPermissionsForName(verifiedUsername); userPerms = _server->_settingsManager.getPermissionsForName(verifiedUsername);
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
@ -161,7 +160,6 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
qDebug() << "| user-permissions: specific IP matches, so:" << userPerms; qDebug() << "| user-permissions: specific IP matches, so:" << userPerms;
#endif #endif
} else { } else {
// they are logged into metaverse, but we don't have specific permissions for them. // they are logged into metaverse, but we don't have specific permissions for them.
userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn); userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn);
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
@ -208,6 +206,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
} }
} }
userPerms.setID(verifiedUsername);
userPerms.setVerifiedUserName(verifiedUsername); userPerms.setVerifiedUserName(verifiedUsername);
} }