OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge artifacts

avinationmerge
Melanie 2011-01-27 02:43:52 +01:00
parent 3321f9d745
commit 307a2c61ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3643,7 +3643,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_regInfo.EstateSettings != null) if (m_regInfo.EstateSettings != null)
{ {
int flags = GetUserFlags(agent.AgentID); int flags = GetUserFlags(agentID);
if (m_regInfo.EstateSettings.IsBanned(agentID, flags)) if (m_regInfo.EstateSettings.IsBanned(agentID, flags))
{ {
//Add some more info to help users //Add some more info to help users
@ -3657,12 +3657,12 @@ namespace OpenSim.Region.Framework.Scenes
if (!m_regInfo.EstateSettings.IsBanned(agentID, 4)) if (!m_regInfo.EstateSettings.IsBanned(agentID, 4))
{ {
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} {1} because the region requires payment info on file", m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} {1} because the region requires payment info on file",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); agentID, RegionInfo.RegionName);
reason = String.Format("Denied access to region {0}: Region requires payment info on file", RegionInfo.RegionName); reason = String.Format("Denied access to region {0}: Region requires payment info on file", RegionInfo.RegionName);
return false; return false;
} }
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} at {3} because the user is on the banlist", m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} at {3} because the user is on the banlist",
agent.AgentID, RegionInfo.RegionName); agentID, RegionInfo.RegionName);
reason = String.Format("Denied access to region {0}: You have been banned from that region.", reason = String.Format("Denied access to region {0}: You have been banned from that region.",
RegionInfo.RegionName); RegionInfo.RegionName);
return false; return false;