ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync some more things with work copy

Browse Source
This commit is contained in:
UbitUmarov
2020-03-02 01:56:34 +00:00
parent 97cb6254ef
commit be16cf9531
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -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.TaxFree;
flags |= RegionFlags.AllowParcelAccessOverride;
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("RegionAllowEnvironmentOverride", true, sb);
LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", allowenvovr ? -1: -1, sb);
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", allowenvovr, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);
bool accessovr = !Scene.RegionInfo.EstateSettings.TaxFree;