diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
| commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
| tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/llui | |
| parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
| parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) | |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llbutton.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 8028f397f3..3354cb2db3 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -942,11 +942,8 @@ void LLButton::draw() break; } - S32 y_offset = 2 + (getRect().getHeight() - 20)/2; - if (pressed && mDisplayPressedState) { - y_offset--; x++; } diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 33c4b6ec73..16c27da56a 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -487,9 +487,6 @@ void LLMenuItemGL::draw( void ) // let disabled items be highlighted, just don't draw them as such if( getEnabled() && getHighlight() && !mBriefItem) { - int debug_count = 0; - if (dynamic_cast<LLMenuItemCallGL*>(this)) - debug_count++; gGL.color4fv( mHighlightBackground.get().mV ); gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 ); |