Revert "Also check user authorization if looking to upgrade from a child to a root agent."
This reverts commit c7ded0618c
.
This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
0.7.6-extended
parent
689f79fead
commit
5dabecf95d
|
@ -3861,19 +3861,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// Let the SP know how we got here. This has a lot of interesting
|
||||
// uses down the line.
|
||||
sp.TeleportFlags = (TPFlags)teleportFlags;
|
||||
|
||||
// We must carry out a further authorization check if there's an
|
||||
// attempt to make a child agent into a root agent, since SeeIntoRegion may have allowed a child
|
||||
// agent to login to a region where a full avatar would not be allowed.
|
||||
//
|
||||
// We determine whether this is a CreateAgent for a future non-child agent by inspecting
|
||||
// TeleportFlags, which will be default for a child connection. This relies on input from the source
|
||||
// region.
|
||||
if (sp.TeleportFlags != TPFlags.Default)
|
||||
{
|
||||
if (!AuthorizeUser(acd, false, out reason))
|
||||
return false;
|
||||
}
|
||||
|
||||
if (sp.IsChildAgent)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue