diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-11 22:37:51 -0500 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-11 22:37:51 -0500 |
| commit | 899f470deca2cbc775e87147852e0b118464896f (patch) | |
| tree | bfee59a4141c4c60ffde94ff8ed6ed9a14d125a6 /indra/newview/llviewertexture.h | |
| parent | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (diff) | |
| parent | 5f099265fc36c885122457edd87a1ec8c1a80873 (diff) | |
STORM-102: Merge from viewer-development
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) ; }; |