Change some lookups in he Land Management module to make group permissions

work better. Add a generic group permissions hoot to the scene permissions
system.
This commit is contained in:
Melanie
2010-12-13 11:13:34 +01:00
parent 9f9af315ec
commit d36b880022
2 changed files with 22 additions and 5 deletions

View File

@@ -1624,7 +1624,7 @@ namespace OpenSim.Region.CoreModules.World.Land
ScenePresence SP;
((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP);
List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
if (SP.GodLevel != 0)
if (SP.UserLevel != 0)
{
if (flags == 0) //All parcels, scripted or not
{
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.CoreModules.World.Land
((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
System.Threading.Timer Timer;
if (targetAvatar.GodLevel == 0)
if (targetAvatar.UserLevel == 0)
{
ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.CoreModules.World.Land
//Just eject
if (flags == 0)
{
if (targetAvatar.GodLevel == 0)
if (targetAvatar.UserLevel == 0)
{
ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
@@ -1816,7 +1816,7 @@ namespace OpenSim.Region.CoreModules.World.Land
//Eject and ban
if (flags == 1)
{
if (targetAvatar.GodLevel == 0)
if (targetAvatar.UserLevel == 0)
{
ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))