aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorBlueWall2013-02-10 13:01:33 -0500
committerBlueWall2013-02-10 13:01:33 -0500
commitadedd70c352581bc447452f5835c10853c77bea8 (patch)
tree64a144c31fb0bec3828562b049dc0fdd306d0ec4 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-adedd70c352581bc447452f5835c10853c77bea8.zip
opensim-SC-adedd70c352581bc447452f5835c10853c77bea8.tar.gz
opensim-SC-adedd70c352581bc447452f5835c10853c77bea8.tar.bz2
opensim-SC-adedd70c352581bc447452f5835c10853c77bea8.tar.xz
Fix teleport/telehub issue:
Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index de3978c..9b17b7f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5506,8 +5506,13 @@ namespace OpenSim.Region.Framework.Scenes
5506 5506
5507 if (banned) 5507 if (banned)
5508 { 5508 {
5509 reason = "No suitable landing point found"; 5509 if(Permissions.IsAdministrator(agentID) == false || Permissions.IsGridGod(agentID) == false)
5510 return false; 5510 {
5511 reason = "No suitable landing point found";
5512 return false;
5513 }
5514 reason = "Administrative access only";
5515 return true;
5511 } 5516 }
5512 } 5517 }
5513 } 5518 }