diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-11 09:33:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-11 09:33:29 -0800 |
| commit | 94f44437d7e7ccb54f227e35523fa8a4e027d7d2 (patch) | |
| tree | dd899aa6e98b2c10b22fa0db58cfca866a0322de /indra/newview/llviewertexture.h | |
| parent | ee8df375449e97476408417ec6dea0d6a8853d73 (diff) | |
| parent | 0e07758b540374aa421d2938ce5ed13e2b9eefe4 (diff) | |
STORM-151 : merge kdu static linking, add indra/llkdu implementation. Doesn't build yet.
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) ; }; |