diff options
author | Diva Canto | 2009-09-10 19:56:08 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-10 19:56:08 -0700 |
commit | ce332f235ccc5168cfc44834e16318497c67cdd7 (patch) | |
tree | 27e0f79a50060c981dffd4dbffe5938d70cad2a3 /OpenSim/Region/Framework/Scenes | |
parent | added AuthorizationRequest and AuthorizationResponse objects for passing Auth... (diff) | |
download | opensim-SC_OLD-ce332f235ccc5168cfc44834e16318497c67cdd7.zip opensim-SC_OLD-ce332f235ccc5168cfc44834e16318497c67cdd7.tar.gz opensim-SC_OLD-ce332f235ccc5168cfc44834e16318497c67cdd7.tar.bz2 opensim-SC_OLD-ce332f235ccc5168cfc44834e16318497c67cdd7.tar.xz |
Changed the interface of IAuthorizationService to get less data.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1346844..d95d9d3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3250,12 +3250,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3250 | 3250 | ||
3251 | if (!m_strictAccessControl) return true; | 3251 | if (!m_strictAccessControl) return true; |
3252 | if (Permissions.IsGod(agent.AgentID)) return true; | 3252 | if (Permissions.IsGod(agent.AgentID)) return true; |
3253 | 3253 | ||
3254 | UserProfileData userProfile = CommsManager.UserService.GetUserProfile(agent.AgentID); | 3254 | if (AuthorizationService != null) |
3255 | |||
3256 | if(AuthorizationService!=null) | ||
3257 | { | 3255 | { |
3258 | if(!AuthorizationService.isAuthorizedForRegion(userProfile,RegionInfo)) | 3256 | if(!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString())) |
3259 | { | 3257 | { |
3260 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", | 3258 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", |
3261 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3259 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |