ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8643: invert the meaning of internal flag TEXFREE true value to mean NOT allow parcel owner to be more restrictive than estate. This should reduce the impact of this feature on new and current regions, specially since some viewers still do not suport it. (yes still lazy to rename the thing)

Browse Source
This commit is contained in:
UbitUmarov
2020-01-17 09:35:42 +00:00
parent 1899a36105
commit 5ad62558b3
6 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,10 +195,10 @@ namespace OpenSim.Region.ClientStack.Linden
bool denyAnonymous = r["deny_anonymous"].AsBoolean();
bool denyAgeUnverified = r["deny_age_unverified"].AsBoolean();
bool alloVoiceChat = r["allow_voice_chat"].AsBoolean();
// taxfree is now AllowAccessOverride
bool overridePublicAccess = m_scene.RegionInfo.EstateSettings.TaxFree;
// taxfree is now !AllowAccessOverride
bool overridePublicAccess = !m_scene.RegionInfo.EstateSettings.TaxFree;
if (r.ContainsKey("override_public_access"))
overridePublicAccess = r["override_public_access"].AsBoolean();
overridePublicAccess = !r["override_public_access"].AsBoolean();
ok = m_EstateModule.handleEstateChangeInfoCap(estateName, invoice, sunHour, sunFixed,
externallyVisible, allowDirectTeleport, denyAnonymous, denyAgeUnverified,

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

@@ -6558,9 +6558,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLSDxmlEncode.AddElem("PassPrice", landData.PassPrice, sb);
LLSDxmlEncode.AddElem("PublicCount", (int)0, sb); //TODO
LLSDxmlEncode.AddElem("RegionDenyAnonymous", (regionFlags & (uint)RegionFlags.DenyAnonymous) != 0, sb);
//LLSDxmlEncode.AddElem("RegionDenyIdentified", (regionFlags & (uint)RegionFlags.DenyIdentified) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyIdentified", false, sb);
//LLSDxmlEncode.AddElem("RegionDenyTransacted", (regionFlags & (uint)RegionFlags.DenyTransacted) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyTransacted", false, sb);
LLSDxmlEncode.AddElem("RegionPushOverride", (regionFlags & (uint)RegionFlags.RestrictPushObject) != 0, sb);
LLSDxmlEncode.AddElem("RentPrice", (int) 0, sb);;
@@ -6600,17 +6598,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLSDxmlEncode.AddArrayAndMap("AgeVerificationBlock", sb);
//LLSDxmlEncode.AddElem("RegionDenyAgeUnverified", (regionFlags & (uint)RegionFlags.DenyAgeUnverified) != 0, sb);
LLSDxmlEncode.AddElem("RegionDenyAgeUnverified", false, sb);
LLSDxmlEncode.AddElem("RegionDenyAgeUnverified", (regionFlags & (uint)RegionFlags.DenyAgeUnverified) != 0, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);
LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", -1, sb);
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", false, sb);
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", true, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);
bool accessovr = Scene.RegionInfo.EstateSettings.TaxFree;
bool accessovr = !Scene.RegionInfo.EstateSettings.TaxFree;
LLSDxmlEncode.AddArrayAndMap("RegionAllowAccessBlock", sb);
LLSDxmlEncode.AddElem("RegionAllowAccessOverride", accessovr, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);