diff options
| author | Melanie Thielker | 2017-01-16 14:55:54 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-16 14:55:54 +0000 |
| commit | d78f04b3265911ea79aa0d0b1ab84ab01c3de049 (patch) | |
| tree | 9def294da5de817adde32cb9cdc06c216496efe9 /OpenSim/Framework | |
| parent | add code for fixing effective permitions. This is a test, and currently too s... (diff) | |
| parent | Remove the last instance of the legacy slam but being set (diff) | |
| download | opensim-SC_OLD-d78f04b3265911ea79aa0d0b1ab84ab01c3de049.zip opensim-SC_OLD-d78f04b3265911ea79aa0d0b1ab84ab01c3de049.tar.gz opensim-SC_OLD-d78f04b3265911ea79aa0d0b1ab84ab01c3de049.tar.bz2 opensim-SC_OLD-d78f04b3265911ea79aa0d0b1ab84ab01c3de049.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 2deb1fb..0037f4f 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -67,6 +67,14 @@ namespace OpenSim.Framework | |||
| 67 | FoldedModify = 1 << 1, | 67 | FoldedModify = 1 << 1, |
| 68 | FoldedCopy = 1 << 2, | 68 | FoldedCopy = 1 << 2, |
| 69 | FoldedExport = 1 << 3, | 69 | FoldedExport = 1 << 3, |
| 70 | |||
| 71 | // DO NOT USE THIS FOR NEW WORK. IT IS DEPRECATED AND | ||
| 72 | // EXISTS ONLY TO REACT TO EXISTING OBJECTS HAVING IT. | ||
| 73 | // NEW CODE SHOULD NEVER SET THIS BIT! | ||
| 74 | // Use InventoryItemFlags.ObjectSlamPerm in the Flags field of | ||
| 75 | // this legacy slam bit. It comes from prior incomplete | ||
| 76 | // understanding of the code and the prohibition on | ||
| 77 | // reading viewer code that used to be in place. | ||
| 70 | Slam = (1 << 4), | 78 | Slam = (1 << 4), |
| 71 | 79 | ||
| 72 | FoldedMask = 0x0f, | 80 | FoldedMask = 0x0f, |