summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMartin Reddy <lynx@lindenlab.com>2009-09-25 16:51:25 +0000
committerMartin Reddy <lynx@lindenlab.com>2009-09-25 16:51:25 +0000
commitb5724bc0e97328a1859fc52b444e0a2edec255dd (patch)
treef19d1df1b3d3baff6870e87040afbc0f2b738195 /indra/llui
parentaf774fc9dbfd8550d61981b49151b60a7eaade91 (diff)
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code. Original patch was reviewed by merov (and others).
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenugl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 75b0803890..f2d147ac39 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2346,8 +2346,8 @@ void LLMenuGL::createJumpKeys()
{
char jump_key = uppercase_word[i];
- if (LLStringOps::isDigit(jump_key) || LLStringOps::isUpper(jump_key) &&
- mJumpKeys.find(jump_key) == mJumpKeys.end())
+ if (LLStringOps::isDigit(jump_key) || (LLStringOps::isUpper(jump_key) &&
+ mJumpKeys.find(jump_key) == mJumpKeys.end()))
{
mJumpKeys.insert(std::pair<KEY, LLMenuItemGL*>(jump_key, (*item_it)));
(*item_it)->setJumpKey(jump_key);