diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/UserStatistics | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/UserStatistics')
| -rw-r--r-- | OpenSim/Region/UserStatistics/WebStatsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 519668a..a03cc4c 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics | |||
| 76 | try | 76 | try |
| 77 | { | 77 | { |
| 78 | cnfg = config.Configs["WebStats"]; | 78 | cnfg = config.Configs["WebStats"]; |
| 79 | enabled = cnfg.GetBoolean("enabled", false); | 79 | enabled = cnfg.GetBoolean("enabled", false); |
| 80 | } | 80 | } |
| 81 | catch (Exception) | 81 | catch (Exception) |
| 82 | { | 82 | { |
| @@ -137,7 +137,7 @@ namespace OpenSim.Region.UserStatistics | |||
| 137 | 137 | ||
| 138 | m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID)); | 138 | m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID)); |
| 139 | scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket; | 139 | scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket; |
| 140 | } | 140 | } |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | public void ReceiveClassicSimStatsPacket(SimStats stats) | 143 | public void ReceiveClassicSimStatsPacket(SimStats stats) |