From 307a2c61ef8106ae6aad3cd4a25c9067cdaf888a Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 27 Jan 2011 02:43:52 +0100 Subject: [PATCH] Fix merge artifacts --- OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6a5f84aca3..f85db8446b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3643,7 +3643,7 @@ namespace OpenSim.Region.Framework.Scenes if (m_regInfo.EstateSettings != null) { - int flags = GetUserFlags(agent.AgentID); + int flags = GetUserFlags(agentID); if (m_regInfo.EstateSettings.IsBanned(agentID, flags)) { //Add some more info to help users @@ -3657,12 +3657,12 @@ namespace OpenSim.Region.Framework.Scenes 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", - 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); return false; } 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.", RegionInfo.RegionName); return false;