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/LSL_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 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5581727..36c9d5e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10887,7 +10887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10887 | bool isAccount = false; | 10887 | bool isAccount = false; |
| 10888 | bool isGroup = false; | 10888 | bool isGroup = false; |
| 10889 | 10889 | ||
| 10890 | if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManager(m_host.OwnerID)) | 10890 | if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManagerOrOwner(m_host.OwnerID)) |
| 10891 | return 0; | 10891 | return 0; |
| 10892 | 10892 | ||
| 10893 | UUID id = new UUID(); | 10893 | UUID id = new UUID(); |