aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2013-08-24 08:42:41 -0700
committerJustin Clark-Casey (justincc)2013-08-26 20:28:52 +0100
commited0ffae1511facfa12e25cd98e496ea0883ea274 (patch)
tree034b1aecea44944322f77169d4b053ba4a454eac /OpenSim/Region/Framework/Scenes
parentFor a Hypergrid user, delay estate access checks until NewUserConnection() so... (diff)
downloadopensim-SC_OLD-ed0ffae1511facfa12e25cd98e496ea0883ea274.zip
opensim-SC_OLD-ed0ffae1511facfa12e25cd98e496ea0883ea274.tar.gz
opensim-SC_OLD-ed0ffae1511facfa12e25cd98e496ea0883ea274.tar.bz2
opensim-SC_OLD-ed0ffae1511facfa12e25cd98e496ea0883ea274.tar.xz
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 054e17b..9695716 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;