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

Merge pull request #6 from ctrlaltdavid/fix/can-rez-attachment

Browse source 
Fix up default domain permissions
This commit is contained in:
Kalila 2021-03-22 22:31:19 -04:00 committed by GitHub
commit 70ebdf70e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,18 +446,20 @@
"default": [ "default": [
{ {
"id_can_connect": true, "id_can_connect": true,
"id_can_rez_avatar_entities": true,
"id_can_rez_tmp_certified": true, "id_can_rez_tmp_certified": true,
"permissions_id": "anonymous" "permissions_id": "anonymous"
}, },
{ {
"id_can_connect": true, "id_can_connect": true,
"id_can_rez_avatar_entities": true,
"id_can_rez_tmp_certified": true, "id_can_rez_tmp_certified": true,
"permissions_id": "friends" "permissions_id": "friends"
}, },
{ {
"id_can_adjust_locks": true,
"id_can_rez_avatar_entities": true,
"id_can_connect": true, "id_can_connect": true,
"id_can_rez_avatar_entities": true,
"id_can_adjust_locks": true,
"id_can_connect_past_max_capacity": true, "id_can_connect_past_max_capacity": true,
"id_can_kick": true, "id_can_kick": true,
"id_can_replace_content": true, "id_can_replace_content": true,
@ -471,6 +473,7 @@
}, },
{ {
"id_can_connect": true, "id_can_connect": true,
"id_can_rez_avatar_entities": true,
"id_can_rez_tmp_certified": true, "id_can_rez_tmp_certified": true,
"permissions_id": "logged-in" "permissions_id": "logged-in"
} }

4
domain-server/resources/web/wizard/js/wizard.js
View file

@ -465,6 +465,7 @@ function savePermissions() {
"standard_permissions": [ "standard_permissions": [
{ {
"id_can_connect": anonymousCanConnect, "id_can_connect": anonymousCanConnect,
"id_can_rez_avatar_entities": anonymousCanConnect,
"id_can_rez": anonymousCanRez, "id_can_rez": anonymousCanRez,
"id_can_rez_certified": anonymousCanRez, "id_can_rez_certified": anonymousCanRez,
"id_can_rez_tmp": anonymousCanRez, "id_can_rez_tmp": anonymousCanRez,
@ -473,6 +474,7 @@ function savePermissions() {
}, },
{ {
"id_can_connect": friendsCanConnect, "id_can_connect": friendsCanConnect,
"id_can_rez_avatar_entities": friendsCanConnect,
"id_can_rez": friendsCanRez, "id_can_rez": friendsCanRez,
"id_can_rez_certified": friendsCanRez, "id_can_rez_certified": friendsCanRez,
"id_can_rez_tmp": friendsCanRez, "id_can_rez_tmp": friendsCanRez,
@ -481,6 +483,7 @@ function savePermissions() {
}, },
{ {
"id_can_connect": loggedInCanConnect, "id_can_connect": loggedInCanConnect,
"id_can_rez_avatar_entities": loggedInCanConnect,
"id_can_rez": loggedInCanRez, "id_can_rez": loggedInCanRez,
"id_can_rez_certified": loggedInCanRez, "id_can_rez_certified": loggedInCanRez,
"id_can_rez_tmp": loggedInCanRez, "id_can_rez_tmp": loggedInCanRez,
@ -490,6 +493,7 @@ function savePermissions() {
{ {
"id_can_adjust_locks": localhostPermissions, "id_can_adjust_locks": localhostPermissions,
"id_can_connect": localhostPermissions, "id_can_connect": localhostPermissions,
"id_can_rez_avatar_entities": localhostPermissions,
"id_can_connect_past_max_capacity": localhostPermissions, "id_can_connect_past_max_capacity": localhostPermissions,
"id_can_kick": localhostPermissions, "id_can_kick": localhostPermissions,
"id_can_replace_content": localhostPermissions, "id_can_replace_content": localhostPermissions,

7
libraries/networking/src/NodePermissions.cpp
View file

@ -144,6 +144,9 @@ QDebug operator<<(QDebug debug, const NodePermissions& perms) {
if (perms.can(NodePermissions::Permission::canConnectToDomain)) { if (perms.can(NodePermissions::Permission::canConnectToDomain)) {
debug << " connect"; debug << " connect";
} }
if (perms.can(NodePermissions::Permission::canRezAvatarEntities)) {
debug << " rez-avatar-entities";
}
if (perms.can(NodePermissions::Permission::canAdjustLocks)) { if (perms.can(NodePermissions::Permission::canAdjustLocks)) {
debug << " locks"; debug << " locks";
} }
@ -174,12 +177,10 @@ QDebug operator<<(QDebug debug, const NodePermissions& perms) {
if (perms.can(NodePermissions::Permission::canGetAndSetPrivateUserData)) { if (perms.can(NodePermissions::Permission::canGetAndSetPrivateUserData)) {
debug << " get-and-set-private-user-data"; debug << " get-and-set-private-user-data";
} }
if (perms.can(NodePermissions::Permission::canRezAvatarEntities)) {
debug << " rez-avatar-entities";
}
debug.nospace() << "]"; debug.nospace() << "]";
return debug.nospace(); return debug.nospace();
} }
QDebug operator<<(QDebug debug, const NodePermissionsPointer& perms) { QDebug operator<<(QDebug debug, const NodePermissionsPointer& perms) {
if (perms) { if (perms) {
return operator<<(debug, *perms.get()); return operator<<(debug, *perms.get());