From eaf52ae11118dbed0b6e5181df465e668e35477f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 25 Jul 2016 18:23:21 -0700
Subject: [PATCH] default kick perms for localhost
---
domain-server/resources/describe-settings.json | 2 +-
domain-server/src/DomainServerSettingsManager.cpp | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index b2a749a66d..524a687772 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,5 +1,5 @@
{
- "version": 1.5,
+ "version": 1.6,
"settings": [
{
"name": "metaverse",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 72aa5bada6..aba2c25db5 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -273,6 +273,15 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
// This was prior to operating hours, so add default hours
validateDescriptorsMap();
}
+
+ if (oldVersion < 1.6) {
+ unpackPermissions();
+
+ // This was prior to addition of kick permissions, add that to localhost permissions by default
+ _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canKick);
+
+ packPermissions();
+ }
}
unpackPermissions();