aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land
diff options
context:
space:
mode:
authorDev Random2014-04-23 12:58:31 -0400
committerMelanie2014-04-23 22:59:13 +0100
commitfb321a05736c7ba4516f2f69ec04190b10925df5 (patch)
treee205fed9af91ffb46f43de690d5e9ba9993280ee /OpenSim/Region/CoreModules/World/Land
parentImplement Oren's fix to prevent a privilege escalation with groups (diff)
downloadopensim-SC_OLD-fb321a05736c7ba4516f2f69ec04190b10925df5.zip
opensim-SC_OLD-fb321a05736c7ba4516f2f69ec04190b10925df5.tar.gz
opensim-SC_OLD-fb321a05736c7ba4516f2f69ec04190b10925df5.tar.bz2
opensim-SC_OLD-fb321a05736c7ba4516f2f69ec04190b10925df5.tar.xz
Prevent sending Land Properties for unprivileged users
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-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 07d00c0..4ea1739 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;
@@ -389,12 +390,14 @@ namespace OpenSim.Region.CoreModules.World.Land
389 ParcelFlags.DenyAgeUnverified); 390 ParcelFlags.DenyAgeUnverified);
390 } 391 }
391 392
392 uint preserve = LandData.Flags & ~allowedDelta; 393 if (allowedDelta != 0)
393 newData.Flags = preserve | (args.ParcelFlags & allowedDelta); 394 {
394 395 uint preserve = LandData.Flags & ~allowedDelta;
395 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData); 396 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
396 397
397 SendLandUpdateToAvatarsOverMe(snap_selection); 398 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
399 SendLandUpdateToAvatarsOverMe(snap_selection);
400 }
398 } 401 }
399 402
400 public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area) 403 public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)