summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-10-04 18:21:52 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-10-04 18:21:52 -0700
commitd91d48bb4c65924d4bfa8c81969df25f2efb0f28 (patch)
tree569ae9128bf288d47fe583be04c6f0c812f752af /indra/llui
parent21c8dea4e460939aae0767e791f3efed03dc91b3 (diff)
parent69215ae757452fd0f7cdc399e2104104bd06f8cf (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-4/
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenugl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 64f84bae7c..7db8b97180 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3460,8 +3460,10 @@ BOOL LLMenuHolderGL::handleKey(KEY key, MASK mask, BOOL called_from_parent)
else
{
//highlight first enabled one
- pMenu->highlightNextItem(NULL);
- handled = true;
+ if(pMenu->highlightNextItem(NULL))
+ {
+ handled = true;
+ }
}
}
}