diff options
| author | Richard Linden <none@none> | 2013-02-02 01:09:52 -0800 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2013-02-02 01:09:52 -0800 | 
| commit | eb6c8959ca5b8b3c100114d4d659a48bb4d56b2c (patch) | |
| tree | ea47919dd349785bf292935d5f5772cd9e7b46b7 /indra/llui | |
| parent | a441664c109e4fca4154dbf80e108c27b3e9e601 (diff) | |
SH-3275 WIP interesting Update viewer metrics system to be more flexible
fixed most fast timer display and interaction issues
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 5 | 
1 files changed, 5 insertions, 0 deletions
| diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index fe6203f51d..b9d935847b 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1147,6 +1147,8 @@ void gl_rect_2d_simple( S32 width, S32 height )  	gGL.end();  } +static LLFastTimer::DeclareTimer FTM_RENDER_SEGMENTED_RECT ("Render segmented rectangle"); +  void gl_segmented_rect_2d_tex(const S32 left,   							  const S32 top,   							  const S32 right,  @@ -1156,6 +1158,7 @@ void gl_segmented_rect_2d_tex(const S32 left,  							  const S32 border_size,   							  const U32 edges)  { +	LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);  	S32 width = llabs(right - left);  	S32 height = llabs(top - bottom); @@ -1314,6 +1317,7 @@ void gl_segmented_rect_2d_fragment_tex(const LLRect& rect,  									   const F32 end_fragment,   									   const U32 edges)  { +	LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);  	const S32 left = rect.mLeft;  	const S32 right = rect.mRight;  	const S32 top = rect.mTop; @@ -1501,6 +1505,7 @@ void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& bo  							  const LLVector3& border_height, const LLVector3& width_vec, const LLVector3& height_vec,  							  const U32 edges)  { +	LLFastTimer _(FTM_RENDER_SEGMENTED_RECT);  	LLVector3 left_border_width = ((edges & (~(U32)ROUNDED_RECT_RIGHT)) != 0) ? border_width : LLVector3::zero;  	LLVector3 right_border_width = ((edges & (~(U32)ROUNDED_RECT_LEFT)) != 0) ? border_width : LLVector3::zero; | 
