diff options
| author | Melanie Thielker | 2010-08-09 02:46:09 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-09 02:46:09 +0200 |
| commit | f20dc512e87983b9ba6b86f806489380d3cfef5a (patch) | |
| tree | 4bdac7d50e46648a76e9e58785c19178826166db /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.zip opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.gz opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.bz2 opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.xz | |
Whitespace conflict
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 779f898..06bbe32 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3513,7 +3513,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3513 | if (tp == TeleportFlags.ViaLogin) | 3513 | if (tp == TeleportFlags.ViaLogin) |
| 3514 | { | 3514 | { |
| 3515 | if (land != null && !TestLandRestrictions(agent, land, out reason)) | 3515 | if (land != null && !TestLandRestrictions(agent, land, out reason)) |
| 3516 | { | 3516 | { |
| 3517 | m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString()); | 3517 | m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString()); |
| 3518 | return false; | 3518 | return false; |
| 3519 | } | 3519 | } |