diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/llui/llmenugl.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/llmenugl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp index 2d4a2f1..6850891 100644 --- a/linden/indra/llui/llmenugl.cpp +++ b/linden/indra/llui/llmenugl.cpp | |||
| @@ -3095,8 +3095,6 @@ void LLMenuGL::draw( void ) | |||
| 3095 | LLUI::sConfigGroup->getS32("DropShadowFloater") ); | 3095 | LLUI::sConfigGroup->getS32("DropShadowFloater") ); |
| 3096 | } | 3096 | } |
| 3097 | 3097 | ||
| 3098 | LLColor4 bg_color = mBackgroundColor; | ||
| 3099 | |||
| 3100 | if( mBgVisible ) | 3098 | if( mBgVisible ) |
| 3101 | { | 3099 | { |
| 3102 | gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor ); | 3100 | gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor ); |