diff options
author | Thomas Grimshaw | 2010-04-05 22:08:34 +0200 |
---|---|---|
committer | Thomas Grimshaw | 2010-04-05 22:08:34 +0200 |
commit | f34cc6b46949033803c79235b9d82da9bf9634dd (patch) | |
tree | d1117656803e210151e480b960184bc4524f129e /OpenSim/ApplicationPlugins | |
parent | Change land overlay to send group owned status properly (diff) | |
download | opensim-SC-f34cc6b46949033803c79235b9d82da9bf9634dd.zip opensim-SC-f34cc6b46949033803c79235b9d82da9bf9634dd.tar.gz opensim-SC-f34cc6b46949033803c79235b9d82da9bf9634dd.tar.bz2 opensim-SC-f34cc6b46949033803c79235b9d82da9bf9634dd.tar.xz |
Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index ed18207..dea166d 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
192 | 192 | ||
193 | protected string RegionStats(OSHttpResponse httpResponse, Scene scene) | 193 | protected string RegionStats(OSHttpResponse httpResponse, Scene scene) |
194 | { | 194 | { |
195 | int users = scene.GetAvatars().Count; | 195 | int users = scene.GetRootAgentCount(); |
196 | int objects = scene.Entities.Count - users; | 196 | int objects = scene.Entities.Count - users; |
197 | 197 | ||
198 | RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); | 198 | RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs index 5798286..82e9d9b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs | |||
@@ -125,7 +125,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
125 | rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString()); | 125 | rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString()); |
126 | rxw.WriteEndAttribute(); | 126 | rxw.WriteEndAttribute(); |
127 | 127 | ||
128 | int users = s.GetAvatars().Count; | 128 | int users = s.GetRootAgentCount(); |
129 | rxw.WriteStartAttribute(String.Empty, "avatars", String.Empty); | 129 | rxw.WriteStartAttribute(String.Empty, "avatars", String.Empty); |
130 | rxw.WriteValue(users); | 130 | rxw.WriteValue(users); |
131 | rxw.WriteEndAttribute(); | 131 | rxw.WriteEndAttribute(); |