diff options
author | Jacek Antonelli | 2010-02-09 21:14:55 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-16 18:50:21 -0600 |
commit | 45277e02ea120efb90ffc10beb33fa2364d631aa (patch) | |
tree | 3f76fe085798d995330979330d5db293bd7f4534 /linden/indra/llcommon | |
parent | Ported many texture engine changes from Snowglobe. (diff) | |
download | meta-impy-45277e02ea120efb90ffc10beb33fa2364d631aa.zip meta-impy-45277e02ea120efb90ffc10beb33fa2364d631aa.tar.gz meta-impy-45277e02ea120efb90ffc10beb33fa2364d631aa.tar.bz2 meta-impy-45277e02ea120efb90ffc10beb33fa2364d631aa.tar.xz |
Ported some stats and texture console changes from Snowglobe.
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r-- | linden/indra/llcommon/llfasttimer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h index 60281fd..8c1cf47 100644 --- a/linden/indra/llcommon/llfasttimer.h +++ b/linden/indra/llcommon/llfasttimer.h | |||
@@ -161,6 +161,7 @@ public: | |||
161 | FTM_IMAGE_UPDATE, | 161 | FTM_IMAGE_UPDATE, |
162 | FTM_IMAGE_CREATE, | 162 | FTM_IMAGE_CREATE, |
163 | FTM_IMAGE_DECODE, | 163 | FTM_IMAGE_DECODE, |
164 | FTM_IMAGE_READBACK, | ||
164 | FTM_IMAGE_MARK_DIRTY, | 165 | FTM_IMAGE_MARK_DIRTY, |
165 | FTM_PIPELINE, | 166 | FTM_PIPELINE, |
166 | FTM_VFILE_WAIT, | 167 | FTM_VFILE_WAIT, |
@@ -194,7 +195,7 @@ public: | |||
194 | enum { FTM_MAX_DEPTH = 64 }; | 195 | enum { FTM_MAX_DEPTH = 64 }; |
195 | 196 | ||
196 | public: | 197 | public: |
197 | static LLFastTimer::EFastTimerType sCurType; | 198 | static EFastTimerType sCurType; |
198 | 199 | ||
199 | LLFastTimer(EFastTimerType type) | 200 | LLFastTimer(EFastTimerType type) |
200 | { | 201 | { |