diff options
| author | Jeff Ames | 2008-10-06 23:08:52 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-10-06 23:08:52 +0000 |
| commit | 18d4216cf4cab4cceb4bd9de9a0a24b75de2f2a7 (patch) | |
| tree | af8fa6a8b433a1f30e46bd465678580d0889f139 /OpenSim/Region | |
| parent | cleaning up OSHttpResponse: note that read access to extra header (diff) | |
| download | opensim-SC-18d4216cf4cab4cceb4bd9de9a0a24b75de2f2a7.zip opensim-SC-18d4216cf4cab4cceb4bd9de9a0a24b75de2f2a7.tar.gz opensim-SC-18d4216cf4cab4cceb4bd9de9a0a24b75de2f2a7.tar.bz2 opensim-SC-18d4216cf4cab4cceb4bd9de9a0a24b75de2f2a7.tar.xz | |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index f4ada1a..fde4dc7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -3037,14 +3037,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 3037 | { | 3037 | { |
| 3038 | switch (field) | 3038 | switch (field) |
| 3039 | { | 3039 | { |
| 3040 | case 1: | 3040 | case 1: |
| 3041 | if (god) | 3041 | if (god) |
| 3042 | { | 3042 | { |
| 3043 | _baseMask = ApplyMask(_baseMask, set, mask); | 3043 | _baseMask = ApplyMask(_baseMask, set, mask); |
| 3044 | ApplyGodPermissions(_baseMask); | 3044 | ApplyGodPermissions(_baseMask); |
| 3045 | } | 3045 | } |
| 3046 | 3046 | ||
| 3047 | break; | 3047 | break; |
| 3048 | case 2: | 3048 | case 2: |
| 3049 | _ownerMask = ApplyMask(_ownerMask, set, mask) & | 3049 | _ownerMask = ApplyMask(_ownerMask, set, mask) & |
| 3050 | baseMask; | 3050 | baseMask; |