diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
| commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
| tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /indra/newview/llfasttimerview.h | |
| parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
| parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) | |
fixed merge conflict in .hgtags
Diffstat (limited to 'indra/newview/llfasttimerview.h')
| -rw-r--r-- | indra/newview/llfasttimerview.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index 1a54a53f09..b40d7ffc1a 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -42,8 +42,6 @@ public: private: static void doAnalysisDefault(std::string baseline, std::string target, std::string output) ; - static void doAnalysisMetrics(std::string baseline, std::string target, std::string output) ; - static LLSD analyzeMetricPerformanceLog(std::istream& is) ; static LLSD analyzePerformanceLogDefault(std::istream& is) ; public: |