diff options
| author | opensim mirror account | 2010-11-10 09:20:09 -0800 |
|---|---|---|
| committer | opensim mirror account | 2010-11-10 09:20:09 -0800 |
| commit | b02ca416e5cece8b118c4ab2d81a43b9b541bccf (patch) | |
| tree | 95b0291dbacae8b524aca66942623dd701607c1b | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Prevent teleporting to a region when the egent is banned in all parcels (diff) | |
| download | opensim-SC_OLD-b02ca416e5cece8b118c4ab2d81a43b9b541bccf.zip opensim-SC_OLD-b02ca416e5cece8b118c4ab2d81a43b9b541bccf.tar.gz opensim-SC_OLD-b02ca416e5cece8b118c4ab2d81a43b9b541bccf.tar.bz2 opensim-SC_OLD-b02ca416e5cece8b118c4ab2d81a43b9b541bccf.tar.xz | |
Merge branch 'master' of /var/git/opensim/
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c5396d5..a4cc66d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3761,6 +3761,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3761 | 3761 | ||
| 3762 | // We have to wait until the viewer contacts this region after receiving EAC. | 3762 | // We have to wait until the viewer contacts this region after receiving EAC. |
| 3763 | // That calls AddNewClient, which finally creates the ScenePresence | 3763 | // That calls AddNewClient, which finally creates the ScenePresence |
| 3764 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); | ||
| 3765 | if (nearestParcel == null) | ||
| 3766 | { | ||
| 3767 | m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: no allowed parcel", cAgentData.AgentID); | ||
| 3768 | return false; | ||
| 3769 | } | ||
| 3770 | |||
| 3764 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3771 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
| 3765 | if (childAgentUpdate != null) | 3772 | if (childAgentUpdate != null) |
| 3766 | { | 3773 | { |