diff options
author | Melanie Thielker | 2014-07-29 04:19:01 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-07-29 04:19:01 +0200 |
commit | dfa9780c8c09c795bdd0dec6174ee8680c534e47 (patch) | |
tree | 85b664d9ac7bd68e5baf3bf6c038c8572389224e /OpenSim/Framework | |
parent | Add new fields to parcel update (diff) | |
download | opensim-SC_OLD-dfa9780c8c09c795bdd0dec6174ee8680c534e47.zip opensim-SC_OLD-dfa9780c8c09c795bdd0dec6174ee8680c534e47.tar.gz opensim-SC_OLD-dfa9780c8c09c795bdd0dec6174ee8680c534e47.tar.bz2 opensim-SC_OLD-dfa9780c8c09c795bdd0dec6174ee8680c534e47.tar.xz |
Send new parcel permissions to activate viewer options - done right this time
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 4dffd3f..4fbbbc1 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -99,6 +99,10 @@ namespace OpenSim.Framework | |||
99 | private bool _obscureMedia = false; | 99 | private bool _obscureMedia = false; |
100 | private float _dwell = 0; | 100 | private float _dwell = 0; |
101 | 101 | ||
102 | public bool SeeAVs { get; set; } | ||
103 | public bool AnyAVSounds { get; set; } | ||
104 | public bool GroupAVSounds { get; set; } | ||
105 | |||
102 | /// <summary> | 106 | /// <summary> |
103 | /// Traffic count of parcel | 107 | /// Traffic count of parcel |
104 | /// </summary> | 108 | /// </summary> |
@@ -728,6 +732,9 @@ namespace OpenSim.Framework | |||
728 | public LandData() | 732 | public LandData() |
729 | { | 733 | { |
730 | _globalID = UUID.Random(); | 734 | _globalID = UUID.Random(); |
735 | SeeAVs = true; | ||
736 | AnyAVSounds = true; | ||
737 | GroupAVSounds = true; | ||
731 | } | 738 | } |
732 | 739 | ||
733 | /// <summary> | 740 | /// <summary> |
@@ -778,6 +785,9 @@ namespace OpenSim.Framework | |||
778 | landData._simwideArea = _simwideArea; | 785 | landData._simwideArea = _simwideArea; |
779 | landData._simwidePrims = _simwidePrims; | 786 | landData._simwidePrims = _simwidePrims; |
780 | landData._dwell = _dwell; | 787 | landData._dwell = _dwell; |
788 | landData.SeeAVs = SeeAVs; | ||
789 | landData.AnyAVSounds = AnyAVSounds; | ||
790 | landData.GroupAVSounds = GroupAVSounds; | ||
781 | 791 | ||
782 | landData._parcelAccessList.Clear(); | 792 | landData._parcelAccessList.Clear(); |
783 | foreach (LandAccessEntry entry in _parcelAccessList) | 793 | foreach (LandAccessEntry entry in _parcelAccessList) |
@@ -793,21 +803,21 @@ namespace OpenSim.Framework | |||
793 | return landData; | 803 | return landData; |
794 | } | 804 | } |
795 | 805 | ||
796 | public void ToXml(XmlWriter xmlWriter) | 806 | // public void ToXml(XmlWriter xmlWriter) |
797 | { | 807 | // { |
798 | serializer.Serialize(xmlWriter, this); | 808 | // serializer.Serialize(xmlWriter, this); |
799 | } | 809 | // } |
800 | 810 | ||
801 | /// <summary> | 811 | /// <summary> |
802 | /// Restore a LandData object from the serialized xml representation. | 812 | /// Restore a LandData object from the serialized xml representation. |
803 | /// </summary> | 813 | /// </summary> |
804 | /// <param name="xmlReader"></param> | 814 | /// <param name="xmlReader"></param> |
805 | /// <returns></returns> | 815 | /// <returns></returns> |
806 | public static LandData FromXml(XmlReader xmlReader) | 816 | // public static LandData FromXml(XmlReader xmlReader) |
807 | { | 817 | // { |
808 | LandData land = (LandData)serializer.Deserialize(xmlReader); | 818 | // LandData land = (LandData)serializer.Deserialize(xmlReader); |
809 | 819 | // | |
810 | return land; | 820 | // return land; |
811 | } | 821 | // } |
812 | } | 822 | } |
813 | } | 823 | } |