diff options
| author | Jeff Ames | 2008-08-15 10:24:04 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-08-15 10:24:04 +0000 |
| commit | dde21314e75acdaeff27af70077f283493401961 (patch) | |
| tree | 490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/Environment/Modules/World/Permissions | |
| parent | Fixes a case where, when inventory is not currently accessible due (diff) | |
| download | opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2 opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz | |
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 25ea282..0fbd4fb 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
| @@ -238,12 +238,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
| 238 | // If there is no master avatar, return false | 238 | // If there is no master avatar, return false |
| 239 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) | 239 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) |
| 240 | { | 240 | { |
| 241 | if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user) | 241 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID == user) |
| 242 | return true; | 242 | return true; |
| 243 | } | 243 | } |
| 244 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 244 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) |
| 245 | { | 245 | { |
| 246 | if(m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 246 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) |
| 247 | return true; | 247 | return true; |
| 248 | } | 248 | } |
| 249 | 249 | ||