diff options
| author | Justin Clark-Casey (justincc) | 2013-08-25 20:12:59 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-25 20:12:59 +0100 |
| commit | 85824d2cd90c2541505bc50502285c43bed48de8 (patch) | |
| tree | 0928c3ddf6c5e30305cc89bbaeb83158b7cebaee /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with ... (diff) | |
| parent | Added some more debug messages. (diff) | |
| download | opensim-SC-85824d2cd90c2541505bc50502285c43bed48de8.zip opensim-SC-85824d2cd90c2541505bc50502285c43bed48de8.tar.gz opensim-SC-85824d2cd90c2541505bc50502285c43bed48de8.tar.bz2 opensim-SC-85824d2cd90c2541505bc50502285c43bed48de8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -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; |