Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 05:09:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR comments

Browse source
This commit is contained in:
Brad Davis 2017-03-15 18:13:10 -07:00
parent 2837ae9183
commit 4367e3d036
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -246,8 +246,10 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
_agentPermissions[editorKey]->set(NodePermissions::Permission::canAdjustLocks); _agentPermissions[editorKey]->set(NodePermissions::Permission::canAdjustLocks);
} }
QList<std::unordered_map<NodePermissionsKey, NodePermissionsPointer>> permissionsSets; std::list<std::unordered_map<NodePermissionsKey, NodePermissionsPointer>> permissionsSets{
permissionsSets << _standardAgentPermissions.get() << _agentPermissions.get(); _standardAgentPermissions.get(),
_agentPermissions.get()
};
foreach (auto permissionsSet, permissionsSets) { foreach (auto permissionsSet, permissionsSets) {
for (auto entry : permissionsSet) { for (auto entry : permissionsSet) {
const auto& userKey = entry.first; const auto& userKey = entry.first;
@ -301,7 +303,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
} }
QVariantMap& DomainServerSettingsManager::getDescriptorsMap() { QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {
static const QString DESCRIPTORS{ "descriptors" }; static const QString DESCRIPTORS{ "descriptors" };
auto& settingsMap = getSettingsMap(); auto& settingsMap = getSettingsMap();