diff options
author | Justin Clark-Casey (justincc) | 2009-09-16 18:21:46 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-16 18:21:46 +0100 |
commit | a4c093469ae953971493977facbc81c49761577d (patch) | |
tree | 004f10f20c7e4d38088bf1eea8b5d2dd61a126df /OpenSim/Region/Framework | |
parent | on iar save/load, let the user know if they put in the wrong password (diff) | |
parent | updated the IAuthorizationService interface so that a message is passed back ... (diff) | |
download | opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.zip opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.gz opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.bz2 opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a8028a6..d8478a2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3250,10 +3250,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3250 | 3250 | ||
3251 | if (AuthorizationService != null) | 3251 | if (AuthorizationService != null) |
3252 | { | 3252 | { |
3253 | if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString())) | 3253 | if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString(),out reason)) |
3254 | { | 3254 | { |
3255 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", | 3255 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", |
3256 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3256 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3257 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); | ||
3257 | return false; | 3258 | return false; |
3258 | } | 3259 | } |
3259 | } | 3260 | } |