diff options
| author | Melanie | 2012-10-12 19:23:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:23:35 +0100 |
| commit | 950192539761a6fff2c27734e3090cd8aee2df1b (patch) | |
| tree | f7bc52c70db306d44ea795f6e96312aba583fc53 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-950192539761a6fff2c27734e3090cd8aee2df1b.zip opensim-SC-950192539761a6fff2c27734e3090cd8aee2df1b.tar.gz opensim-SC-950192539761a6fff2c27734e3090cd8aee2df1b.tar.bz2 opensim-SC-950192539761a6fff2c27734e3090cd8aee2df1b.tar.xz | |
Fix a merge issue
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 9020761..e03750b 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
| @@ -419,11 +419,11 @@ namespace OpenSim.Framework | |||
| 419 | 419 | ||
| 420 | public void SetFromFlags(ulong regionFlags) | 420 | public void SetFromFlags(ulong regionFlags) |
| 421 | { | 421 | { |
| 422 | ResetHomeOnTeleport = ((regionFlags & (ulong)RegionFlags.ResetHomeOnTeleport) == (ulong)RegionFlags.ResetHomeOnTeleport); | 422 | ResetHomeOnTeleport = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport) == (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport); |
| 423 | BlockDwell = ((regionFlags & (ulong)RegionFlags.BlockDwell) == (ulong)RegionFlags.BlockDwell); | 423 | BlockDwell = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.BlockDwell) == (ulong)OpenMetaverse.RegionFlags.BlockDwell); |
| 424 | AllowLandmark = ((regionFlags & (ulong)RegionFlags.AllowLandmark) == (ulong)RegionFlags.AllowLandmark); | 424 | AllowLandmark = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowLandmark) == (ulong)OpenMetaverse.RegionFlags.AllowLandmark); |
| 425 | AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges); | 425 | AllowParcelChanges = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges) == (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges); |
| 426 | AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome); | 426 | AllowSetHome = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowSetHome) == (ulong)OpenMetaverse.RegionFlags.AllowSetHome); |
| 427 | } | 427 | } |
| 428 | 428 | ||
| 429 | public bool GroupAccess(UUID groupID) | 429 | public bool GroupAccess(UUID groupID) |