From 0c2537bb2418f3c66fd060b3852e90df43adbd27 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 29 Jul 2014 04:41:38 +0200 Subject: [PATCH] Try to plumb the other half --- OpenSim/Framework/LandUpdateArgs.cs | 3 +++ .../CoreModules/World/Land/LandManagementModule.cs | 13 +++++++++++++ OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 +++ 3 files changed, 19 insertions(+) diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs index 7d6c4f2dab..a48b8bf63a 100644 --- a/OpenSim/Framework/LandUpdateArgs.cs +++ b/OpenSim/Framework/LandUpdateArgs.cs @@ -56,5 +56,8 @@ namespace OpenSim.Framework public bool MediaLoop; public bool ObscureMusic; public bool ObscureMedia; + public bool SeeAVs; + public bool AnyAVSounds; + public bool GroupAVSounds; } } diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9058834384..85fc7a8e4c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -1553,6 +1553,19 @@ namespace OpenSim.Region.CoreModules.World.Land land_update.ObscureMusic = properties.ObscureMusic; land_update.ObscureMedia = properties.ObscureMedia; + if (args.ContainsKey("SeeAVs")) + { + land_update.SeeAVs = args["SeeAVs"].AsBoolean(); + land_update.AnyAVSounds = args["AnyAVSounds"].AsBoolean(); + land_update.GroupAVSounds = args["GroupAVSounds"].AsBoolean(); + } + else + { + land_update.SeeAVs = true; + land_update.AnyAVSounds = true; + land_update.GroupAVSounds = true; + } + ILandObject land; lock (m_landList) { diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 73210544bb..cf37e09bf5 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -292,6 +292,9 @@ namespace OpenSim.Region.CoreModules.World.Land ParcelFlags.AllowAPrimitiveEntry | ParcelFlags.AllowGroupObjectEntry | ParcelFlags.AllowFly); + newData.SeeAVs = args.SeeAVs; + newData.AnyAVSounds = args.AnyAVSounds; + newData.GroupAVSounds = args.GroupAVSounds; } if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale, true))