summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.h
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
committerGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
commitec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch)
tree01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/newview/llfasttimerview.h
parentc2785a740eb98d28ba705c981f4b6b289501d2e5 (diff)
parentb7cd89da5f74663a9fd547af77afaed06cdb05fd (diff)
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/newview/llfasttimerview.h')
-rw-r--r--indra/newview/llfasttimerview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index a349e7ad4c..5766cfa0b0 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -46,6 +46,7 @@ private:
static LLSD analyzePerformanceLogDefault(std::istream& is) ;
static void exportCharts(const std::string& base, const std::string& target);
void onPause();
+ LLFastTimer::NamedTimer& getFrameTimer();
public:
@@ -90,7 +91,6 @@ private:
S32 mHoverBarIndex;
LLFrameTimer mHighlightTimer;
S32 mPrintStats;
- S32 mAverageCyclesPerTimer;
LLRect mGraphRect;
};