diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Region/UserStatistics | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/UserStatistics')
| -rw-r--r-- | OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs index 704b74f..a567413 100644 --- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs +++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Region.UserStatistics | |||
| 68 | HTMLUtil.OL_O(ref output, ""); | 68 | HTMLUtil.OL_O(ref output, ""); |
| 69 | foreach (Scene scene in all_scenes) | 69 | foreach (Scene scene in all_scenes) |
| 70 | { | 70 | { |
| 71 | ScenePresence[] avatarInScene = scene.GetScenePresences(); | 71 | List<ScenePresence> avatarInScene = scene.GetScenePresences(); |
| 72 | 72 | ||
| 73 | HTMLUtil.LI_O(ref output, String.Empty); | 73 | HTMLUtil.LI_O(ref output, String.Empty); |
| 74 | output.Append(scene.RegionInfo.RegionName); | 74 | output.Append(scene.RegionInfo.RegionName); |