diff options
author | Justin Clark-Casey (justincc) | 2014-04-23 19:55:51 +0100 |
---|---|---|
committer | Melanie | 2014-04-23 22:59:28 +0100 |
commit | c77cd6adc78164e0e43e6c65d77162e348346241 (patch) | |
tree | 22cca2463aba823e777d1568b48419c536a54708 /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Prevent sending Land Properties for unprivileged users (diff) | |
download | opensim-SC_OLD-c77cd6adc78164e0e43e6c65d77162e348346241.zip opensim-SC_OLD-c77cd6adc78164e0e43e6c65d77162e348346241.tar.gz opensim-SC_OLD-c77cd6adc78164e0e43e6c65d77162e348346241.tar.bz2 opensim-SC_OLD-c77cd6adc78164e0e43e6c65d77162e348346241.tar.xz |
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 4ea1739..7325e48 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Linq; | ||
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using log4net; | 31 | using log4net; |
33 | using OpenMetaverse; | 32 | using OpenMetaverse; |
@@ -390,7 +389,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
390 | ParcelFlags.DenyAgeUnverified); | 389 | ParcelFlags.DenyAgeUnverified); |
391 | } | 390 | } |
392 | 391 | ||
393 | if (allowedDelta != 0) | 392 | if (allowedDelta != (uint)ParcelFlags.None) |
394 | { | 393 | { |
395 | uint preserve = LandData.Flags & ~allowedDelta; | 394 | uint preserve = LandData.Flags & ~allowedDelta; |
396 | newData.Flags = preserve | (args.ParcelFlags & allowedDelta); | 395 | newData.Flags = preserve | (args.ParcelFlags & allowedDelta); |