diff options
author | Justin Clark-Casey (justincc) | 2012-04-17 01:25:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-17 01:25:41 +0100 |
commit | 24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68 (patch) | |
tree | 3f5c985d49dac06300eb4fcfa0637e07f56fc45e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | Null reference in llGetObjectMass on a seated avatar. (diff) | |
download | opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.zip opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.gz opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.bz2 opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.xz |
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 2680ad0..fe94b79 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
369 | if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER")) | 369 | if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER")) |
370 | { | 370 | { |
371 | //Only Estate Managers may use the function | 371 | //Only Estate Managers may use the function |
372 | if (World.RegionInfo.EstateSettings.IsEstateManager(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID) | 372 | if (World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID) |
373 | { | 373 | { |
374 | return; | 374 | return; |
375 | } | 375 | } |