diff options
author | UbitUmarov | 2017-01-14 14:19:58 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-14 14:21:50 +0000 |
commit | fb86e415615ddfd917485daf5e4a4f2f0486359f (patch) | |
tree | cfad6c25fe2d253ae970d089c54236a5fc2187d9 /OpenSim/Framework | |
parent | fix: send viewers the Everyone permitions of items inside other objects (diff) | |
download | opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.zip opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.gz opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.bz2 opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.xz |
fix incoerent definition of Slam bit (bits 3 and 4 used in diferent
places.) this may still be wrong on other places; Do not loose folded
permitions, WARNING MASTER IS NOW UNSTABLE. permissions are still broken"
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 6c0142e..2ede363 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -66,9 +66,10 @@ namespace OpenSim.Framework | |||
66 | FoldedTransfer = 1, | 66 | FoldedTransfer = 1, |
67 | FoldedModify = 1 << 1, | 67 | FoldedModify = 1 << 1, |
68 | FoldedCopy = 1 << 2, | 68 | FoldedCopy = 1 << 2, |
69 | FoldedExport = 1 << 4, | 69 | FoldedExport = 1 << 3, |
70 | Slam = 1 << 4, | ||
70 | 71 | ||
71 | FoldedMask = 0x17, | 72 | FoldedMask = 0x0f, |
72 | 73 | ||
73 | // | 74 | // |
74 | Transfer = 1 << 13, | 75 | Transfer = 1 << 13, |