aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorOren Hurvitz2014-05-18 19:45:27 +0300
committerOren Hurvitz2014-05-19 11:19:11 +0100
commit47b84875fd2b9f01140288a2695c33f5ef4466c0 (patch)
treedd22882762b4e4ec411de5c37d98fd1a394835b2 /OpenSim/Region/Framework/Scenes
parentLog the user when an inventory operation is blocked because the item/folder i... (diff)
downloadopensim-SC_OLD-47b84875fd2b9f01140288a2695c33f5ef4466c0.zip
opensim-SC_OLD-47b84875fd2b9f01140288a2695c33f5ef4466c0.tar.gz
opensim-SC_OLD-47b84875fd2b9f01140288a2695c33f5ef4466c0.tar.bz2
opensim-SC_OLD-47b84875fd2b9f01140288a2695c33f5ef4466c0.tar.xz
Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different.
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
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 {