OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt to a variable name that has changed in core

httptests
Melanie Thielker 2017-03-31 14:55:54 +01:00
parent 5587ee4500
commit b033a2559e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -2033,7 +2033,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
// A god is a god is a god // A god is a god is a god
if (IsAdministrator(user)) if (IsAdministrator(userID))
return true; return true;
if (objectID == UUID.Zero) // User inventory if (objectID == UUID.Zero) // User inventory
@ -2126,7 +2126,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
// A god is a god is a god // A god is a god is a god
if (IsAdministrator(user)) if (IsAdministrator(userID))
return true; return true;
if (objectID == UUID.Zero) // User inventory if (objectID == UUID.Zero) // User inventory