diff options
| author | Melanie | 2012-07-28 00:39:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-28 00:39:36 +0100 |
| commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
| tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
| download | opensim-SC-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
Diffstat (limited to 'OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs')
| -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 dcbd717..3243a9a 100644 --- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs +++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | |||
| @@ -34,7 +34,7 @@ using Mono.Data.SqliteClient; | |||
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
| 37 | using OpenSim.Framework.Statistics; | 37 | using OpenSim.Framework.Monitoring; |
| 38 | 38 | ||
| 39 | namespace OpenSim.Region.UserStatistics | 39 | namespace OpenSim.Region.UserStatistics |
| 40 | { | 40 | { |