diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
| commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/llui/llstatbar.h | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) | |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ merge
Diffstat (limited to 'indra/llui/llstatbar.h')
| -rw-r--r-- | indra/llui/llstatbar.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h index 6b481ca68f..384d0950a6 100644 --- a/indra/llui/llstatbar.h +++ b/indra/llui/llstatbar.h @@ -95,17 +95,15 @@ private: STAT_NONE, STAT_COUNT, STAT_EVENT, - STAT_SAMPLE, - STAT_MEM + STAT_SAMPLE } mStatType; union { - void* valid; + void* valid; const LLTrace::StatType<LLTrace::CountAccumulator>* countStatp; const LLTrace::StatType<LLTrace::EventAccumulator>* eventStatp; - const LLTrace::StatType<LLTrace::SampleAccumulator>* sampleStatp; - const LLTrace::StatType<LLTrace::MemAccumulator>* memStatp; + const LLTrace::StatType<LLTrace::SampleAccumulator>* sampleStatp; } mStat; LLUIString mLabel; |