diff options
| author | Melanie Thielker | 2017-03-31 14:55:54 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:55:54 +0100 |
| commit | b033a2559ea0f027a3668f5a3969f0ca368f2877 (patch) | |
| tree | 5f02aa64930ffc3aede75ba3218238a785440054 /OpenSim | |
| parent | Merge branch 'melanie' (diff) | |
| download | opensim-SC-b033a2559ea0f027a3668f5a3969f0ca368f2877.zip opensim-SC-b033a2559ea0f027a3668f5a3969f0ca368f2877.tar.gz opensim-SC-b033a2559ea0f027a3668f5a3969f0ca368f2877.tar.bz2 opensim-SC-b033a2559ea0f027a3668f5a3969f0ca368f2877.tar.xz | |
Adapt to a variable name that has changed in core
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index bc86076..ab8fb51 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -2033,7 +2033,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 2033 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 2033 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 2034 | 2034 | ||
| 2035 | // A god is a god is a god | 2035 | // A god is a god is a god |
| 2036 | if (IsAdministrator(user)) | 2036 | if (IsAdministrator(userID)) |
| 2037 | return true; | 2037 | return true; |
| 2038 | 2038 | ||
| 2039 | if (objectID == UUID.Zero) // User inventory | 2039 | if (objectID == UUID.Zero) // User inventory |
| @@ -2126,7 +2126,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 2126 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 2126 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 2127 | 2127 | ||
| 2128 | // A god is a god is a god | 2128 | // A god is a god is a god |
| 2129 | if (IsAdministrator(user)) | 2129 | if (IsAdministrator(userID)) |
| 2130 | return true; | 2130 | return true; |
| 2131 | 2131 | ||
| 2132 | if (objectID == UUID.Zero) // User inventory | 2132 | if (objectID == UUID.Zero) // User inventory |