diff options
author | BlueWall | 2011-03-15 17:17:28 -0400 |
---|---|---|
committer | BlueWall | 2011-03-15 17:17:28 -0400 |
commit | d4ed38821f383d66bd3d322bdbb03942cbb43c19 (patch) | |
tree | 491f3b9295555c82a3c84b2f365df861f84f0a7f /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |
parent | Hello, World! (diff) | |
parent | Fix a bug in T015_LargeSceneObjects() where the large scene object was stored... (diff) | |
download | opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.zip opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.gz opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.bz2 opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 364dd6c..170c35f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -642,7 +642,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
642 | /// implemented by callers. | 642 | /// implemented by callers. |
643 | /// </summary> | 643 | /// </summary> |
644 | /// <param name="currentUser"></param> | 644 | /// <param name="currentUser"></param> |
645 | /// <param name="objId"></param> | 645 | /// <param name="objId">This is a scene object group UUID</param> |
646 | /// <param name="denyOnLocked"></param> | 646 | /// <param name="denyOnLocked"></param> |
647 | /// <returns></returns> | 647 | /// <returns></returns> |
648 | protected bool GenericObjectPermission(UUID currentUser, UUID objId, bool denyOnLocked) | 648 | protected bool GenericObjectPermission(UUID currentUser, UUID objId, bool denyOnLocked) |
@@ -1896,7 +1896,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1896 | // "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", | 1896 | // "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", |
1897 | // agentID, primID, face, me.ControlPermissions); | 1897 | // agentID, primID, face, me.ControlPermissions); |
1898 | 1898 | ||
1899 | return GenericPrimMediaPermission(part, agentID, me.ControlPermissions); | 1899 | return GenericObjectPermission(agentID, part.ParentGroup.UUID, true); |
1900 | } | 1900 | } |
1901 | 1901 | ||
1902 | private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face) | 1902 | private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face) |