diff options
| author | Richard Linden <none@none> | 2012-08-25 12:51:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-25 12:51:37 -0700 |
| commit | 5a03b8282da64433c2525f0950e8fb86995f66dc (patch) | |
| tree | 5a6456299ea5094a34d3abde27b6f0f438a58865 | |
| parent | d6a7046c4bb833ce57e7a86204b62bcdfeeb25ec (diff) | |
| parent | cc7043ecf6b58e7d5a38167b5f507abc6b0b70b1 (diff) | |
Merge
| -rw-r--r-- | indra/llcommon/llstat.cpp | 5 | ||||
| -rw-r--r-- | indra/llcommon/llstat.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp index 5bedd97dea..3678c8e1c1 100644 --- a/indra/llcommon/llstat.cpp +++ b/indra/llcommon/llstat.cpp @@ -54,8 +54,9 @@ void LLStat::reset() LLStat::LLStat(std::string name, S32 num_bins, BOOL use_frame_timer) : mUseFrameTimer(use_frame_timer), mNumBins(num_bins), - mName(name) - { + mName(name), + mBins(NULL) +{ llassert(mNumBins > 0); mLastTime = 0.f; diff --git a/indra/llcommon/llstat.h b/indra/llcommon/llstat.h index 356bd8aac9..38377a010b 100644 --- a/indra/llcommon/llstat.h +++ b/indra/llcommon/llstat.h @@ -40,7 +40,6 @@ class LL_COMMON_API LLStat private: typedef std::multimap<std::string, LLStat*> stat_map_t; - void init(); static stat_map_t& getStatList(); public: |