aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/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 1115399..3b8fbfd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5463,7 +5463,7 @@ namespace OpenSim.Region.Framework.Scenes
5463 /// <param name='position'></param> 5463 /// <param name='position'></param>
5464 /// <param name='reason'></param> 5464 /// <param name='reason'></param>
5465 /// <returns></returns> 5465 /// <returns></returns>
5466 public bool QueryAccess(UUID agentID, string agentHomeURI, Vector3 position, out string reason) 5466 public bool QueryAccess(UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string reason)
5467 { 5467 {
5468 reason = string.Empty; 5468 reason = string.Empty;
5469 5469
@@ -5529,7 +5529,7 @@ namespace OpenSim.Region.Framework.Scenes
5529 return false; 5529 return false;
5530 } 5530 }
5531 5531
5532 if (position == Vector3.Zero) // Teleport 5532 if (viaTeleport)
5533 { 5533 {
5534 if (!RegionInfo.EstateSettings.AllowDirectTeleport) 5534 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
5535 { 5535 {