summaryrefslogtreecommitdiff
path: root/indra/newview/llscenemonitor.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-05-22 21:20:19 -0700
committerRichard Linden <none@none>2013-05-22 21:20:19 -0700
commit2cdd6c2749b6553f8081e25e426501acd4025888 (patch)
tree2e273c0b582696ef21c13df2d7cdec4159527f64 /indra/newview/llscenemonitor.h
parent269fb97eba380baf5674178294bf86fb01cd712c (diff)
parente8daeb177deccff29182ee97c143b0350e8c727c (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/newview/llscenemonitor.h')
-rw-r--r--indra/newview/llscenemonitor.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h
index f43c455f2f..3351ed0579 100644
--- a/indra/newview/llscenemonitor.h
+++ b/indra/newview/llscenemonitor.h
@@ -73,7 +73,6 @@ private:
LLRenderTarget& getCaptureTarget();
void generateDitheringTexture(S32 width, S32 height);
- void addMonitorResult();
private:
bool mEnabled;
bool mDebugViewerVisible;
@@ -105,14 +104,6 @@ private:
std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
LLTrace::ExtendablePeriodicRecording* mRecording;
-
- //---------------------------------------
- typedef struct _monitor_result
- {
- F32 mTimeStamp;
- F32 mDiff;
- } ll_monitor_result_t;
- std::vector<ll_monitor_result_t> mMonitorResults;
};
class LLSceneMonitorView : public LLFloater