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/CoreModules/World/Land/LandObject.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/CoreModules/World/Land/LandObject.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 7f44613..0536f6e 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -469,7 +469,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 469 | if (m_scene.Permissions.IsAdministrator(avatar)) | 469 | if (m_scene.Permissions.IsAdministrator(avatar)) |
| 470 | return false; | 470 | return false; |
| 471 | 471 | ||
| 472 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 472 | if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar)) |
| 473 | return false; | 473 | return false; |
| 474 | 474 | ||
| 475 | if (avatar == LandData.OwnerID) | 475 | if (avatar == LandData.OwnerID) |
| @@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 499 | if (m_scene.Permissions.IsAdministrator(avatar)) | 499 | if (m_scene.Permissions.IsAdministrator(avatar)) |
| 500 | return false; | 500 | return false; |
| 501 | 501 | ||
| 502 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 502 | if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar)) |
| 503 | return false; | 503 | return false; |
| 504 | 504 | ||
| 505 | if (avatar == LandData.OwnerID) | 505 | if (avatar == LandData.OwnerID) |