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

Send new parcel permissions to activate viewer options - done right this time

avinationmerge
Melanie Thielker 2014-07-29 04:19:01 +02:00
parent 477b5b5623
commit dfa9780c8c
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Framework/LandData.cs
View File

@ -99,6 +99,10 @@ namespace OpenSim.Framework
private bool _obscureMedia = false; private bool _obscureMedia = false;
private float _dwell = 0; private float _dwell = 0;
public bool SeeAVs { get; set; }
public bool AnyAVSounds { get; set; }
public bool GroupAVSounds { get; set; }
/// <summary> /// <summary>
/// Traffic count of parcel /// Traffic count of parcel
/// </summary> /// </summary>
@ -728,6 +732,9 @@ namespace OpenSim.Framework
public LandData() public LandData()
{ {
_globalID = UUID.Random(); _globalID = UUID.Random();
SeeAVs = true;
AnyAVSounds = true;
GroupAVSounds = true;
} }
/// <summary> /// <summary>
@ -778,6 +785,9 @@ namespace OpenSim.Framework
landData._simwideArea = _simwideArea; landData._simwideArea = _simwideArea;
landData._simwidePrims = _simwidePrims; landData._simwidePrims = _simwidePrims;
landData._dwell = _dwell; landData._dwell = _dwell;
landData.SeeAVs = SeeAVs;
landData.AnyAVSounds = AnyAVSounds;
landData.GroupAVSounds = GroupAVSounds;
landData._parcelAccessList.Clear(); landData._parcelAccessList.Clear();
foreach (LandAccessEntry entry in _parcelAccessList) foreach (LandAccessEntry entry in _parcelAccessList)
@ -793,21 +803,21 @@ namespace OpenSim.Framework
return landData; return landData;
} }
public void ToXml(XmlWriter xmlWriter) // public void ToXml(XmlWriter xmlWriter)
{ // {
serializer.Serialize(xmlWriter, this); // serializer.Serialize(xmlWriter, this);
} // }
/// <summary> /// <summary>
/// Restore a LandData object from the serialized xml representation. /// Restore a LandData object from the serialized xml representation.
/// </summary> /// </summary>
/// <param name="xmlReader"></param> /// <param name="xmlReader"></param>
/// <returns></returns> /// <returns></returns>
public static LandData FromXml(XmlReader xmlReader) // public static LandData FromXml(XmlReader xmlReader)
{ // {
LandData land = (LandData)serializer.Deserialize(xmlReader); // LandData land = (LandData)serializer.Deserialize(xmlReader);
//
return land; // return land;
} // }
} }
} }

10
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4976,10 +4976,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
OSD message_body = updateMessage.Serialize(); OSD message_body = updateMessage.Serialize();
// Add new fields here until OMV has them // Add new fields here until OMV has them
OSDMap parcelData = (OSDMap)message_body; OSDMap bodyMap = (OSDMap)message_body;
parcelData["SeeAVs"] = OSD.FromBoolean(true); OSDArray parcelDataArray = (OSDArray)bodyMap["ParcelData"];
parcelData["AnyAVSounds"] = OSD.FromBoolean(true); OSDMap parcelData = (OSDMap)parcelDataArray[0];
parcelData["GroupAVSounds"] = OSD.FromBoolean(true); parcelData["SeeAVs"] = OSD.FromBoolean(landData.SeeAVs);
parcelData["AnyAVSounds"] = OSD.FromBoolean(landData.AnyAVSounds);
parcelData["GroupAVSounds"] = OSD.FromBoolean(landData.GroupAVSounds);
OSDMap message = new OSDMap(); OSDMap message = new OSDMap();
message.Add("message", OSD.FromString("ParcelProperties")); message.Add("message", OSD.FromString("ParcelProperties"));
message.Add("body", message_body); message.Add("body", message_body);