OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.

avinationmerge
Thomas Grimshaw 2010-04-05 22:08:34 +02:00
parent e0b287961f
commit f34cc6b469
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
View File

@ -192,7 +192,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
protected string RegionStats(OSHttpResponse httpResponse, Scene scene) protected string RegionStats(OSHttpResponse httpResponse, Scene scene)
{ {
int users = scene.GetAvatars().Count; int users = scene.GetRootAgentCount();
int objects = scene.Entities.Count - users; int objects = scene.Entities.Count - users;
RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); RestXmlWriter rxw = new RestXmlWriter(new StringWriter());

2
OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString()); rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString());
rxw.WriteEndAttribute(); rxw.WriteEndAttribute();
int users = s.GetAvatars().Count; int users = s.GetRootAgentCount();
rxw.WriteStartAttribute(String.Empty, "avatars", String.Empty); rxw.WriteStartAttribute(String.Empty, "avatars", String.Empty);
rxw.WriteValue(users); rxw.WriteValue(users);
rxw.WriteEndAttribute(); rxw.WriteEndAttribute();

10
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveTerrain() public void SaveTerrain()
{ {
m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
} }
public void StoreWindlightProfile(RegionMeta7WindlightData wl) public void StoreWindlightProfile(RegionMeta7WindlightData wl)
{ {
@ -4338,6 +4338,14 @@ namespace OpenSim.Region.Framework.Scenes
return m_sceneGraph.GetAvatars(); return m_sceneGraph.GetAvatars();
} }
/// <summary>
/// Cheaply return the number of avatars in a region (without fetching a list object)
/// </summary>
public int GetRootAgentCount()
{
return m_sceneGraph.GetRootAgentCount();
}
/// <summary> /// <summary>
/// Return a list of all ScenePresences in this region. This returns child agents as well as root agents. /// Return a list of all ScenePresences in this region. This returns child agents as well as root agents.
/// This list is a new object, so it can be iterated over without locking. /// This list is a new object, so it can be iterated over without locking.

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -5266,7 +5266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llGetRegionAgentCount() public LSL_Integer llGetRegionAgentCount()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return new LSL_Integer(World.GetAvatars().Count); return new LSL_Integer(World.GetRootAgentCount());
} }
public LSL_Vector llGetRegionCorner() public LSL_Vector llGetRegionCorner()