diff options
author | Melanie | 2010-12-13 11:13:34 +0100 |
---|---|---|
committer | Melanie | 2010-12-13 11:13:34 +0100 |
commit | d36b880022b5efcd1c6d98d94a868575d2f6f184 (patch) | |
tree | 2c3adfacc06c0a8bab4c1786c71967ab86378fd5 /OpenSim/Region/CoreModules/World | |
parent | Correct Sensor axis for unattached daughter prims. (diff) | |
download | opensim-SC_OLD-d36b880022b5efcd1c6d98d94a868575d2f6f184.zip opensim-SC_OLD-d36b880022b5efcd1c6d98d94a868575d2f6f184.tar.gz opensim-SC_OLD-d36b880022b5efcd1c6d98d94a868575d2f6f184.tar.bz2 opensim-SC_OLD-d36b880022b5efcd1c6d98d94a868575d2f6f184.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9779c68..2554995 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1624,7 +1624,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1624 | ScenePresence SP; | 1624 | ScenePresence SP; |
1625 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP); | 1625 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP); |
1626 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); | 1626 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); |
1627 | if (SP.GodLevel != 0) | 1627 | if (SP.UserLevel != 0) |
1628 | { | 1628 | { |
1629 | if (flags == 0) //All parcels, scripted or not | 1629 | if (flags == 0) //All parcels, scripted or not |
1630 | { | 1630 | { |
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1692 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); | 1692 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); |
1693 | System.Threading.Timer Timer; | 1693 | System.Threading.Timer Timer; |
1694 | 1694 | ||
1695 | if (targetAvatar.GodLevel == 0) | 1695 | if (targetAvatar.UserLevel == 0) |
1696 | { | 1696 | { |
1697 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); | 1697 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); |
1698 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) | 1698 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) |
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1737 | //Just eject | 1737 | //Just eject |
1738 | if (flags == 0) | 1738 | if (flags == 0) |
1739 | { | 1739 | { |
1740 | if (targetAvatar.GodLevel == 0) | 1740 | if (targetAvatar.UserLevel == 0) |
1741 | { | 1741 | { |
1742 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); | 1742 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); |
1743 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) | 1743 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) |
@@ -1816,7 +1816,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1816 | //Eject and ban | 1816 | //Eject and ban |
1817 | if (flags == 1) | 1817 | if (flags == 1) |
1818 | { | 1818 | { |
1819 | if (targetAvatar.GodLevel == 0) | 1819 | if (targetAvatar.UserLevel == 0) |
1820 | { | 1820 | { |
1821 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); | 1821 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); |
1822 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) | 1822 | if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land)) |