aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2011-01-22 19:00:46 +0100
committerMelanie2011-01-22 19:00:46 +0100
commit17787e7c87c82f266c9b9d5f525cf3c5bead6ce8 (patch)
tree30929b7e1f4db9778ae031d8eb1474a92c40d693 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-17787e7c87c82f266c9b9d5f525cf3c5bead6ce8.zip
opensim-SC_OLD-17787e7c87c82f266c9b9d5f525cf3c5bead6ce8.tar.gz
opensim-SC_OLD-17787e7c87c82f266c9b9d5f525cf3c5bead6ce8.tar.bz2
opensim-SC_OLD-17787e7c87c82f266c9b9d5f525cf3c5bead6ce8.tar.xz
Completely nixing flags from the client causes wearables to break. Fix it
so we let the lowest byte through.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7fa5509..9a93a26 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -308,6 +308,7 @@ namespace OpenSim.Region.Framework.Scenes
308 { 308 {
309 if (UUID.Zero == transactionID) 309 if (UUID.Zero == transactionID)
310 { 310 {
311 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
311 item.Name = itemUpd.Name; 312 item.Name = itemUpd.Name;
312 item.Description = itemUpd.Description; 313 item.Description = itemUpd.Description;
313 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) 314 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))