Merge

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;
 

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: