aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2008-12-17 13:32:01 +0000
committerMW2008-12-17 13:32:01 +0000
commit027ae58dc4d210ada4b0ecf1a4861649a8c411ae (patch)
tree30eeec77d0bd3fb1a7cb5baee98800eab11a0fd3 /OpenSim/Region
parentAdded a check to CanDuplicateObject(), to stop duplicating prims that contain... (diff)
downloadopensim-SC_OLD-027ae58dc4d210ada4b0ecf1a4861649a8c411ae.zip
opensim-SC_OLD-027ae58dc4d210ada4b0ecf1a4861649a8c411ae.tar.gz
opensim-SC_OLD-027ae58dc4d210ada4b0ecf1a4861649a8c411ae.tar.bz2
opensim-SC_OLD-027ae58dc4d210ada4b0ecf1a4861649a8c411ae.tar.xz
Stop users taking a copy of a in world prim that contains inventory items that have no copy permission set.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 964e39c..e2ca975 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -1109,6 +1109,16 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1109 1109
1110 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) 1110 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
1111 permission = true; 1111 permission = true;
1112
1113 if ((task.GetEffectivePermissions() & PERM_COPY) == 0)
1114 permission = false;
1115 }
1116 else
1117 {
1118 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
1119
1120 if ((task.GetEffectivePermissions() & PERM_COPY) == 0)
1121 permission = false;
1112 } 1122 }
1113 return permission; 1123 return permission;
1114 } 1124 }