aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDev Random2014-04-23 12:58:31 -0400
committerJustin Clark-Casey (justincc)2014-04-23 19:50:59 +0100
commitcb1f2886cdfc84abb1aa2fe0f0a3ee0e62ae2088 (patch)
treeb6277fdaf8a5cea1f8e199b4af866f3cbb7aa9c8 /OpenSim/Region/CoreModules
parentFix regression test break on previous commit 328bc3b (diff)
downloadopensim-SC_OLD-cb1f2886cdfc84abb1aa2fe0f0a3ee0e62ae2088.zip
opensim-SC_OLD-cb1f2886cdfc84abb1aa2fe0f0a3ee0e62ae2088.tar.gz
opensim-SC_OLD-cb1f2886cdfc84abb1aa2fe0f0a3ee0e62ae2088.tar.bz2
opensim-SC_OLD-cb1f2886cdfc84abb1aa2fe0f0a3ee0e62ae2088.tar.xz
Prevent sending Land Properties for unprivileged users
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index b1cfc81..6e54915 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Linq;
30using System.Reflection; 31using System.Reflection;
31using log4net; 32using log4net;
32using OpenMetaverse; 33using OpenMetaverse;
@@ -367,12 +368,14 @@ namespace OpenSim.Region.CoreModules.World.Land
367 ParcelFlags.DenyAgeUnverified); 368 ParcelFlags.DenyAgeUnverified);
368 } 369 }
369 370
370 uint preserve = LandData.Flags & ~allowedDelta; 371 if (allowedDelta != 0)
371 newData.Flags = preserve | (args.ParcelFlags & allowedDelta); 372 {
372 373 uint preserve = LandData.Flags & ~allowedDelta;
373 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData); 374 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
374 375
375 SendLandUpdateToAvatarsOverMe(snap_selection); 376 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
377 SendLandUpdateToAvatarsOverMe(snap_selection);
378 }
376 } 379 }
377 380
378 public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area) 381 public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)