aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-17 23:33:26 +0100
committerJustin Clark-Casey (justincc)2012-05-17 23:33:26 +0100
commit4d34763f8c90dfe87a8a5930bf05fe36b86d15df (patch)
tree639b53816b54241e75b809c006ce77866acf3a92 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentminor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFai... (diff)
downloadopensim-SC_OLD-4d34763f8c90dfe87a8a5930bf05fe36b86d15df.zip
opensim-SC_OLD-4d34763f8c90dfe87a8a5930bf05fe36b86d15df.tar.gz
opensim-SC_OLD-4d34763f8c90dfe87a8a5930bf05fe36b86d15df.tar.bz2
opensim-SC_OLD-4d34763f8c90dfe87a8a5930bf05fe36b86d15df.tar.xz
Check agent limit against root agent count rather than both root and child agents
From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115 agent should apply to avatars only. This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources. As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate. This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed. This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 4815922..ddf1550 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -779,11 +779,6 @@ namespace OpenSim.Region.Framework.Scenes
779 return m_scenePresenceArray; 779 return m_scenePresenceArray;
780 } 780 }
781 781
782 public int GetNumberOfScenePresences()
783 {
784 return m_scenePresenceArray.Count;
785 }
786
787 /// <summary> 782 /// <summary>
788 /// Request a scene presence by UUID. Fast, indexed lookup. 783 /// Request a scene presence by UUID. Fast, indexed lookup.
789 /// </summary> 784 /// </summary>