diff options
| author | Melanie | 2010-09-27 03:48:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-27 03:48:15 +0100 |
| commit | 5b2aa02fd95372499d11f68b35fab88c2d6208eb (patch) | |
| tree | 31849d282977ac98e645f29f359850683c1f1960 /OpenSim/Region/CoreModules | |
| parent | Prevent setting arbitrary groups on your objects. (diff) | |
| parent | Restrict top colliders / top scripts to estate managers (diff) | |
| download | opensim-SC-5b2aa02fd95372499d11f68b35fab88c2d6208eb.zip opensim-SC-5b2aa02fd95372499d11f68b35fab88c2d6208eb.tar.gz opensim-SC-5b2aa02fd95372499d11f68b35fab88c2d6208eb.tar.bz2 opensim-SC-5b2aa02fd95372499d11f68b35fab88c2d6208eb.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index fb15d91..9df13d8 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -696,6 +696,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 696 | 696 | ||
| 697 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) | 697 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) |
| 698 | { | 698 | { |
| 699 | if (!m_scene.Permissions.CanIssueEstateCommand(remoteClient.AgentId, false)) | ||
| 700 | return; | ||
| 701 | |||
| 699 | Dictionary<uint, float> SceneData = new Dictionary<uint,float>(); | 702 | Dictionary<uint, float> SceneData = new Dictionary<uint,float>(); |
| 700 | List<UUID> uuidNameLookupList = new List<UUID>(); | 703 | List<UUID> uuidNameLookupList = new List<UUID>(); |
| 701 | 704 | ||