ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +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

6
OpenSim/Region/ClientStack/Linden/Caps/EstateChangeInfo.cs
View File

@@ -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
{

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;