From 5dabecf95d875b5b0c6e50d1251f42bb697bcbaa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 20:26:26 +0100
Subject: Revert "Also check user authorization if looking to upgrade from a
child to a root agent."
This reverts commit c7ded0618c303f8c24a91c83c2129292beebe466.
This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
---
OpenSim/Region/Framework/Scenes/Scene.cs | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4357b91..495491c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -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)
{
--
cgit v1.1