diff options
| author | BlueWall | 2011-04-21 19:08:31 -0400 |
|---|---|---|
| committer | BlueWall | 2011-04-21 19:08:31 -0400 |
| commit | cbe49ed917aaef44b5811949bd50e6c6d74c3188 (patch) | |
| tree | 53e2eae095e9744729a46f5bb6fe4db5e53eded9 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | fix merge conflicts with OpenSimDefaults.ini (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.zip opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.gz opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.bz2 opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 72f0402..fc31b65 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -800,6 +800,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 800 | return m_scenePresenceArray; | 800 | return m_scenePresenceArray; |
| 801 | } | 801 | } |
| 802 | 802 | ||
| 803 | public int GetNumberOfScenePresences() | ||
| 804 | { | ||
| 805 | return m_scenePresenceArray.Count; | ||
| 806 | } | ||
| 807 | |||
| 803 | /// <summary> | 808 | /// <summary> |
| 804 | /// Request a scene presence by UUID. Fast, indexed lookup. | 809 | /// Request a scene presence by UUID. Fast, indexed lookup. |
| 805 | /// </summary> | 810 | /// </summary> |