diff options
| author | Melanie | 2010-03-30 21:34:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-30 21:34:27 +0100 |
| commit | 5693870fe26fae35a28f2d5103780434f4f40e57 (patch) | |
| tree | 0e070fb6f11ab8763ac4f1f9a851a0061101d4d6 /OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | minor: commented out code removal (diff) | |
| download | opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.zip opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.gz opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.bz2 opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | 2 |
1 files changed, 1 insertions, 1 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()); |