Merge

2012-08-25 12:51:37 -07:00 · 2012-08-25 12:51:37 -07:00 · 5a03b8282d
parent d6a7046c4b cc7043ecf6
commit 5a03b8282d
2 changed files with 3 additions and 3 deletions
--- 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;

--- 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: