aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-01-12 17:40:21 +0100
committerMelanie2011-01-12 17:40:21 +0100
commitf59b55d930b4a715d2ea5b99d2b3f5494073b1ae (patch)
tree1ae3bc680fc64c2768996f3caa6e251a7401d82e /OpenSim/Region/Framework/Scenes
parentFix direct item give permissions (diff)
downloadopensim-SC-f59b55d930b4a715d2ea5b99d2b3f5494073b1ae.zip
opensim-SC-f59b55d930b4a715d2ea5b99d2b3f5494073b1ae.tar.gz
opensim-SC-f59b55d930b4a715d2ea5b99d2b3f5494073b1ae.tar.bz2
opensim-SC-f59b55d930b4a715d2ea5b99d2b3f5494073b1ae.tar.xz
Dont' trust the viewer! Fix a permission slam error caused by trusting
the viewer too much.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7216b39..7fa5509 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -308,7 +308,6 @@ namespace OpenSim.Region.Framework.Scenes
308 { 308 {
309 if (UUID.Zero == transactionID) 309 if (UUID.Zero == transactionID)
310 { 310 {
311 item.Flags = itemUpd.Flags;
312 item.Name = itemUpd.Name; 311 item.Name = itemUpd.Name;
313 item.Description = itemUpd.Description; 312 item.Description = itemUpd.Description;
314 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) 313 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))