diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-11 15:54:06 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-11 15:54:06 -0800 |
| commit | 5f099265fc36c885122457edd87a1ec8c1a80873 (patch) | |
| tree | ea09410c65f2136932b5bf0d58ccbd20d6abfb4c /indra/newview/llviewertexture.h | |
| parent | 76d708bdb5230aaeb9a15bb2fb475458d8bb996e (diff) | |
| parent | 20921d6a1a2e98fee750cb5a76adddb7266183f3 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index b779396293..b5636bbdc7 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -735,7 +735,7 @@ public: //it tracks the activities of the texture pipeline //records them, and outputs them to log files // -class LLTexturePipelineTester : public LLMetricPerformanceTester +class LLTexturePipelineTester : public LLMetricPerformanceTesterWithSession { enum { @@ -751,8 +751,6 @@ public: void updateGrayTextureBinding() ; void setStablizingTime() ; - /*virtual*/ void analyzePerformance(std::ofstream* os, LLSD* base, LLSD* current) ; - private: void reset() ; void updateStablizingTime() ; @@ -823,7 +821,7 @@ private: S32 mInstantPerformanceListCounter ; }; - /*virtual*/ LLMetricPerformanceTester::LLTestSession* loadTestSession(LLSD* log) ; + /*virtual*/ LLMetricPerformanceTesterWithSession::LLTestSession* loadTestSession(LLSD* log) ; /*virtual*/ void compareTestSessions(std::ofstream* os) ; }; |