diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
| commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
| tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llappviewer.h | |
| parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge changes for 3.4.5
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 6aab237040..aaeec1121f 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -57,6 +57,9 @@ class LLTextureFetch; class LLWatchdogTimeout; class LLUpdaterService; +extern LLFastTimer::DeclareTimer FTM_FRAME; + + class LLAppViewer : public LLApp { public: |