diff options
| author | Melanie | 2012-05-19 13:34:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-19 13:34:44 +0100 |
| commit | ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch) | |
| tree | 2d63da14ca345487a27f2202b2490eae0d86b60c /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff) | |
| download | opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2 opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 00f76e0..23a0550 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -860,11 +860,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 860 | return m_scenePresenceArray; | 860 | return m_scenePresenceArray; |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | public int GetNumberOfScenePresences() | ||
| 864 | { | ||
| 865 | return m_scenePresenceArray.Count; | ||
| 866 | } | ||
| 867 | |||
| 868 | /// <summary> | 863 | /// <summary> |
| 869 | /// Request a scene presence by UUID. Fast, indexed lookup. | 864 | /// Request a scene presence by UUID. Fast, indexed lookup. |
| 870 | /// </summary> | 865 | /// </summary> |