diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Framework/LandData.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index fc02f33..13b58be 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -67,11 +67,11 @@ namespace OpenSim.Framework | |||
67 | 67 | ||
68 | private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark | | 68 | private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark | |
69 | (uint)ParcelFlags.AllowAPrimitiveEntry | | 69 | (uint)ParcelFlags.AllowAPrimitiveEntry | |
70 | (uint)ParcelFlags.AllowDeedToGroup | (uint)ParcelFlags.AllowTerraform | | 70 | (uint)ParcelFlags.AllowDeedToGroup | |
71 | (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts | | 71 | (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts | |
72 | (uint)ParcelFlags.SoundLocal | (uint)ParcelFlags.AllowVoiceChat; | 72 | (uint)ParcelFlags.AllowVoiceChat; |
73 | 73 | ||
74 | private byte _landingType = 0; | 74 | private byte _landingType = (byte)OpenMetaverse.LandingType.Direct; |
75 | private string _name = "Your Parcel"; | 75 | private string _name = "Your Parcel"; |
76 | private ParcelStatus _status = ParcelStatus.Leased; | 76 | private ParcelStatus _status = ParcelStatus.Leased; |
77 | private int _localID = 0; | 77 | private int _localID = 0; |
@@ -97,7 +97,13 @@ namespace OpenSim.Framework | |||
97 | private bool _mediaLoop = false; | 97 | private bool _mediaLoop = false; |
98 | private bool _obscureMusic = false; | 98 | private bool _obscureMusic = false; |
99 | private bool _obscureMedia = false; | 99 | private bool _obscureMedia = false; |
100 | private float _dwell = 0; | 100 | |
101 | private float m_dwell = 0; | ||
102 | public double LastDwellTimeMS; | ||
103 | |||
104 | public bool SeeAVs { get; set; } | ||
105 | public bool AnyAVSounds { get; set; } | ||
106 | public bool GroupAVSounds { get; set; } | ||
101 | 107 | ||
102 | /// <summary> | 108 | /// <summary> |
103 | /// Traffic count of parcel | 109 | /// Traffic count of parcel |
@@ -107,11 +113,12 @@ namespace OpenSim.Framework | |||
107 | { | 113 | { |
108 | get | 114 | get |
109 | { | 115 | { |
110 | return _dwell; | 116 | return m_dwell; |
111 | } | 117 | } |
112 | set | 118 | set |
113 | { | 119 | { |
114 | _dwell = value; | 120 | m_dwell = value; |
121 | LastDwellTimeMS = Util.GetTimeStampMS(); | ||
115 | } | 122 | } |
116 | } | 123 | } |
117 | 124 | ||
@@ -407,7 +414,7 @@ namespace OpenSim.Framework | |||
407 | } | 414 | } |
408 | 415 | ||
409 | /// <summary> | 416 | /// <summary> |
410 | /// Determines if people are able to teleport where they please on the parcel or if they | 417 | /// Determines if people are able to teleport where they please on the parcel or if they |
411 | /// get constrainted to a specific point on teleport within the parcel | 418 | /// get constrainted to a specific point on teleport within the parcel |
412 | /// </summary> | 419 | /// </summary> |
413 | public byte LandingType | 420 | public byte LandingType |
@@ -616,7 +623,7 @@ namespace OpenSim.Framework | |||
616 | } | 623 | } |
617 | 624 | ||
618 | /// <summary> | 625 | /// <summary> |
619 | /// Number of meters^2 in the Simulator | 626 | /// Number of meters^2 that the land owner has in the Simulator |
620 | /// </summary> | 627 | /// </summary> |
621 | [XmlIgnore] | 628 | [XmlIgnore] |
622 | public int SimwideArea | 629 | public int SimwideArea |
@@ -663,7 +670,7 @@ namespace OpenSim.Framework | |||
663 | } | 670 | } |
664 | 671 | ||
665 | /// <summary> | 672 | /// <summary> |
666 | /// When teleporting is restricted to a certain point, this is the location | 673 | /// When teleporting is restricted to a certain point, this is the location |
667 | /// that the user will be redirected to | 674 | /// that the user will be redirected to |
668 | /// </summary> | 675 | /// </summary> |
669 | public Vector3 UserLocation | 676 | public Vector3 UserLocation |
@@ -679,7 +686,7 @@ namespace OpenSim.Framework | |||
679 | } | 686 | } |
680 | 687 | ||
681 | /// <summary> | 688 | /// <summary> |
682 | /// When teleporting is restricted to a certain point, this is the rotation | 689 | /// When teleporting is restricted to a certain point, this is the rotation |
683 | /// that the user will be positioned | 690 | /// that the user will be positioned |
684 | /// </summary> | 691 | /// </summary> |
685 | public Vector3 UserLookAt | 692 | public Vector3 UserLookAt |
@@ -695,7 +702,7 @@ namespace OpenSim.Framework | |||
695 | } | 702 | } |
696 | 703 | ||
697 | /// <summary> | 704 | /// <summary> |
698 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own | 705 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own |
699 | /// the parcel and isn't set to the same 'group' as the parcel. | 706 | /// the parcel and isn't set to the same 'group' as the parcel. |
700 | /// </summary> | 707 | /// </summary> |
701 | public int OtherCleanTime | 708 | public int OtherCleanTime |
@@ -728,6 +735,10 @@ namespace OpenSim.Framework | |||
728 | public LandData() | 735 | public LandData() |
729 | { | 736 | { |
730 | _globalID = UUID.Random(); | 737 | _globalID = UUID.Random(); |
738 | SeeAVs = true; | ||
739 | AnyAVSounds = true; | ||
740 | GroupAVSounds = true; | ||
741 | LastDwellTimeMS = Util.GetTimeStampMS(); | ||
731 | } | 742 | } |
732 | 743 | ||
733 | /// <summary> | 744 | /// <summary> |
@@ -777,7 +788,10 @@ namespace OpenSim.Framework | |||
777 | landData._obscureMedia = _obscureMedia; | 788 | landData._obscureMedia = _obscureMedia; |
778 | landData._simwideArea = _simwideArea; | 789 | landData._simwideArea = _simwideArea; |
779 | landData._simwidePrims = _simwidePrims; | 790 | landData._simwidePrims = _simwidePrims; |
780 | landData._dwell = _dwell; | 791 | landData.m_dwell = m_dwell; |
792 | landData.SeeAVs = SeeAVs; | ||
793 | landData.AnyAVSounds = AnyAVSounds; | ||
794 | landData.GroupAVSounds = GroupAVSounds; | ||
781 | 795 | ||
782 | landData._parcelAccessList.Clear(); | 796 | landData._parcelAccessList.Clear(); |
783 | foreach (LandAccessEntry entry in _parcelAccessList) | 797 | foreach (LandAccessEntry entry in _parcelAccessList) |
@@ -793,21 +807,21 @@ namespace OpenSim.Framework | |||
793 | return landData; | 807 | return landData; |
794 | } | 808 | } |
795 | 809 | ||
796 | public void ToXml(XmlWriter xmlWriter) | 810 | // public void ToXml(XmlWriter xmlWriter) |
797 | { | 811 | // { |
798 | serializer.Serialize(xmlWriter, this); | 812 | // serializer.Serialize(xmlWriter, this); |
799 | } | 813 | // } |
800 | 814 | ||
801 | /// <summary> | 815 | /// <summary> |
802 | /// Restore a LandData object from the serialized xml representation. | 816 | /// Restore a LandData object from the serialized xml representation. |
803 | /// </summary> | 817 | /// </summary> |
804 | /// <param name="xmlReader"></param> | 818 | /// <param name="xmlReader"></param> |
805 | /// <returns></returns> | 819 | /// <returns></returns> |
806 | public static LandData FromXml(XmlReader xmlReader) | 820 | // public static LandData FromXml(XmlReader xmlReader) |
807 | { | 821 | // { |
808 | LandData land = (LandData)serializer.Deserialize(xmlReader); | 822 | // LandData land = (LandData)serializer.Deserialize(xmlReader); |
809 | 823 | // | |
810 | return land; | 824 | // return land; |
811 | } | 825 | // } |
812 | } | 826 | } |
813 | } | 827 | } |