aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-11-10 16:22:55 +0100
committerMelanie2010-11-10 16:22:55 +0100
commitaace455249b2ea8c033871f39f23409119760932 (patch)
treeebfca1e5bb60a08ad708053c89b31fba04d700e1 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
downloadopensim-SC_OLD-aace455249b2ea8c033871f39f23409119760932.zip
opensim-SC_OLD-aace455249b2ea8c033871f39f23409119760932.tar.gz
opensim-SC_OLD-aace455249b2ea8c033871f39f23409119760932.tar.bz2
opensim-SC_OLD-aace455249b2ea8c033871f39f23409119760932.tar.xz
Prevent teleporting to a region when the egent is banned in all parcels
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a449cca..dd06be2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3886,6 +3886,13 @@ namespace OpenSim.Region.Framework.Scenes
3886 return false; 3886 return false;
3887 } 3887 }
3888 3888
3889 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
3890 if (nearestParcel == null)
3891 {
3892 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: no allowed parcel", cAgentData.AgentID);
3893 return false;
3894 }
3895
3889 int num = m_sceneGraph.GetNumberOfScenePresences(); 3896 int num = m_sceneGraph.GetNumberOfScenePresences();
3890 3897
3891 if (num >= RegionInfo.RegionSettings.AgentLimit) 3898 if (num >= RegionInfo.RegionSettings.AgentLimit)