sync some more things with work copy

OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs

@@ -68,7 +68,8 @@ namespace OpenSim.Capabilities.Handlers
             {"jpeg_id", AssetType.ImageJPEG},
             {"animatn_id", AssetType.Animation},
             {"gesture_id", AssetType.Gesture},
-            {"mesh_id", AssetType.Mesh}
+            {"mesh_id", AssetType.Mesh},
+            {"settings_id", AssetType.Settings}
         };
 
         private IAssetService m_assetService;
@@ -136,7 +137,7 @@ namespace OpenSim.Capabilities.Handlers
                 return responsedata;
             }
 
-            if(type == AssetType.Mesh || type == AssetType.Texture)
+            if (type == AssetType.Mesh || type == AssetType.Texture)
                 responsedata["throttle"] = true;
 
             responsedata["content_type"] = asset.Metadata.ContentType;

OpenSim/Framework/EstateSettings.cs

@@ -237,6 +237,8 @@ namespace OpenSim.Framework
             set { m_DenyMinors = value; }
         }
 
+        public bool AllowEnviromentOverride {get; set;} = true;
+
         // All those lists...
         //
         private List<UUID> l_EstateManagers = new List<UUID>();

OpenSim/Region/ClientStack/Linden/Caps/EstateChangeInfo.cs

@@ -200,9 +200,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 if (r.ContainsKey("override_public_access"))
                     overridePublicAccess = !r["override_public_access"].AsBoolean();
 
+                bool allowEnviromentOverride = m_scene.RegionInfo.EstateSettings.AllowEnviromentOverride;
+                if (r.ContainsKey("override_environment"))
+                    allowEnviromentOverride = !r["override_environment"].AsBoolean();
+
                 ok = m_EstateModule.handleEstateChangeInfoCap(estateName, invoice, sunHour, sunFixed,
                         externallyVisible, allowDirectTeleport, denyAnonymous, denyAgeUnverified,
-                        alloVoiceChat, overridePublicAccess);
+                        alloVoiceChat, overridePublicAccess, allowEnviromentOverride);
             }
             catch
             {

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

@@ -827,8 +827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // allow access override (was taxfree)
             if (!Scene.RegionInfo.EstateSettings.TaxFree) // this is now wrong means !ALLOW_ACCESS_OVERRIDE
-                //flags |= RegionFlags.AllowParcelAccessOverride;
+                flags |= RegionFlags.AllowParcelAccessOverride;
-                flags |= RegionFlags.TaxFree;
 
             if (Scene.RegionInfo.RegionSettings.BlockTerraform)
                 flags |= RegionFlags.BlockTerraform;
@@ -6607,9 +6606,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             LLSDxmlEncode.AddEndMapAndArray(sb);
 
+            bool allowenvovr = Scene.RegionInfo.EstateSettings.AllowEnviromentOverride;
             LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
-            LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", -1, sb);
+            LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", allowenvovr ? -1: -1, sb);
-            LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", true, sb);
+            LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", allowenvovr, sb);
             LLSDxmlEncode.AddEndMapAndArray(sb);
 
             bool accessovr = !Scene.RegionInfo.EstateSettings.TaxFree;

OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

@@ -183,6 +183,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
                 flags |= RegionFlags.ResetHomeOnTeleport;
 
+            if (Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
+                flags |= RegionFlags.AllowEnviromentOverride;
 
             // TODO: SkipUpdateInterestList
 
@@ -1401,7 +1403,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
         }
 
-        private void HandleRegionInfoRequest(IClientAPI remote_client)
+        public void HandleRegionInfoRequest(IClientAPI remote_client)
         {
            RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs();
            args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor;
@@ -1555,6 +1557,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
             else
                 Scene.RegionInfo.EstateSettings.TaxFree = true;
 
+            if ((parms1 & 0x00000200) != 0)
+                Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = true;
+            else
+                Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = false;
+
             if ((parms1 & 0x00100000) != 0)
                 Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
             else
@@ -1600,7 +1607,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             bool externallyVisible,
             bool allowDirectTeleport,
             bool denyAnonymous, bool denyAgeUnverified,
-            bool alloVoiceChat, bool overridePublicAccess)
+            bool alloVoiceChat, bool overridePublicAccess,
+            bool allowEnviromentOverride)
         {
             if (sunHour == 0)
             {
@@ -1624,6 +1632,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             // taxfree is now !AllowAccessOverride
             Scene.RegionInfo.EstateSettings.TaxFree = overridePublicAccess;
             Scene.RegionInfo.EstateSettings.DenyMinors = denyAgeUnverified;
+            Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = allowEnviromentOverride;
 
             Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
             TriggerEstateInfoChange();
@@ -1696,8 +1705,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (Scene.RegionInfo.EstateSettings.FixedSun)
                 flags |= RegionFlags.SunFixed;
             if (!Scene.RegionInfo.EstateSettings.TaxFree) // this is now wrong means !ALLOW_ACCESS_OVERRIDE
-                flags |= RegionFlags.TaxFree;
+                flags |= RegionFlags.AllowParcelAccessOverride;
 
+            if(Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
+                flags |= RegionFlags.AllowEnviromentOverride;
             if (Scene.RegionInfo.EstateSettings.PublicAccess) //??
                 flags |= (RegionFlags.PublicAllowed | RegionFlags.ExternallyVisible);
 

OpenSim/Region/CoreModules/World/Wind/WindModule.cs

@@ -160,7 +160,7 @@ namespace OpenSim.Region.CoreModules
             // Generate initial wind values
             GenWind();
             // hopefully this will not be the same for all regions on same instance
-            m_dataVersion = (int)m_scene.AllocateLocalId();
+            m_dataVersion = m_scene.AllocateIntId();
             // Mark Module Ready for duty
             m_ready = true;
         }

OpenSim/Region/Framework/Interfaces/IEstateModule.cs

@@ -69,7 +69,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         bool IsTerrainXfer(ulong xferID);
         bool handleEstateChangeInfoCap(string estateName, UUID invoice, int sunHour, bool sunFixed,
-           bool externallyVisible, bool allowDirectTeleport, bool denyAnonymous, bool denyAgeUnverified,
+        bool externallyVisible, bool allowDirectTeleport, bool denyAnonymous, bool denyAgeUnverified,
-           bool alloVoiceChat, bool overridePublicAccess);
+        bool alloVoiceChat, bool overridePublicAccess, bool allowEnviromentOverride);
+        void HandleRegionInfoRequest(IClientAPI remote_client);
     }
 }