diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 17:52:10 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 17:52:10 -0700 |
commit | 49ad7fd4b57cec635c557070be02556094e90ff6 (patch) | |
tree | ec2a5a18901c756f110b28778aed915651c35f97 /indra/llui/lltextbase.cpp | |
parent | 3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (diff) |
CHUI-410: Post code review submit, changed useLabel() to return bool instead of BOOL. Adjusted code accordingly.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 15856ae4ef..b827acb185 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -535,7 +535,7 @@ void LLTextBase::drawText() { return; } - else if (useLabel() == TRUE) + else if (useLabel()) { text_len = mLabel.getWString().length(); } @@ -2059,7 +2059,7 @@ BOOL LLTextBase::setLabelArg(const std::string& key, const LLStringExplicit& tex void LLTextBase::resetLabel() { - if (useLabel() == TRUE) + if (useLabel()) { clearSegments(); @@ -2072,7 +2072,7 @@ void LLTextBase::resetLabel() } } -BOOL LLTextBase::useLabel() +bool LLTextBase::useLabel() { return !getLength() && !mLabel.empty() && !hasFocus(); } |