aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1857fd8..863fb14 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4278,7 +4278,7 @@ namespace OpenSim.Region.Framework.Scenes
4278 4278
4279 // only check access, actual relocations will happen later on ScenePresence MakeRoot 4279 // only check access, actual relocations will happen later on ScenePresence MakeRoot
4280 // allow child agents creation 4280 // allow child agents creation
4281 if(!godlike || teleportFlags != (uint) TPFlags.Default) 4281 if(!godlike && teleportFlags != (uint) TPFlags.Default)
4282 { 4282 {
4283 bool checkTeleHub; 4283 bool checkTeleHub;
4284 4284
@@ -6222,7 +6222,7 @@ Environment.Exit(1);
6222 if(isManager) 6222 if(isManager)
6223 return true; 6223 return true;
6224 6224
6225 if (!agentRootCrossing) 6225 if (agentRootCrossing)
6226 { 6226 {
6227 if (!RegionInfo.EstateSettings.AllowDirectTeleport) 6227 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
6228 { 6228 {