diff options
| author | Richard Linden <none@none> | 2013-01-18 16:02:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-18 16:02:03 -0800 |
| commit | a4d01f05e054eb0f7cbe2621548429cea70ffe26 (patch) | |
| tree | ccf47ea062bb77c2166e826d85c104bc3a17e798 /indra/newview/llscenemonitor.h | |
| parent | e975ae35ab57f56adfaed64bc108240a5013f040 (diff) | |
| parent | 033e96259912b1bfaa96529386bf255fab24c17f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llscenemonitor.h')
| -rw-r--r-- | indra/newview/llscenemonitor.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h index 02e3d57d46..93e6c20bb9 100644 --- a/indra/newview/llscenemonitor.h +++ b/indra/newview/llscenemonitor.h @@ -31,6 +31,7 @@ #include "llmath.h" #include "llfloater.h" #include "llcharacter.h" +#include "lltracerecording.h" class LLCharacter; class LLRenderTarget; @@ -61,6 +62,8 @@ public: bool isEnabled()const {return mEnabled;} bool needsUpdate() const; + LLTrace::ExtendableRecording* getRecording() const {return mRecording;} + private: void freezeScene(); void unfreezeScene(); @@ -86,6 +89,8 @@ private: F32 mDiffPixelRatio; //ratio of pixels used for comparison against the original mDiff size along one dimension std::vector<LLAnimPauseRequest> mAvatarPauseHandles; + + LLTrace::ExtendableRecording* mRecording; }; class LLSceneMonitorView : public LLFloater |