diff options
| author | Richard Nelson <none@none> | 2010-04-01 12:52:04 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-04-01 12:52:04 -0700 |
| commit | 6cc65f9e5f0aba9242295d955eb31c4938b093e1 (patch) | |
| tree | 43b41105ab1b95f0d63a85491417247f149a27de /indra/llui/llmenugl.cpp | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
| parent | df45c16169bd2be38c53fd39fd87aa7b00bb64c2 (diff) | |
merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index fb4a9d032d..e0e86ae228 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3345,7 +3345,7 @@ void LLMenuHolderGL::draw() LLView::draw(); // now draw last selected item as overlay LLMenuItemGL* selecteditem = (LLMenuItemGL*)sItemLastSelectedHandle.get(); - if (selecteditem && sItemActivationTimer.getStarted() && sItemActivationTimer.getElapsedTimeF32() < ACTIVATE_HIGHLIGHT_TIME) + if (selecteditem && selecteditem->getVisible() && sItemActivationTimer.getStarted() && sItemActivationTimer.getElapsedTimeF32() < ACTIVATE_HIGHLIGHT_TIME) { // make sure toggle items, for example, show the proper state when fading out selecteditem->buildDrawLabel(); |