Whitespace conflict
parent
1f052520ae
commit
f20dc512e8
|
@ -3513,7 +3513,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
if (tp == TeleportFlags.ViaLogin)
|
||||
{
|
||||
if (land != null && !TestLandRestrictions(agent, land, out reason))
|
||||
{
|
||||
{
|
||||
m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -691,11 +691,7 @@ namespace OpenSim.Services.LLLoginService
|
|||
}
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
|
||||
dest = destination;
|
||||
if (success)
|
||||
return aCircuit;
|
||||
|
|
Loading…
Reference in New Issue