diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-13 07:28:08 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-13 07:28:08 -0400 |
| commit | fe4f312d55363841f28d6cde84bf645b8c6dd080 (patch) | |
| tree | e688d73b0a2e7198311601b40e8cd576c3ae15b3 /OpenSim/Region/Framework | |
| parent | * Milestone GridFriendly reached so Adding CombineContiguousRegions to the Op... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.zip opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.gz opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.bz2 opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 7 insertions, 7 deletions
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; |