mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
fix the merge
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user