diff options
author | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
commit | 9655cf280779021e6241a08f8610cad9b982763f (patch) | |
tree | 82ef6d74969e4b64971d64a6a18e4488729167a8 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | * Just some tidy up and documentation before I make my first ever attempt to ... (diff) | |
download | opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.zip opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.gz opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.bz2 opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.xz |
* Refactor: Break out permissions code into a separate region PermissionsModule
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index ee52a66..65e6fd8 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
73 | remoteClient.SendInventoryItemCreateUpdate(item); | 73 | remoteClient.SendInventoryItemCreateUpdate(item); |
74 | 74 | ||
75 | int userlevel = 0; | 75 | int userlevel = 0; |
76 | if (PermissionsMngr.IsEstateManager(remoteClient.AgentId)) | 76 | if (Permissions.IsEstateManager(remoteClient.AgentId)) |
77 | { | 77 | { |
78 | userlevel = 1; | 78 | userlevel = 1; |
79 | } | 79 | } |
@@ -784,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
784 | } | 784 | } |
785 | 785 | ||
786 | // bool permission; | 786 | // bool permission; |
787 | // permission = PermissionsMngr.CanCopyObject(remoteClient.AgentId, | 787 | // permission = Permissions.CanCopyObject(remoteClient.AgentId, |
788 | // ((SceneObjectGroup) selectedEnt).UUID); | 788 | // ((SceneObjectGroup) selectedEnt).UUID); |
789 | 789 | ||
790 | // Pending resolving upstream problems with permissions, we just won't allow anybody who is not the owner | 790 | // Pending resolving upstream problems with permissions, we just won't allow anybody who is not the owner |
@@ -988,12 +988,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
988 | bool permission; | 988 | bool permission; |
989 | if (DeRezPacket.AgentBlock.Destination == 1) | 989 | if (DeRezPacket.AgentBlock.Destination == 1) |
990 | { // Take Copy | 990 | { // Take Copy |
991 | permission = PermissionsMngr.CanCopyObject(remoteClient.AgentId, | 991 | permission = Permissions.CanCopyObject(remoteClient.AgentId, |
992 | ((SceneObjectGroup) selectedEnt).UUID); | 992 | ((SceneObjectGroup) selectedEnt).UUID); |
993 | } | 993 | } |
994 | else | 994 | else |
995 | { // Take | 995 | { // Take |
996 | permission = PermissionsMngr.CanDeRezObject(remoteClient.AgentId, | 996 | permission = Permissions.CanDeRezObject(remoteClient.AgentId, |
997 | ((SceneObjectGroup) selectedEnt).UUID); | 997 | ((SceneObjectGroup) selectedEnt).UUID); |
998 | } | 998 | } |
999 | 999 | ||
@@ -1267,7 +1267,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1267 | RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), | 1267 | RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), |
1268 | BypassRayCast, bRayEndIsIntersection,true,scale, false); | 1268 | BypassRayCast, bRayEndIsIntersection,true,scale, false); |
1269 | 1269 | ||
1270 | if (!PermissionsMngr.CanRezObject(remoteClient.AgentId, pos) && !attachment) | 1270 | if (!Permissions.CanRezObject(remoteClient.AgentId, pos) && !attachment) |
1271 | { | 1271 | { |
1272 | return null; | 1272 | return null; |
1273 | } | 1273 | } |
@@ -1361,7 +1361,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1361 | { | 1361 | { |
1362 | LLUUID ownerID = item.OwnerID; | 1362 | LLUUID ownerID = item.OwnerID; |
1363 | 1363 | ||
1364 | if (!PermissionsMngr.CanRezObject(ownerID, pos)) | 1364 | if (!Permissions.CanRezObject(ownerID, pos)) |
1365 | { | 1365 | { |
1366 | return null; | 1366 | return null; |
1367 | } | 1367 | } |