ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
This commit is contained in:
Melanie
2012-05-19 13:34:44 +01:00
parent b4cd8b491b 3f2a727b6d
commit ebd9d2618b
15 changed files with 385 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -860,11 +860,6 @@ namespace OpenSim.Region.Framework.Scenes
return m_scenePresenceArray;
}
public int GetNumberOfScenePresences()
{
return m_scenePresenceArray.Count;
}
/// <summary>
/// Request a scene presence by UUID. Fast, indexed lookup.
/// </summary>