diff options
| author | Diva Canto | 2013-08-24 08:42:41 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-08-24 08:42:41 -0700 |
| commit | f0c0376660d767f232a1370f02e70d81728c9326 (patch) | |
| tree | 2cf006d80977b0d79174d8cf70e6d6287534cf15 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-f0c0376660d767f232a1370f02e70d81728c9326.zip opensim-SC-f0c0376660d767f232a1370f02e70d81728c9326.tar.gz opensim-SC-f0c0376660d767f232a1370f02e70d81728c9326.tar.bz2 opensim-SC-f0c0376660d767f232a1370f02e70d81728c9326.tar.xz | |
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cb12d65..d547323 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3824,7 +3824,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3824 | 3824 | ||
| 3825 | try | 3825 | try |
| 3826 | { | 3826 | { |
| 3827 | if (!AuthorizeUser(acd, SeeIntoRegion, out reason)) | 3827 | if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason)) |
| 3828 | { | 3828 | { |
| 3829 | m_authenticateHandler.RemoveCircuit(acd.circuitcode); | 3829 | m_authenticateHandler.RemoveCircuit(acd.circuitcode); |
| 3830 | return false; | 3830 | return false; |