aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics/StatsManager.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 00:54:23 +0100
committerUbitUmarov2012-07-17 00:54:23 +0100
commitd5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch)
tree8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Framework/Statistics/StatsManager.cs
parentUbitOde: remove useless water collider from active code. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Framework/Statistics/StatsManager.cs')
-rw-r--r--OpenSim/Framework/Statistics/StatsManager.cs17
1 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Framework/Statistics/StatsManager.cs b/OpenSim/Framework/Statistics/StatsManager.cs
index 43159ef..436ce2f 100644
--- a/OpenSim/Framework/Statistics/StatsManager.cs
+++ b/OpenSim/Framework/Statistics/StatsManager.cs
@@ -34,14 +34,12 @@ namespace OpenSim.Framework.Statistics
34 { 34 {
35 private static AssetStatsCollector assetStats; 35 private static AssetStatsCollector assetStats;
36 private static UserStatsCollector userStats; 36 private static UserStatsCollector userStats;
37 private static SimExtraStatsCollector simExtraStats; 37 private static SimExtraStatsCollector simExtraStats = new SimExtraStatsCollector();
38 38
39 public static AssetStatsCollector AssetStats { get { return assetStats; } } 39 public static AssetStatsCollector AssetStats { get { return assetStats; } }
40 public static UserStatsCollector UserStats { get { return userStats; } } 40 public static UserStatsCollector UserStats { get { return userStats; } }
41 public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } } 41 public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } }
42 42
43 private StatsManager() {}
44
45 /// <summary> 43 /// <summary>
46 /// Start collecting statistics related to assets. 44 /// Start collecting statistics related to assets.
47 /// Should only be called once. 45 /// Should only be called once.
@@ -63,16 +61,5 @@ namespace OpenSim.Framework.Statistics
63 61
64 return userStats; 62 return userStats;
65 } 63 }
66
67 /// <summary>
68 /// Start collecting extra sim statistics apart from those collected for the client.
69 /// Should only be called once.
70 /// </summary>
71 public static SimExtraStatsCollector StartCollectingSimExtraStats()
72 {
73 simExtraStats = new SimExtraStatsCollector();
74
75 return simExtraStats;
76 }
77 } 64 }
78} 65} \ No newline at end of file