summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorCG Linden <cg@lindenlab.com>2010-01-29 16:29:12 -0800
committerCG Linden <cg@lindenlab.com>2010-01-29 16:29:12 -0800
commitf6a59081a7959e21f952a93bc3809315f2fa361e (patch)
treed77373c86810e505892cfb483001fe535201db46 /indra/llui/llmenugl.h
parentb8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff)
parent682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff)
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r--indra/llui/llmenugl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 61e06f9e5f..8441aaadd4 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -546,7 +546,7 @@ private:
LLHandle<LLView> mParentMenuItem;
LLUIString mLabel;
BOOL mDropShadowed; // Whether to drop shadow
- BOOL mHasSelection;
+ bool mHasSelection;
LLFrameTimer mFadeTimer;
LLTimer mScrollItemsTimer;
BOOL mTornOff;