Dump OpenSim 0.9.0.1 into it's own branch.

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
 
         private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark |
                                 (uint)ParcelFlags.AllowAPrimitiveEntry |
-                                (uint)ParcelFlags.AllowDeedToGroup | (uint)ParcelFlags.AllowTerraform |
+                                (uint)ParcelFlags.AllowDeedToGroup |
                                 (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts |
-                                (uint)ParcelFlags.SoundLocal | (uint)ParcelFlags.AllowVoiceChat;
+                                (uint)ParcelFlags.AllowVoiceChat;
 
-        private byte _landingType = 0;
+        private byte _landingType = (byte)OpenMetaverse.LandingType.Direct;
         private string _name = "Your Parcel";
         private ParcelStatus _status = ParcelStatus.Leased;
         private int _localID = 0;
@@ -97,7 +97,13 @@ namespace OpenSim.Framework
         private bool _mediaLoop = false;
         private bool _obscureMusic = false;
         private bool _obscureMedia = false;
-        private float _dwell = 0;
+
+        private float m_dwell = 0;
+        public double LastDwellTimeMS;
+
+        public bool SeeAVs { get; set; }
+        public bool AnyAVSounds { get; set; }
+        public bool GroupAVSounds { get; set; }
 
         /// <summary>
         /// Traffic count of parcel
@@ -107,11 +113,12 @@ namespace OpenSim.Framework
         {
             get
             {
-                return _dwell;
+                return m_dwell;
             }
             set
             {
-                _dwell = value;
+                m_dwell = value;
+                LastDwellTimeMS = Util.GetTimeStampMS();
             }
         }
 
@@ -407,7 +414,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Determines if people are able to teleport where they please on the parcel or if they 
+        /// Determines if people are able to teleport where they please on the parcel or if they
         /// get constrainted to a specific point on teleport within the parcel
         /// </summary>
         public byte LandingType
@@ -616,7 +623,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Number of meters^2 in the Simulator
+        /// Number of meters^2 that the land owner has in the Simulator
         /// </summary>
         [XmlIgnore]
         public int SimwideArea
@@ -663,7 +670,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the location 
+        /// When teleporting is restricted to a certain point, this is the location
         /// that the user will be redirected to
         /// </summary>
         public Vector3 UserLocation
@@ -679,7 +686,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// When teleporting is restricted to a certain point, this is the rotation 
+        /// When teleporting is restricted to a certain point, this is the rotation
         /// that the user will be positioned
         /// </summary>
         public Vector3 UserLookAt
@@ -695,7 +702,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 
+        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
         /// the parcel and isn't set to the same 'group' as the parcel.
         /// </summary>
         public int OtherCleanTime
@@ -728,6 +735,10 @@ namespace OpenSim.Framework
         public LandData()
         {
             _globalID = UUID.Random();
+            SeeAVs = true;
+            AnyAVSounds = true;
+            GroupAVSounds = true;
+            LastDwellTimeMS = Util.GetTimeStampMS();
         }
 
         /// <summary>
@@ -777,7 +788,10 @@ namespace OpenSim.Framework
             landData._obscureMedia = _obscureMedia;
             landData._simwideArea = _simwideArea;
             landData._simwidePrims = _simwidePrims;
-            landData._dwell = _dwell;
+            landData.m_dwell = m_dwell;
+            landData.SeeAVs = SeeAVs;
+            landData.AnyAVSounds = AnyAVSounds;
+            landData.GroupAVSounds = GroupAVSounds;
 
             landData._parcelAccessList.Clear();
             foreach (LandAccessEntry entry in _parcelAccessList)
@@ -793,21 +807,21 @@ namespace OpenSim.Framework
             return landData;
         }
 
-        public void ToXml(XmlWriter xmlWriter)
-        {
-            serializer.Serialize(xmlWriter, this);
-        }
+//        public void ToXml(XmlWriter xmlWriter)
+//        {
+//            serializer.Serialize(xmlWriter, this);
+//        }
 
         /// <summary>
         /// Restore a LandData object from the serialized xml representation.
         /// </summary>
         /// <param name="xmlReader"></param>
         /// <returns></returns>
-        public static LandData FromXml(XmlReader xmlReader)
-        {
-            LandData land = (LandData)serializer.Deserialize(xmlReader);
-
-            return land;
-        }
+//        public static LandData FromXml(XmlReader xmlReader)
+//        {
+//            LandData land = (LandData)serializer.Deserialize(xmlReader);
+//
+//            return land;
+//        }
     }
 }