aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-17 16:11:03 +0000
committerJustin Clarke Casey2008-12-17 16:11:03 +0000
commitb4680f653dbc1c6f712898af79c4ea22bca3f678 (patch)
tree8482ca109db6d7e4b51221f0631c483a4a2d0fef /OpenSim/Region/Environment/Modules/World
parent* Adding some locks to XEngine's m_PrimObjects which were prone to 'the colle... (diff)
downloadopensim-SC-b4680f653dbc1c6f712898af79c4ea22bca3f678.zip
opensim-SC-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.gz
opensim-SC-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.bz2
opensim-SC-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.xz
* Implement 'Save Object Back to My Inventory'. On the Linden client this is in the Tools menu available when editing an object
* This facility allows you to save changes to an object that you've rezzed into a region back into their original inventory item without having to take a copy of the rezzed object.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index e2ca975..36f5965 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -1106,7 +1106,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1106 // the administrator object permissions to take effect. 1106 // the administrator object permissions to take effect.
1107 // UUID objectOwner = task.OwnerID; 1107 // UUID objectOwner = task.OwnerID;
1108 1108
1109
1110 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) 1109 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
1111 permission = true; 1110 permission = true;
1112 1111
@@ -1120,6 +1119,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1120 if ((task.GetEffectivePermissions() & PERM_COPY) == 0) 1119 if ((task.GetEffectivePermissions() & PERM_COPY) == 0)
1121 permission = false; 1120 permission = false;
1122 } 1121 }
1122
1123 return permission; 1123 return permission;
1124 } 1124 }
1125 1125