ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-02-10 20:01:51 +00:00
parent 069e587841 6f3dcf58b8
commit 12f732fd3f
4 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -5865,8 +5865,13 @@ Environment.Exit(1);
if (banned)
{
reason = "No suitable landing point found";
return false;
if(Permissions.IsAdministrator(agentID) == false || Permissions.IsGridGod(agentID) == false)
{
reason = "No suitable landing point found";
return false;
}
reason = "Administrative access only";
return true;
}
}
}

11
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -4269,6 +4269,7 @@ namespace OpenSim.Region.Framework.Scenes
(m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
(m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)
{
if (GodLevel < 200 &&
((!m_scene.Permissions.IsGod(m_uuid) &&
!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) ||
@@ -4277,7 +4278,14 @@ namespace OpenSim.Region.Framework.Scenes
{
SpawnPoint[] spawnPoints = m_scene.RegionInfo.RegionSettings.SpawnPoints().ToArray();
if (spawnPoints.Length == 0)
{
if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid))
{
pos.X = 128.0f;
pos.Y = 128.0f;
}
return;
}
int index;
bool selected = false;
@@ -4286,6 +4294,8 @@ namespace OpenSim.Region.Framework.Scenes
{
case "random":
if (spawnPoints.Length == 0)
return;
do
{
index = Util.RandomClass.Next(spawnPoints.Length - 1);
@@ -4297,6 +4307,7 @@ namespace OpenSim.Region.Framework.Scenes
// SpawnPoint sp = spawnPoints[index];
ILandObject land = m_scene.LandChannel.GetLandObject(spawnPosition.X, spawnPosition.Y);
if (land == null || land.IsEitherBannedOrRestricted(UUID))
selected = false;
else