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/Framework/Scenes/SimStatsReporter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
| download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-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/Framework/Scenes/SimStatsReporter.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index d6ff5a2..20919a1 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
| @@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
| 30 | using System.Timers; | 30 | using System.Timers; |
| 31 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Framework.Statistics; | 33 | using OpenSim.Framework.Monitoring; |
| 34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
| 35 | 35 | ||
| 36 | namespace OpenSim.Region.Framework.Scenes | 36 | namespace OpenSim.Region.Framework.Scenes |