diff options
| author | Melanie | 2011-01-27 02:43:52 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-27 02:43:52 +0100 |
| commit | 307a2c61ef8106ae6aad3cd4a25c9067cdaf888a (patch) | |
| tree | fd4447a5306810c871634c3adc38ee002c9fb25e | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.zip opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.gz opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.bz2 opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.xz | |
Fix merge artifacts
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6a5f84a..f85db84 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3643,7 +3643,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3643 | 3643 | ||
| 3644 | if (m_regInfo.EstateSettings != null) | 3644 | if (m_regInfo.EstateSettings != null) |
| 3645 | { | 3645 | { |
| 3646 | int flags = GetUserFlags(agent.AgentID); | 3646 | int flags = GetUserFlags(agentID); |
| 3647 | if (m_regInfo.EstateSettings.IsBanned(agentID, flags)) | 3647 | if (m_regInfo.EstateSettings.IsBanned(agentID, flags)) |
| 3648 | { | 3648 | { |
| 3649 | //Add some more info to help users | 3649 | //Add some more info to help users |
| @@ -3657,12 +3657,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3657 | if (!m_regInfo.EstateSettings.IsBanned(agentID, 4)) | 3657 | if (!m_regInfo.EstateSettings.IsBanned(agentID, 4)) |
| 3658 | { | 3658 | { |
| 3659 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} {1} because the region requires payment info on file", | 3659 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} {1} because the region requires payment info on file", |
| 3660 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3660 | agentID, RegionInfo.RegionName); |
| 3661 | reason = String.Format("Denied access to region {0}: Region requires payment info on file", RegionInfo.RegionName); | 3661 | reason = String.Format("Denied access to region {0}: Region requires payment info on file", RegionInfo.RegionName); |
| 3662 | return false; | 3662 | return false; |
| 3663 | } | 3663 | } |
| 3664 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} at {3} because the user is on the banlist", | 3664 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} at {3} because the user is on the banlist", |
| 3665 | agent.AgentID, RegionInfo.RegionName); | 3665 | agentID, RegionInfo.RegionName); |
| 3666 | reason = String.Format("Denied access to region {0}: You have been banned from that region.", | 3666 | reason = String.Format("Denied access to region {0}: You have been banned from that region.", |
| 3667 | RegionInfo.RegionName); | 3667 | RegionInfo.RegionName); |
| 3668 | return false; | 3668 | return false; |