OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to plumb the other half

avinationmerge
Melanie Thielker 2014-07-29 04:41:38 +02:00
parent dfa9780c8c
commit 0c2537bb24
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/LandUpdateArgs.cs
View File

@ -56,5 +56,8 @@ namespace OpenSim.Framework
public bool MediaLoop; public bool MediaLoop;
public bool ObscureMusic; public bool ObscureMusic;
public bool ObscureMedia; public bool ObscureMedia;
public bool SeeAVs;
public bool AnyAVSounds;
public bool GroupAVSounds;
} }
} }

13
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -1553,6 +1553,19 @@ namespace OpenSim.Region.CoreModules.World.Land
land_update.ObscureMusic = properties.ObscureMusic; land_update.ObscureMusic = properties.ObscureMusic;
land_update.ObscureMedia = properties.ObscureMedia; 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; ILandObject land;
lock (m_landList) lock (m_landList)
{ {

3
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -292,6 +292,9 @@ namespace OpenSim.Region.CoreModules.World.Land
ParcelFlags.AllowAPrimitiveEntry | ParcelFlags.AllowAPrimitiveEntry |
ParcelFlags.AllowGroupObjectEntry | ParcelFlags.AllowGroupObjectEntry |
ParcelFlags.AllowFly); 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)) if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale, true))