aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-04-23 19:55:51 +0100
committerMelanie2014-04-23 22:59:28 +0100
commitc77cd6adc78164e0e43e6c65d77162e348346241 (patch)
tree22cca2463aba823e777d1568b48419c536a54708 /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentPrevent sending Land Properties for unprivileged users (diff)
downloadopensim-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.cs3
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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Linq;
31using System.Reflection; 30using System.Reflection;
32using log4net; 31using log4net;
33using OpenMetaverse; 32using 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);