diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 10:39:23 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 10:39:23 -0700 |
| commit | f740faf760cedec5b72928224b386c0dc8a3dd6e (patch) | |
| tree | a4f7d17f88306af89badea6b03e417ef12587b23 /indra/newview/llscenemonitor.h | |
| parent | 670d03ceb83b92c9bb98d10bb37fba6f75971a2f (diff) | |
| parent | 45a7fe901aa4cd7af14fa1cb894da46a988e3aa2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
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 |