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/Estate/EstateManagementModule.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/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 124f01c..58bbd24 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -967,7 +967,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
967 | { | 967 | { |
968 | RegionHandshakeArgs args = new RegionHandshakeArgs(); | 968 | RegionHandshakeArgs args = new RegionHandshakeArgs(); |
969 | 969 | ||
970 | args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManager(remoteClient.AgentId); | 970 | args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(remoteClient.AgentId); |
971 | if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId) | 971 | if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId) |
972 | args.isEstateManager = true; | 972 | args.isEstateManager = true; |
973 | 973 | ||