Prevent sending Land Properties for unprivileged users

avinationmerge
Dev Random 2014-04-23 12:58:31 -04:00 committed by Melanie
parent f93dac9239
commit fb321a0573
1 changed files with 8 additions and 5 deletions

View File

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
@ -389,13 +390,15 @@ namespace OpenSim.Region.CoreModules.World.Land
ParcelFlags.DenyAgeUnverified); ParcelFlags.DenyAgeUnverified);
} }
if (allowedDelta != 0)
{
uint preserve = LandData.Flags & ~allowedDelta; uint preserve = LandData.Flags & ~allowedDelta;
newData.Flags = preserve | (args.ParcelFlags & allowedDelta); newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData); m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
SendLandUpdateToAvatarsOverMe(snap_selection); SendLandUpdateToAvatarsOverMe(snap_selection);
} }
}
public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area) public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
{ {