aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfasttimerview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:29 -0500
committerJacek Antonelli2008-08-15 23:45:29 -0500
commit7bdb4845afdd157f95281293803567090e3f992a (patch)
treefbcada1c227d7407f9f37ccba360bfe6326d9c5e /linden/indra/newview/llfasttimerview.cpp
parentSecond Life viewer sources 1.19.0.0 (diff)
downloadmeta-impy-7bdb4845afdd157f95281293803567090e3f992a.zip
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.gz
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.bz2
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.xz
Second Life viewer sources 1.19.0.2
Diffstat (limited to 'linden/indra/newview/llfasttimerview.cpp')
-rw-r--r--linden/indra/newview/llfasttimerview.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index 14dc08c..6364fd2 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -76,7 +76,9 @@ static LLColor4 green9(0.6f, 1.0f, 0.6f, 1.0f);
76static struct ft_display_info ft_display_table[] = 76static struct ft_display_info ft_display_table[] =
77{ 77{
78 { LLFastTimer::FTM_FRAME, "Frame", &LLColor4::white, 0 }, 78 { LLFastTimer::FTM_FRAME, "Frame", &LLColor4::white, 0 },
79 { LLFastTimer::FTM_MESSAGES, " Messages", &LLColor4::grey1, 0 }, 79 { LLFastTimer::FTM_MESSAGES, " System Messages", &LLColor4::grey1, 1 },
80 { LLFastTimer::FTM_MOUSEHANDLER, " Mouse", &LLColor4::grey1, 0 },
81 { LLFastTimer::FTM_KEYHANDLER, " Keyboard", &LLColor4::grey1, 0 },
80 { LLFastTimer::FTM_SLEEP, " Sleep", &LLColor4::grey2, 0 }, 82 { LLFastTimer::FTM_SLEEP, " Sleep", &LLColor4::grey2, 0 },
81 { LLFastTimer::FTM_IDLE, " Idle", &blue0, 0 }, 83 { LLFastTimer::FTM_IDLE, " Idle", &blue0, 0 },
82 { LLFastTimer::FTM_PUMP, " Pump", &LLColor4::magenta2, 1 }, 84 { LLFastTimer::FTM_PUMP, " Pump", &LLColor4::magenta2, 1 },
@@ -184,14 +186,14 @@ static struct ft_display_info ft_display_table[] =
184 { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink1, 0 }, 186 { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink1, 0 },
185 { LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1}, 187 { LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1},
186 188
187// { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 }, 189 { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 },
188// { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 }, 190 { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 },
189// { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 }, 191 { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 },
190// { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 }, 192 { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 },
191// { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 }, 193 { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 },
192// { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 }, 194 { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 },
193// { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 }, 195 { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 },
194// { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 }, 196 { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 },
195 197
196 { LLFastTimer::FTM_OTHER, " Other", &red0 } 198 { LLFastTimer::FTM_OTHER, " Other", &red0 }
197}; 199};