Skip to content
Snippets Groups Projects
Commit 5a03b828 authored by Richard Linden's avatar Richard Linden
Browse files

Merge

parents d6a7046c cc7043ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/llstat.cpp
+ 3
− 2
View file @ 5a03b828
...@@ -54,8 +54,9 @@ void LLStat::reset() ...@@ -54,8 +54,9 @@ void LLStat::reset()
LLStat::LLStat(std::string name, S32 num_bins, BOOL use_frame_timer) LLStat::LLStat(std::string name, S32 num_bins, BOOL use_frame_timer)
: mUseFrameTimer(use_frame_timer), : mUseFrameTimer(use_frame_timer),
mNumBins(num_bins), mNumBins(num_bins),
mName(name) mName(name),
{ mBins(NULL)
{
llassert(mNumBins > 0); llassert(mNumBins > 0);
mLastTime = 0.f; mLastTime = 0.f;
......
indra/llcommon/llstat.h
+ 0
− 1
View file @ 5a03b828
...@@ -40,7 +40,6 @@ class LL_COMMON_API LLStat ...@@ -40,7 +40,6 @@ class LL_COMMON_API LLStat
private: private:
typedef std::multimap<std::string, LLStat*> stat_map_t; typedef std::multimap<std::string, LLStat*> stat_map_t;
void init();
static stat_map_t& getStatList(); static stat_map_t& getStatList();
public: public:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment