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

reassign estate setting TaxFree to the role of AllowAccessOverride, as viewers did. Keeping name to reuse dbs entries, etc. let viewers change it, but still NOP

Browse Source
This commit is contained in:
UbitUmarov
2018-06-19 01:18:18 +01:00
parent 9b87626cdb
commit c53658248a
2 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -1556,20 +1556,21 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Warning: FixedSun should be set to True, otherwise this sun position won't be used.
}
if ((parms1 & 0x00000010) != 0)
Scene.RegionInfo.EstateSettings.FixedSun = true;
else
Scene.RegionInfo.EstateSettings.FixedSun = false;
if ((parms1 & 0x00008000) != 0)
Scene.RegionInfo.EstateSettings.PublicAccess = true;
else
Scene.RegionInfo.EstateSettings.PublicAccess = false;
if ((parms1 & 0x10000000) != 0)
Scene.RegionInfo.EstateSettings.AllowVoice = true;
if ((parms1 & 0x00000010) != 0)
Scene.RegionInfo.EstateSettings.FixedSun = true;
else
Scene.RegionInfo.EstateSettings.AllowVoice = false;
Scene.RegionInfo.EstateSettings.FixedSun = false;
// taxfree is now AllowAccessOverride
if ((parms1 & 0x00000020) != 0)
Scene.RegionInfo.EstateSettings.TaxFree = true;
else
Scene.RegionInfo.EstateSettings.TaxFree = false;
if ((parms1 & 0x00100000) != 0)
Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
@@ -1581,16 +1582,23 @@ namespace OpenSim.Region.CoreModules.World.Estate
else
Scene.RegionInfo.EstateSettings.DenyAnonymous = false;
// no longer in used, may be reassigned
if ((parms1 & 0x01000000) != 0)
Scene.RegionInfo.EstateSettings.DenyIdentified = true;
else
Scene.RegionInfo.EstateSettings.DenyIdentified = false;
// no longer in used, may be reassigned
if ((parms1 & 0x02000000) != 0)
Scene.RegionInfo.EstateSettings.DenyTransacted = true;
else
Scene.RegionInfo.EstateSettings.DenyTransacted = false;
if ((parms1 & 0x10000000) != 0)
Scene.RegionInfo.EstateSettings.AllowVoice = true;
else
Scene.RegionInfo.EstateSettings.AllowVoice = false;
if ((parms1 & 0x40000000) != 0)
Scene.RegionInfo.EstateSettings.DenyMinors = true;
else