fixed crash on startup

2 files changed, 21 insertions, 11 deletions

diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp
index 2c91e10404..d265d77a4d 100644
--- a/indra/llcommon/llstat.cpp
+++ b/indra/llcommon/llstat.cpp
@@ -37,7 +37,8 @@
 
 
 // statics
-LLStat::stat_map_t LLStat::sStatList;
+
+
 //------------------------------------------------------------------------
 LLTimer LLStat::sTimer;
 LLFrameTimer LLStat::sFrameTimer;
@@ -55,7 +56,8 @@ 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;
@@ -64,13 +66,20 @@ LLStat::LLStat(std::string name, S32 num_bins, BOOL use_frame_timer)
 
 	if (!mName.empty())
 	{
-		stat_map_t::iterator iter = sStatList.find(mName);
-		if (iter != sStatList.end())
+		stat_map_t::iterator iter = getStatList().find(mName);
+		if (iter != getStatList().end())
 			llwarns << "LLStat with duplicate name: " << mName << llendl;
-		sStatList.insert(std::make_pair(mName, this));
+		getStatList().insert(std::make_pair(mName, this));
 	}
 }
 
+LLStat::stat_map_t& LLStat::getStatList()
+{
+	static LLStat::stat_map_t stat_list;
+	return stat_list;
+}
+
+
 LLStat::~LLStat()
 {
 	delete[] mBins;
@@ -78,10 +87,10 @@ LLStat::~LLStat()
 	if (!mName.empty())
 	{
 		// handle multiple entries with the same name
-		stat_map_t::iterator iter = sStatList.find(mName);
-		while (iter != sStatList.end() && iter->second != this)
+		stat_map_t::iterator iter = getStatList().find(mName);
+		while (iter != getStatList().end() && iter->second != this)
 			++iter;
-		sStatList.erase(iter);
+		getStatList().erase(iter);
 	}
 }
 
diff --git a/indra/llcommon/llstat.h b/indra/llcommon/llstat.h
index 3dc52aa507..38377a010b 100644
--- a/indra/llcommon/llstat.h
+++ b/indra/llcommon/llstat.h
@@ -39,7 +39,8 @@ class LL_COMMON_API LLStat
 {
 private:
 	typedef std::multimap<std::string, LLStat*> stat_map_t;
-	static stat_map_t sStatList;
+
+	static stat_map_t& getStatList();
 
 public:
 	LLStat(std::string name = std::string(), S32 num_bins = 32, BOOL use_frame_timer = FALSE);
@@ -104,8 +105,8 @@ public:
 	static LLStat* getStat(const std::string& name)
 	{
 		// return the first stat that matches 'name'
-		stat_map_t::iterator iter = sStatList.find(name);
-		if (iter != sStatList.end())
+		stat_map_t::iterator iter = getStatList().find(name);
+		if (iter != getStatList().end())
 			return iter->second;
 		else
 			return NULL;