diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Framework/Monitoring/AssetStatsCollector.cs | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Monitoring/AssetStatsCollector.cs (renamed from OpenSim/Framework/Statistics/AssetStatsCollector.cs) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Statistics/AssetStatsCollector.cs b/OpenSim/Framework/Monitoring/AssetStatsCollector.cs index 7082ef3..2a4d45b 100644 --- a/OpenSim/Framework/Statistics/AssetStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/AssetStatsCollector.cs | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using System.Timers; | 29 | using System.Timers; |
| 30 | 30 | ||
| 31 | namespace OpenSim.Framework.Statistics | 31 | namespace OpenSim.Framework.Monitoring |
| 32 | { | 32 | { |
| 33 | /// <summary> | 33 | /// <summary> |
| 34 | /// Asset service statistics collection | 34 | /// Asset service statistics collection |