aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-09-19 20:26:26 +0100
committerJustin Clark-Casey (justincc)2013-09-26 20:07:02 +0100
commit5dabecf95d875b5b0c6e50d1251f42bb697bcbaa (patch)
tree3e05147acef37d6865689fba205c931dbab22390 /OpenSim/Region/Framework
parentCreate regression TestCrossOnSameSimulatorNoRootDestPerm() to check that avat... (diff)
downloadopensim-SC_OLD-5dabecf95d875b5b0c6e50d1251f42bb697bcbaa.zip
opensim-SC_OLD-5dabecf95d875b5b0c6e50d1251f42bb697bcbaa.tar.gz
opensim-SC_OLD-5dabecf95d875b5b0c6e50d1251f42bb697bcbaa.tar.bz2
opensim-SC_OLD-5dabecf95d875b5b0c6e50d1251f42bb697bcbaa.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 0 insertions, 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
3861 // Let the SP know how we got here. This has a lot of interesting 3861 // Let the SP know how we got here. This has a lot of interesting
3862 // uses down the line. 3862 // uses down the line.
3863 sp.TeleportFlags = (TPFlags)teleportFlags; 3863 sp.TeleportFlags = (TPFlags)teleportFlags;
3864
3865 // We must carry out a further authorization check if there's an
3866 // attempt to make a child agent into a root agent, since SeeIntoRegion may have allowed a child
3867 // agent to login to a region where a full avatar would not be allowed.
3868 //
3869 // We determine whether this is a CreateAgent for a future non-child agent by inspecting
3870 // TeleportFlags, which will be default for a child connection. This relies on input from the source
3871 // region.
3872 if (sp.TeleportFlags != TPFlags.Default)
3873 {
3874 if (!AuthorizeUser(acd, false, out reason))
3875 return false;
3876 }
3877 3864
3878 if (sp.IsChildAgent) 3865 if (sp.IsChildAgent)
3879 { 3866 {