summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-05-20 19:28:20 -0700
committerRichard Linden <none@none>2013-05-20 19:28:20 -0700
commit11cee0c140af90564f5616d3464f29abae4d585f (patch)
tree16c6faf318d805aaaceb7c196d91170e92564b77 /indra/newview/llfasttimerview.h
parent13f43fdc5bd046f7857f06254c84b8993bdcc50a (diff)
parentab5106535758393e02b075d1e404e4e1fcf81abf (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llfasttimerview.h')
-rw-r--r--indra/newview/llfasttimerview.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index 8b9ad290bc..341adacd65 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -62,7 +62,6 @@ public:
virtual void draw();
LLTrace::TimeBlock* getLegendID(S32 y);
- F64 getTime(const std::string& name);
protected:
virtual void onClickCloseBtn();