block some region/estate settings no longer avaiable

OpenSim/Framework/EstateSettings.cs

@@ -115,25 +115,28 @@ namespace OpenSim.Framework
 
         // Used by the sim
         //
-        private bool m_UseGlobalTime = true;
+        private bool m_UseGlobalTime = false;
         public bool UseGlobalTime
         {
             get { return m_UseGlobalTime; }
-            set { m_UseGlobalTime = value; }
+            //set { m_UseGlobalTime = value; }
+            set { m_UseGlobalTime = false; }
         }
 
         private bool m_FixedSun = false;
         public bool FixedSun
         {
             get { return m_FixedSun; }
-            set { m_FixedSun = value; }
+            // set { m_FixedSun = value; }
+            set { m_FixedSun = false; }
         }
 
         private double m_SunPosition = 0.0;
         public double SunPosition
         {
             get { return m_SunPosition; }
-            set { m_SunPosition = value; }
+            //set { m_SunPosition = value; }
+            set { m_SunPosition = 0; }
         }
 
         private bool m_AllowVoice = true;

OpenSim/Framework/RegionSettings.cs

@@ -121,7 +121,6 @@ namespace OpenSim.Framework
         }
 
         private UUID m_RegionUUID = UUID.Zero;
-
         public UUID RegionUUID
         {
             get { return m_RegionUUID; }
@@ -131,7 +130,6 @@ namespace OpenSim.Framework
         public UUID CacheID { get; set; } = UUID.Random();
 
         private bool m_BlockTerraform = false;
-
         public bool BlockTerraform
         {
             get { return m_BlockTerraform; }
@@ -139,7 +137,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_BlockFly = false;
-
         public bool BlockFly
         {
             get { return m_BlockFly; }
@@ -147,7 +144,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_AllowDamage = false;
-
         public bool AllowDamage
         {
             get { return m_AllowDamage; }
@@ -155,7 +151,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_RestrictPushing = false;
-
         public bool RestrictPushing
         {
             get { return m_RestrictPushing; }
@@ -163,7 +158,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_AllowLandResell = true;
-
         public bool AllowLandResell
         {
             get { return m_AllowLandResell; }
@@ -171,7 +165,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_AllowLandJoinDivide = true;
-
         public bool AllowLandJoinDivide
         {
             get { return m_AllowLandJoinDivide; }
@@ -179,7 +172,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_BlockShowInSearch = false;
-
         public bool BlockShowInSearch
         {
             get { return m_BlockShowInSearch; }
@@ -187,7 +179,6 @@ namespace OpenSim.Framework
         }
 
         private int m_AgentLimit = 40;
-
         public int AgentLimit
         {
             get { return m_AgentLimit; }
@@ -195,7 +186,6 @@ namespace OpenSim.Framework
         }
 
         private double m_ObjectBonus = 1.0;
-
         public double ObjectBonus
         {
             get { return m_ObjectBonus; }
@@ -203,7 +193,6 @@ namespace OpenSim.Framework
         }
 
         private int m_Maturity = 0;
-
         public int Maturity
         {
             get { return m_Maturity; }
@@ -211,7 +200,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_DisableScripts = false;
-
         public bool DisableScripts
         {
             get { return m_DisableScripts; }
@@ -219,7 +207,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_DisableCollisions = false;
-
         public bool DisableCollisions
         {
             get { return m_DisableCollisions; }
@@ -227,7 +214,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_DisablePhysics = false;
-
         public bool DisablePhysics
         {
             get { return m_DisablePhysics; }
@@ -291,7 +277,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation1NW = 10;
-
         public double Elevation1NW
         {
             get { return m_Elevation1NW; }
@@ -299,7 +284,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation2NW = 60;
-
         public double Elevation2NW
         {
             get { return m_Elevation2NW; }
@@ -307,7 +291,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation1NE = 10;
-
         public double Elevation1NE
         {
             get { return m_Elevation1NE; }
@@ -315,7 +298,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation2NE = 60;
-
         public double Elevation2NE
         {
             get { return m_Elevation2NE; }
@@ -323,7 +305,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation1SE = 10;
-
         public double Elevation1SE
         {
             get { return m_Elevation1SE; }
@@ -331,7 +312,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation2SE = 60;
-
         public double Elevation2SE
         {
             get { return m_Elevation2SE; }
@@ -339,7 +319,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation1SW = 10;
-
         public double Elevation1SW
         {
             get { return m_Elevation1SW; }
@@ -347,7 +326,6 @@ namespace OpenSim.Framework
         }
 
         private double m_Elevation2SW = 60;
-
         public double Elevation2SW
         {
             get { return m_Elevation2SW; }
@@ -355,7 +333,6 @@ namespace OpenSim.Framework
         }
 
         private double m_WaterHeight = 20;
-
         public double WaterHeight
         {
             get { return m_WaterHeight; }
@@ -363,7 +340,6 @@ namespace OpenSim.Framework
         }
 
         private double m_TerrainRaiseLimit = 100;
-
         public double TerrainRaiseLimit
         {
             get { return m_TerrainRaiseLimit; }
@@ -371,7 +347,6 @@ namespace OpenSim.Framework
         }
 
         private double m_TerrainLowerLimit = -100;
-
         public double TerrainLowerLimit
         {
             get { return m_TerrainLowerLimit; }
@@ -379,7 +354,6 @@ namespace OpenSim.Framework
         }
 
         private bool m_UseEstateSun = true;
-
         public bool UseEstateSun
         {
             get { return m_UseEstateSun; }
@@ -387,23 +361,19 @@ namespace OpenSim.Framework
         }
 
         private bool m_Sandbox = false;
-
         public bool Sandbox
         {
             get { return m_Sandbox; }
             set { m_Sandbox = value; }
         }
 
-        private Vector3 m_SunVector;
-
         public Vector3 SunVector
         {
-            get { return m_SunVector; }
-            set { m_SunVector = value; }
+            get { return Vector3.Zero; }
+            set { }
         }
 
         private UUID m_ParcelImageID;
-
         public UUID ParcelImageID
         {
             get { return m_ParcelImageID; }
@@ -411,27 +381,22 @@ namespace OpenSim.Framework
         }
 
         private UUID m_TerrainImageID;
-
         public UUID TerrainImageID
         {
             get { return m_TerrainImageID; }
             set { m_TerrainImageID = value; }
         }
 
-        private bool m_FixedSun = false;
-
         public bool FixedSun
         {
-            get { return m_FixedSun; }
-            set { m_FixedSun = value; }
+            get { return false; }
+            set { }
         }
 
-        private double m_SunPosition = 0.0;
-
         public double SunPosition
         {
-            get { return m_SunPosition; }
-            set { m_SunPosition = value; }
+            get { return 0; }
+            set { }
         }
 
         private UUID m_Covenant = UUID.Zero;

OpenSim/Framework/ViewerEnviroment.cs

@@ -1210,6 +1210,15 @@ namespace OpenSim.Framework
             return env;
         }
 
+        public ViewerEnviroment Clone()
+        {
+            // im lazy need to proper clone later
+            OSD osd = ToOSD();
+            ViewerEnviroment VEnv = new ViewerEnviroment();
+            VEnv.FromOSD(osd);
+            return VEnv;
+        }
+
         public static OSD DefaultToOSD(UUID regionID, int parcel)
         {
             OSDMap top = new OSDMap();

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -866,7 +866,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 flags |= RegionFlags.BlockParcelSearch;
             if (Scene.RegionInfo.EstateSettings.DenyMinors)
                 flags |= RegionFlags.DenyAgeUnverified;
-
+            
+            if(Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
+                flags |= RegionFlags.AllowEnviromentOverride;
             return (uint)flags;
         }
 
@@ -6562,7 +6564,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             LLSDxmlEncode.AddEndMapAndArray(sb);
 
-            bool allowenvovr = Scene.RegionInfo.EstateSettings.AllowEnviromentOverride;
+            bool allowenvovr = (regionFlags & (uint)RegionFlags.AllowEnviromentOverride) != 0;
             LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
             LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", allowenvovr ? -1: -1, sb);
             LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", allowenvovr, sb);