diff options
| author | Melanie | 2011-04-21 22:34:49 +0200 |
|---|---|---|
| committer | Melanie | 2011-04-21 22:34:49 +0200 |
| commit | 282e116f948d431b570f7c17425cfc0a8ea767a2 (patch) | |
| tree | b6e878e4458133f20029e3cdead091141fc734e0 /OpenSim/Region | |
| parent | Merge branch 'queuetest' into careminster-presence-refactor (diff) | |
| download | opensim-SC-282e116f948d431b570f7c17425cfc0a8ea767a2.zip opensim-SC-282e116f948d431b570f7c17425cfc0a8ea767a2.tar.gz opensim-SC-282e116f948d431b570f7c17425cfc0a8ea767a2.tar.bz2 opensim-SC-282e116f948d431b570f7c17425cfc0a8ea767a2.tar.xz | |
Honor agent limit for region crossings and teleports
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index eed5ebc..e29b51c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -5191,6 +5191,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5191 | return true; | 5191 | return true; |
| 5192 | } | 5192 | } |
| 5193 | 5193 | ||
| 5194 | int num = m_sceneGraph.GetNumberOfScenePresences(); | ||
| 5195 | |||
| 5196 | if (num >= RegionInfo.RegionSettings.AgentLimit) | ||
| 5197 | { | ||
| 5198 | if (!Permissions.IsAdministrator(cAgentData.AgentID)) | ||
| 5199 | { | ||
| 5200 | reason = "The region is full"; | ||
| 5201 | return false; | ||
| 5202 | } | ||
| 5203 | } | ||
| 5204 | |||
| 5194 | if (!AuthorizeUser(agentID, out reason)) | 5205 | if (!AuthorizeUser(agentID, out reason)) |
| 5195 | { | 5206 | { |
| 5196 | // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); | 5207 | // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); |