diff options
author | Richard Nelson <none@none> | 2010-04-01 15:46:34 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-04-01 15:46:34 -0700 |
commit | 51e1c6b78a36cb968b9b3ea3d37a14dbe2609e8a (patch) | |
tree | 8c92a1f3a47c9fe66d1fe7696f4fbd8aea1a52ea /indra/llui/llmenugl.cpp | |
parent | ca8da832bdb1532c47208ea5e1b6ef50a40c3677 (diff) | |
parent | 6cc65f9e5f0aba9242295d955eb31c4938b093e1 (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(); |