From 1b870131d41918786e4f958adb9691abc91f9220 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 18 Jun 2020 14:33:14 +0100 Subject: [PATCH] give/use the new group power --- OpenSim/Addons/Groups/Service/GroupsService.cs | 1 + .../Region/CoreModules/World/LightShare/EnvironmentModule.cs | 4 ++-- .../XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index b5f8ff5494..783b36f701 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs @@ -68,6 +68,7 @@ namespace OpenSim.Groups GroupPowers.LandDeed | GroupPowers.LandDivideJoin | GroupPowers.LandEdit | + GroupPowers.AllowEnvironment | GroupPowers.LandEjectAndFreeze | GroupPowers.LandGardening | GroupPowers.LandManageAllowed | diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs index c803de9767..890ab1d998 100644 --- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs @@ -491,7 +491,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare } if (track != -1) { - message = "Environment Track not suported"; + message = "Environment Track not supported"; goto Error; } } @@ -517,7 +517,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare goto Error; } - if (!m_scene.Permissions.CanEditParcelProperties(agentID, lchannel, 0, true)) // wrong + if (!m_scene.Permissions.CanEditParcelProperties(agentID, lchannel, (GroupPowers.AllowEnvironment | GroupPowers.LandEdit), true)) // wrong { message = "No permission to change parcel environment"; goto Error; diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index fab7e8c894..052427adbf 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs @@ -88,6 +88,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | GroupPowers.LandDeed | GroupPowers.LandDivideJoin | GroupPowers.LandEdit + | GroupPowers.AllowEnvironment | GroupPowers.LandEjectAndFreeze | GroupPowers.LandGardening | GroupPowers.LandManageAllowed