Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 17:54:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Set default value of canRezAvatarEntities to that of canConnectToDomain

Browse source
This commit is contained in:
David Rowe 2021-03-03 16:31:12 +13:00
parent fb074fa2a9
commit 2e75983800
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/describe-settings.json
View file

@ -1,5 +1,5 @@
{ {
"version": 2.4, "version": 2.5,
"settings": [ "settings": [
{ {
"name": "metaverse", "name": "metaverse",

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

@ -363,9 +363,6 @@ void DomainServerSettingsManager::setupConfigMap(const QString& userConfigFilena
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;
permissionsSet[userKey]->set(NodePermissions::Permission::canRezAvatarEntities);
if (onlyEditorsAreRezzers) { if (onlyEditorsAreRezzers) {
if (permissionsSet[userKey]->can(NodePermissions::Permission::canAdjustLocks)) { if (permissionsSet[userKey]->can(NodePermissions::Permission::canAdjustLocks)) {
permissionsSet[userKey]->set(NodePermissions::Permission::canRezPermanentEntities); permissionsSet[userKey]->set(NodePermissions::Permission::canRezPermanentEntities);
@ -530,6 +527,28 @@ void DomainServerSettingsManager::setupConfigMap(const QString& userConfigFilena
*newAdminRoles = adminRoles; *newAdminRoles = adminRoles;
} }
if (oldVersion < 2.5) {
// Default values for new canRezAvatarEntities permission.
unpackPermissions();
std::list<std::unordered_map<NodePermissionsKey, NodePermissionsPointer>> permissionsSets{
_standardAgentPermissions.get(),
_agentPermissions.get(),
_ipPermissions.get(),
_macPermissions.get(),
_machineFingerprintPermissions.get(),
_groupPermissions.get(),
_groupForbiddens.get()
};
foreach (auto permissionsSet, permissionsSets) {
for (auto entry : permissionsSet) {
const auto& userKey = entry.first;
if (permissionsSet[userKey]->can(NodePermissions::Permission::canConnectToDomain)) {
permissionsSet[userKey]->set(NodePermissions::Permission::canRezAvatarEntities);
}
}
}
packPermissions();
}
// write the current description version to our settings // write the current description version to our settings
*versionVariant = _descriptionVersion; *versionVariant = _descriptionVersion;