diff options
author | Justin Clark-Casey (justincc) | 2011-03-14 22:47:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-14 22:47:14 +0000 |
commit | 9885f68f44ec91155d435ba9693eb57107378f45 (patch) | |
tree | e5d349c0d889ce43a07566b0fd54777e537cacc2 /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9885f68f44ec91155d435ba9693eb57107378f45.zip opensim-SC-9885f68f44ec91155d435ba9693eb57107378f45.tar.gz opensim-SC-9885f68f44ec91155d435ba9693eb57107378f45.tar.bz2 opensim-SC-9885f68f44ec91155d435ba9693eb57107378f45.tar.xz |
When setting media on a prim values, use generic object permissions instead of media permissions.
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
Diffstat (limited to 'OpenSim')
-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) |