OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the merge

master
UbitUmarov 2020-06-29 01:29:58 +01:00
parent 7cf329c846
commit fb35f31078
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,6 +180,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
flags |= RegionFlags.ResetHomeOnTeleport; flags |= RegionFlags.ResetHomeOnTeleport;
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
flags |= RegionFlags.AllowEnvironmentOverride;
// TODO: SkipUpdateInterestList // TODO: SkipUpdateInterestList