fix the merge

This commit is contained in:
UbitUmarov
2020-06-29 01:29:58 +01:00
parent 7cf329c846
commit fb35f31078

View File

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