diff options
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index ac8b566..9241851 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
139 | if(scene != null) | 139 | if (scene != null) |
140 | { | 140 | { |
141 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); | 141 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); |
142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, | 142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d95d9d3..0c2f991 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3253,18 +3253,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
3253 | 3253 | ||
3254 | if (AuthorizationService != null) | 3254 | if (AuthorizationService != null) |
3255 | { | 3255 | { |
3256 | if(!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString())) | 3256 | if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString())) |
3257 | { | 3257 | { |
3258 | 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", |
3259 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3259 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3260 | return false; | 3260 | return false; |
3261 | } | 3261 | } |
3262 | } | 3262 | } |
3263 | 3263 | ||
3264 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) | 3264 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) |
3265 | { | 3265 | { |
3266 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", | 3266 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", |
3267 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3267 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3268 | reason = String.Format("Denied access to region {0}: You have been banned from that region.", | 3268 | reason = String.Format("Denied access to region {0}: You have been banned from that region.", |
3269 | RegionInfo.RegionName); | 3269 | RegionInfo.RegionName); |
3270 | return false; | 3270 | return false; |