aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorHomer Horwitz2008-12-03 19:45:35 +0000
committerHomer Horwitz2008-12-03 19:45:35 +0000
commit17a0474c5f62d883c365b81d44b9626a71d8b49a (patch)
treef017130b805532881ab54b37149ec95faad3d137 /OpenSim/Region
parent* Minor test correction, comment removal (diff)
downloadopensim-SC_OLD-17a0474c5f62d883c365b81d44b9626a71d8b49a.zip
opensim-SC_OLD-17a0474c5f62d883c365b81d44b9626a71d8b49a.tar.gz
opensim-SC_OLD-17a0474c5f62d883c365b81d44b9626a71d8b49a.tar.bz2
opensim-SC_OLD-17a0474c5f62d883c365b81d44b9626a71d8b49a.tar.xz
Fixes Mantis#2744: Permissions returned false for resetting scripts in
non-root SOPs. Now, they will use the SOG the SOP belongs to.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 1fe7df7..d486da4 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -1442,6 +1442,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1442 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1442 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1443 if (m_bypassPermissions) return m_bypassPermissionsValue; 1443 if (m_bypassPermissions) return m_bypassPermissionsValue;
1444 1444
1445 SceneObjectPart part = m_scene.GetSceneObjectPart(prim);
1446
1447 // If we selected a sub-prim to reset, prim won't represent the object, but only a part.
1448 // We have to check the permissions of the object, though.
1449 if (part.ParentID != 0) prim = part.ParentUUID;
1450
1445 // You can reset the scripts in any object you can edit 1451 // You can reset the scripts in any object you can edit
1446 return GenericObjectPermission(agentID, prim, false); 1452 return GenericObjectPermission(agentID, prim, false);
1447 } 1453 }