aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/LandUpdateArgs.cs3
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs13
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs3
3 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 7d6c4f2..a48b8bf 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -56,5 +56,8 @@ namespace OpenSim.Framework
56 public bool MediaLoop; 56 public bool MediaLoop;
57 public bool ObscureMusic; 57 public bool ObscureMusic;
58 public bool ObscureMedia; 58 public bool ObscureMedia;
59 public bool SeeAVs;
60 public bool AnyAVSounds;
61 public bool GroupAVSounds;
59 } 62 }
60} 63}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 9058834..85fc7a8 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
1553 land_update.ObscureMusic = properties.ObscureMusic; 1553 land_update.ObscureMusic = properties.ObscureMusic;
1554 land_update.ObscureMedia = properties.ObscureMedia; 1554 land_update.ObscureMedia = properties.ObscureMedia;
1555 1555
1556 if (args.ContainsKey("SeeAVs"))
1557 {
1558 land_update.SeeAVs = args["SeeAVs"].AsBoolean();
1559 land_update.AnyAVSounds = args["AnyAVSounds"].AsBoolean();
1560 land_update.GroupAVSounds = args["GroupAVSounds"].AsBoolean();
1561 }
1562 else
1563 {
1564 land_update.SeeAVs = true;
1565 land_update.AnyAVSounds = true;
1566 land_update.GroupAVSounds = true;
1567 }
1568
1556 ILandObject land; 1569 ILandObject land;
1557 lock (m_landList) 1570 lock (m_landList)
1558 { 1571 {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 7321054..cf37e09 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
292 ParcelFlags.AllowAPrimitiveEntry | 292 ParcelFlags.AllowAPrimitiveEntry |
293 ParcelFlags.AllowGroupObjectEntry | 293 ParcelFlags.AllowGroupObjectEntry |
294 ParcelFlags.AllowFly); 294 ParcelFlags.AllowFly);
295 newData.SeeAVs = args.SeeAVs;
296 newData.AnyAVSounds = args.AnyAVSounds;
297 newData.GroupAVSounds = args.GroupAVSounds;
295 } 298 }
296 299
297 if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale, true)) 300 if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale, true))