diff options
| author | UbitUmarov | 2015-12-13 12:14:31 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-12-13 12:14:31 +0000 |
| commit | 5d6da6bb358b6d7e7f62317cd2b88c3b0074bcc0 (patch) | |
| tree | 1fd5c04c6b191d46c9995ae0500016ce005005c1 /OpenSim/Region | |
| parent | several changes to region and land access control - this may be a bit broken now (diff) | |
| download | opensim-SC-5d6da6bb358b6d7e7f62317cd2b88c3b0074bcc0.zip opensim-SC-5d6da6bb358b6d7e7f62317cd2b88c3b0074bcc0.tar.gz opensim-SC-5d6da6bb358b6d7e7f62317cd2b88c3b0074bcc0.tar.bz2 opensim-SC-5d6da6bb358b6d7e7f62317cd2b88c3b0074bcc0.tar.xz | |
fix: if no groups module, deny access
Diffstat (limited to 'OpenSim/Region')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 97b11c7..0691062 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4458,8 +4458,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4458 | 4458 | ||
| 4459 | // finally test groups | 4459 | // finally test groups |
| 4460 | 4460 | ||
| 4461 | if (m_groupsModule == null) // if no groups allow | 4461 | if (m_groupsModule == null) // if no groups refuse |
| 4462 | return true; | 4462 | return false; |
| 4463 | 4463 | ||
| 4464 | UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups; | 4464 | UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups; |
| 4465 | 4465 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs index 2255869..3d51a63 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | |||
| @@ -39,6 +39,7 @@ using OpenSim.Region.CoreModules.Framework.EntityTransfer; | |||
| 39 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 39 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
| 40 | using OpenSim.Region.CoreModules.World.Permissions; | 40 | using OpenSim.Region.CoreModules.World.Permissions; |
| 41 | using OpenSim.Tests.Common; | 41 | using OpenSim.Tests.Common; |
| 42 | using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups; | ||
| 42 | using System.Threading; | 43 | using System.Threading; |
| 43 | 44 | ||
| 44 | namespace OpenSim.Region.Framework.Scenes.Tests | 45 | namespace OpenSim.Region.Framework.Scenes.Tests |