aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-04-23 19:55:51 +0100
committerJustin Clark-Casey (justincc)2014-04-23 19:55:51 +0100
commit5092cbd77e96221cd2e1c88558eb957cf90e107a (patch)
treeb96ebb129e896ac919bf0546992b3f05522adf2d
parentPrevent sending Land Properties for unprivileged users (diff)
downloadopensim-SC_OLD-5092cbd77e96221cd2e1c88558eb957cf90e107a.zip
opensim-SC_OLD-5092cbd77e96221cd2e1c88558eb957cf90e107a.tar.gz
opensim-SC_OLD-5092cbd77e96221cd2e1c88558eb957cf90e107a.tar.bz2
opensim-SC_OLD-5092cbd77e96221cd2e1c88558eb957cf90e107a.tar.xz
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
-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 6e54915..a0c1b9d 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;
@@ -368,7 +367,7 @@ namespace OpenSim.Region.CoreModules.World.Land
368 ParcelFlags.DenyAgeUnverified); 367 ParcelFlags.DenyAgeUnverified);
369 } 368 }
370 369
371 if (allowedDelta != 0) 370 if (allowedDelta != (uint)ParcelFlags.None)
372 { 371 {
373 uint preserve = LandData.Flags & ~allowedDelta; 372 uint preserve = LandData.Flags & ~allowedDelta;
374 newData.Flags = preserve | (args.ParcelFlags & allowedDelta); 373 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);